summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-24 01:29:21 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-24 01:29:21 +0200
commite054f8333d7ba2e598784a9718e751c5d956ac9e (patch)
tree94bb11c1413ad895652ed3794736092ff2da5259 /src
parentee5762e3780c048b230e8c1e7659e40fc1f443bf (diff)
main: disable NSS disabling logic for now, since this is incompatible with rpm
Diffstat (limited to 'src')
-rw-r--r--src/main.c10
-rw-r--r--src/missing.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main.c b/src/main.c
index 964bb9cc32..e67d2225bd 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 003c821f84..5914b01a8e 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