main: disable nscd properly, if possible

[elogind.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 3810033fb223ca5bf1586d71cd2894a35eb82528..2e17f9b6fa95519981ed9524b4e037140e764129 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -45,6 +45,7 @@
 #include "conf-parser.h"
 #include "bus-errors.h"
 #include "missing.h"
+#include "label.h"
 
 static enum {
         ACTION_RUN,
@@ -993,11 +994,7 @@ 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."); */
+                nss_disable_nscd();
 
                 if (!serialization) {
                         if (arg_show_status)