X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-action.c;h=3bad92271349bbfc072ba1940d3d53b571ab2fbd;hb=ed4ba7e4f652150310d062ffbdfefb4521ce1054;hp=cb64df086c815f45fa5bac4c2033d8f26153941c;hpb=cc3773810855956bad92337cee8fa193584ab62e;p=elogind.git

diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index cb64df086..3bad92271 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -58,6 +58,7 @@ int manager_handle_action(
 
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         InhibitWhat inhibit_operation;
+        Inhibitor *offending = NULL;
         bool supported;
         int r;
 
@@ -71,7 +72,7 @@ int manager_handle_action(
 
         /* If the key handling is inhibited, don't do anything */
         if (inhibit_key > 0) {
-                if (manager_is_inhibited(m, inhibit_key, INHIBIT_BLOCK, NULL, true, false, 0)) {
+                if (manager_is_inhibited(m, inhibit_key, INHIBIT_BLOCK, NULL, true, false, 0, NULL)) {
                         log_debug("Refusing operation, %s is inhibited.", inhibit_what_to_string(inhibit_key));
                         return 0;
                 }
@@ -79,6 +80,10 @@ int manager_handle_action(
 
         /* Locking is handled differently from the rest. */
         if (handle == HANDLE_LOCK) {
+
+                if (!is_edge)
+                        return 0;
+
                 log_info("Locking sessions...");
                 session_send_lock_all(m, true);
                 return 1;
@@ -109,15 +114,26 @@ int manager_handle_action(
 
         /* If the actual operation is inhibited, warn and fail */
         if (!ignore_inhibited &&
-            manager_is_inhibited(m, inhibit_operation, INHIBIT_BLOCK, NULL, false, false, 0)) {
+            manager_is_inhibited(m, inhibit_operation, INHIBIT_BLOCK, NULL, false, false, 0, &offending)) {
+                _cleanup_free_ char *comm = NULL, *u = NULL;
+
+                get_process_comm(offending->pid, &comm);
+                u = uid_to_name(offending->uid);
 
                 /* If this is just a recheck of the lid switch then don't warn about anything */
                 if (!is_edge) {
-                        log_debug("Refusing operation, %s is inhibited.", inhibit_what_to_string(inhibit_operation));
+                        log_debug("Refusing operation, %s is inhibited by UID %lu/%s, PID %lu/%s.",
+                                  inhibit_what_to_string(inhibit_operation),
+                                  (unsigned long) offending->uid, strna(u),
+                                  (unsigned long) offending->pid, strna(comm));
                         return 0;
                 }
 
-                log_error("Refusing operation, %s is inhibited.", inhibit_what_to_string(inhibit_operation));
+                log_error("Refusing operation, %s is inhibited by UID %lu/%s, PID %lu/%s.",
+                          inhibit_what_to_string(inhibit_operation),
+                          (unsigned long) offending->uid, strna(u),
+                          (unsigned long) offending->pid, strna(comm));
+
                 warn_melody();
                 return -EPERM;
         }