logind: ensure the stronger inhibitor currently in place is taken into account

2024-11-01 15:43:14 +00:00
parent 845f95b9e0
commit 93445c2e89
1 changed files with 8 additions and 4 deletions
@@ -404,9 +404,9 @@ bool manager_is_inhibited(
                bool ignore_inactive,
                bool ignore_uid,
                uid_t uid,
-                Inhibitor **offending) {
+                Inhibitor **ret_offending) {

-        Inhibitor *i;
+        Inhibitor *i, *offending = NULL;
        struct dual_timestamp ts = DUAL_TIMESTAMP_NULL;
        bool inhibited = false;

@@ -437,13 +437,17 @@ bool manager_is_inhibited(

                inhibited = true;

-                if (offending)
-                        *offending = i;
+                /* Stronger inhibitor wins */
+                if (!offending || (i->mode < offending->mode))
+                        offending = i;
        }

        if (since)
                *since = ts;

+        if (ret_offending)
+                *ret_offending = offending;
+
        return inhibited;
 }