From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 23 Jul 2010 23:29:21 +0000 (+0200)
Subject: main: disable NSS disabling logic for now, since this is incompatible with rpm
X-Git-Tag: v4~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e054f8333d7ba2e598784a9718e751c5d956ac9e

main: disable NSS disabling logic for now, since this is incompatible with rpm
---

diff --git a/src/main.c b/src/main.c
index 964bb9cc3..e67d2225b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -940,11 +940,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)
diff --git a/src/missing.h b/src/missing.h
index 003c821f8..5914b01a8 100644
--- a/src/missing.h
+++ b/src/missing.h
@@ -61,6 +61,6 @@ static inline int pivot_root(const char *new_root, const char *put_old) {
  * protect this with a weak ref just in case glibc takes this away
  * from us. */
 
-static void nss_disable_nscd(void) _weakref_(__nss_disable_nscd);
+/* static void nss_disable_nscd(void) _weakref_(__nss_disable_nscd); */
 
 #endif