[systemd-commits] src/main.c src/missing.h

[Lennart Poettering]

 src/main.c    |   10 +++++-----
 src/missing.h |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e054f8333d7ba2e598784a9718e751c5d956ac9e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Jul 24 01:29:21 2010 +0200

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

diff --git a/src/main.c b/src/main.c
index 964bb9c..e67d222 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 003c821..5914b01 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