main: disable NSS disabling logic for now, since this is incompatible with rpm
This commit is contained in:
parent
ee5762e378
commit
e054f8333d
10
src/main.c
10
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)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue