make socket_instantiate_service use cleanup gcc attribute

[elogind.git] / src / core / manager.c

diff --git a/src/core/manager.c b/src/core/manager.c
index 0e35ba5cab9134d3364bbdf30e00a2bff88a3b21..a80d6a161ae58baf33a53066be254a934af3b7af 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -530,11 +530,13 @@ static int manager_setup_notify(Manager *m) {
 }
 
 static int manager_setup_kdbus(Manager *m) {
+#ifdef ENABLE_KDBUS
         _cleanup_free_ char *p = NULL;
+#endif
 
+#ifdef ENABLE_KDBUS
         assert(m);
 
-#ifdef ENABLE_KDBUS
         if (m->kdbus_fd >= 0)
                 return 0;
 
@@ -2344,6 +2346,11 @@ int manager_reload(Manager *m) {
         fclose(f);
         f = NULL;
 
+        /* Re-register notify_fd as event source */
+        q = manager_setup_notify(m);
+        if (q < 0)
+                r = q;
+
         /* Third, fire things up! */
         q = manager_coldplug(m);
         if (q < 0)