manager: fix conflicting job check

[elogind.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 964bb9cc325f8bac2cb1fd4d9e0ba58c33e9a8b7..36dea9b3c63c4489c71ffaa12ef7f057455234cd 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -836,6 +836,9 @@ int main(int argc, char *argv[]) {
                 return 1;
         }
 
+        if (label_init() < 0)
+                goto finish;
+
         log_show_color(isatty(STDERR_FILENO) > 0);
         log_show_location(false);
         log_set_max_level(LOG_INFO);
@@ -940,11 +943,11 @@ int main(int argc, char *argv[]) {
 
                 /* Disable nscd, to avoid deadlocks when systemd uses
                  * NSS and the nscd socket is maintained by us. */
-                if (nss_disable_nscd) {
-                        log_debug("Disabling nscd");
-                        nss_disable_nscd();
-                } else
-                        log_debug("Hmm, can't disable nscd.");
+                /* if (nss_disable_nscd) { */
+                /*         log_debug("Disabling nscd"); */
+                /*         nss_disable_nscd(); */
+                /* } else */
+                /*         log_debug("Hmm, can't disable nscd."); */
 
                 if (!serialization) {
                         if (arg_show_status)
@@ -1113,5 +1116,7 @@ finish:
         if (getpid() == 1)
                 freeze();
 
+        label_finish();
+
         return retval;
 }