diff options
author | Gerald Carter <jerry@samba.org> | 2007-03-01 03:16:38 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:18 -0500 |
commit | b1f4259cd5ecebfe7e4c4eb73aa32e1ed9b366b8 (patch) | |
tree | 8c49ed786823f88b9a0bce54eb848d316159f34f /source3/nsswitch/winbindd.c | |
parent | 6fb6adba274f6473e4247a5e30d1e496873077a9 (diff) | |
download | samba-b1f4259cd5ecebfe7e4c4eb73aa32e1ed9b366b8.tar.gz samba-b1f4259cd5ecebfe7e4c4eb73aa32e1ed9b366b8.tar.bz2 samba-b1f4259cd5ecebfe7e4c4eb73aa32e1ed9b366b8.zip |
r21616: Delay initialization of idmap and nss_info backends until necessary
so they can honor the offline logon state.
(This used to be commit 15b13dfe81e861b94077c94b80117a85a5ffb999)
Diffstat (limited to 'source3/nsswitch/winbindd.c')
-rw-r--r-- | source3/nsswitch/winbindd.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c index ef6d4700ce..603cfeb85b 100644 --- a/source3/nsswitch/winbindd.c +++ b/source3/nsswitch/winbindd.c @@ -1011,14 +1011,10 @@ int main(int argc, char **argv, char **envp) /* Winbind daemon initialisation */ - if ( ! NT_STATUS_IS_OK(idmap_init()) ) { - DEBUG(1, ("Could not init idmap! - Sid/[UG]id mapping will not be available\n")); + if ( ! NT_STATUS_IS_OK(idmap_init_cache()) ) { + DEBUG(1, ("Could not init idmap cache!\n")); } -#ifdef WITH_ADS - nss_init( lp_winbind_nss_info() ); -#endif - /* Unblock all signals we are interested in as they may have been blocked by the parent process. */ @@ -1047,6 +1043,7 @@ int main(int argc, char **argv, char **envp) pidfile_create("winbindd"); +#if 0 /* not finished yet */ /* Ensure all cache and idmap caches are consistent before we startup. */ @@ -1060,6 +1057,7 @@ int main(int argc, char **argv, char **envp) } return execve(argv[0], argv, envp); } +#endif #if HAVE_SETPGID /* |