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)

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
 	/*