svn commit: samba r14467 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2006-03-16 11:04:21 +0000 (Thu, 16 Mar 2006)
New Revision: 14467

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14467

Log:
Reverting 13660. This needs to be fixed differently.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
   trunk/source/nsswitch/winbindd.c
   trunk/source/nsswitch/winbindd_util.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd.c	2006-03-16 10:03:29 UTC (rev 14466)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd.c	2006-03-16 11:04:21 UTC (rev 14467)
@@ -1071,10 +1071,7 @@
 
 	netsamlogon_cache_init(); /* Non-critical */
 	
-	if (!init_domain_list()) {
-		DEBUG(0, ("unable to initialize domain list\n"));
-		exit(1);
-	}
+	init_domain_list();
 
 	init_idmap_child();
 

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2006-03-16 10:03:29 UTC (rev 14466)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2006-03-16 11:04:21 UTC (rev 14467)
@@ -61,9 +61,8 @@
 {
 	/* Initialise list */
 
-	if (!_domain_list && !init_domain_list()) {
-		return NULL;
-	}
+	if (!_domain_list) 
+		init_domain_list();
 
 	return _domain_list;
 }
@@ -499,7 +498,7 @@
 }
 
 /* Look up global info for the winbind daemon */
-BOOL init_domain_list(void)
+void init_domain_list(void)
 {
 	extern struct winbindd_methods cache_methods;
 	extern struct winbindd_methods passdb_methods;
@@ -519,8 +518,7 @@
 		DOM_SID our_sid;
 
 		if (!secrets_fetch_domain_sid(lp_workgroup(), &our_sid)) {
-			DEBUG(0,("Could not fetch our SID - did we join?\n"));
-			return False;
+			smb_panic("Could not fetch our SID - did we join?\n");
 		}
 	
 		domain = add_trusted_domain( lp_workgroup(), lp_realm(),
@@ -542,8 +540,6 @@
 					    get_global_sam_sid());
 		setup_domain_child(domain, &domain->child, NULL);
 	}
-
-	return True;
 }
 
 /** 

Modified: trunk/source/nsswitch/winbindd.c
===================================================================
--- trunk/source/nsswitch/winbindd.c	2006-03-16 10:03:29 UTC (rev 14466)
+++ trunk/source/nsswitch/winbindd.c	2006-03-16 11:04:21 UTC (rev 14467)
@@ -1071,10 +1071,7 @@
 
 	netsamlogon_cache_init(); /* Non-critical */
 	
-	if (!init_domain_list()) {
-		DEBUG(0, ("unable to initialize domain list\n"));
-		exit(1);
-	}
+	init_domain_list();
 
 	init_idmap_child();
 

Modified: trunk/source/nsswitch/winbindd_util.c
===================================================================
--- trunk/source/nsswitch/winbindd_util.c	2006-03-16 10:03:29 UTC (rev 14466)
+++ trunk/source/nsswitch/winbindd_util.c	2006-03-16 11:04:21 UTC (rev 14467)
@@ -61,9 +61,8 @@
 {
 	/* Initialise list */
 
-	if (!_domain_list && !init_domain_list()) {
-		return NULL;
-	}
+	if (!_domain_list) 
+		init_domain_list();
 
 	return _domain_list;
 }
@@ -499,7 +498,7 @@
 }
 
 /* Look up global info for the winbind daemon */
-BOOL init_domain_list(void)
+void init_domain_list(void)
 {
 	extern struct winbindd_methods cache_methods;
 	extern struct winbindd_methods passdb_methods;
@@ -519,8 +518,7 @@
 		DOM_SID our_sid;
 
 		if (!secrets_fetch_domain_sid(lp_workgroup(), &our_sid)) {
-			DEBUG(0,("Could not fetch our SID - did we join?\n"));
-			return False;
+			smb_panic("Could not fetch our SID - did we join?\n");
 		}
 	
 		domain = add_trusted_domain( lp_workgroup(), lp_realm(),
@@ -542,8 +540,6 @@
 					    get_global_sam_sid());
 		setup_domain_child(domain, &domain->child, NULL);
 	}
-
-	return True;
 }
 
 /**