Prep v234: Re-add user/session to the gc_queue when stopping.

[elogind.git] / src / login / logind-inhibit.c

diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index a0e3ba2b7cd20e3df8547ae3d11381244335377f..1e6f3837382fe163fed58bbeda901abdda364d91 100644 (file)
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -26,7 +26,7 @@
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"

-#include "formats-util.h"
+#include "format-util.h"

 #include "logind-inhibit.h"
 #include "mkdir.h"
 #include "parse-util.h"
 #include "logind-inhibit.h"
 #include "mkdir.h"
 #include "parse-util.h"


@@ -45,17 +45,14 @@ Inhibitor* inhibitor_new(Manager *m, const char* id) {
                 return NULL;
 
         i->state_file = strappend("/run/systemd/inhibit/", id);
                 return NULL;
 
         i->state_file = strappend("/run/systemd/inhibit/", id);

-        if (!i->state_file) {
-                free(i);
-                return NULL;
-        }
+        if (!i->state_file)
+                return mfree(i);

 
         i->id = basename(i->state_file);
 
         if (hashmap_put(m->inhibitors, i->id, i) < 0) {
                 free(i->state_file);
 
         i->id = basename(i->state_file);
 
         if (hashmap_put(m->inhibitors, i->id, i) < 0) {
                 free(i->state_file);

-                free(i);
-                return NULL;
+                return mfree(i);

         }
 
         i->manager = m;
         }
 
         i->manager = m;


@@ -297,7 +294,7 @@ int inhibitor_create_fifo(Inhibitor *i) {
                 if (r < 0)
                         return r;
 
                 if (r < 0)
                         return r;
 

-                i->fifo_path = strjoin("/run/systemd/inhibit/", i->id, ".ref", NULL);
+                i->fifo_path = strjoin("/run/systemd/inhibit/", i->id, ".ref");

                 if (!i->fifo_path)
                         return -ENOMEM;
 
                 if (!i->fifo_path)
                         return -ENOMEM;
 


@@ -317,7 +314,7 @@ int inhibitor_create_fifo(Inhibitor *i) {
                 if (r < 0)
                         return r;
 
                 if (r < 0)
                         return r;
 

-                r = sd_event_source_set_priority(i->event_source, SD_EVENT_PRIORITY_IDLE);
+                r = sd_event_source_set_priority(i->event_source, SD_EVENT_PRIORITY_IDLE-10);

                 if (r < 0)
                         return r;
         }
                 if (r < 0)
                         return r;
         }


@@ -350,7 +347,7 @@ InhibitWhat manager_inhibit_what(Manager *m, InhibitMode mm) {
         assert(m);
 
         HASHMAP_FOREACH(i, m->inhibitors, j)
         assert(m);
 
         HASHMAP_FOREACH(i, m->inhibitors, j)

-                if (i->mode == mm)
+                if (i->mode == mm && i->started)

                         what |= i->what;
 
         return what;
                         what |= i->what;
 
         return what;


@@ -391,6 +388,9 @@ bool manager_is_inhibited(
         assert(w > 0 && w < _INHIBIT_WHAT_MAX);
 
         HASHMAP_FOREACH(i, m->inhibitors, j) {
         assert(w > 0 && w < _INHIBIT_WHAT_MAX);
 
         HASHMAP_FOREACH(i, m->inhibitors, j) {

+                if (!i->started)
+                        continue;
+

                 if (!(i->what & w))
                         continue;
 
                 if (!(i->what & w))
                         continue;