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

[vlendec at samba.org]

Author: vlendec
Date: 2006-03-16 15:21:41 +0000 (Thu, 16 Mar 2006)
New Revision: 14480

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

Log:
Kill one boolean flag passed down :-)
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 14:34:55 UTC (rev 14479)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd.c	2006-03-16 15:21:41 UTC (rev 14480)
@@ -1071,7 +1071,7 @@
 
 	netsamlogon_cache_init(); /* Non-critical */
 	
-	if (!init_domain_list(True)) {
+	if (!init_domain_list()) {
 		DEBUG(0,("unable to initalize domain list\n"));
 		exit(1);
 	}

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2006-03-16 14:34:55 UTC (rev 14479)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2006-03-16 15:21:41 UTC (rev 14480)
@@ -61,8 +61,9 @@
 {
 	/* Initialise list */
 
-	if (!_domain_list) 
-		init_domain_list(False);
+	if ((!_domain_list) && (!init_domain_list())) {
+		smb_panic("Init_domain_list failed\n");
+	}
 
 	return _domain_list;
 }
@@ -498,7 +499,7 @@
 }
 
 /* Look up global info for the winbind daemon */
-BOOL init_domain_list(BOOL initial_start)
+BOOL init_domain_list(void)
 {
 	extern struct winbindd_methods cache_methods;
 	extern struct winbindd_methods passdb_methods;
@@ -518,11 +519,8 @@
 		DOM_SID our_sid;
 
 		if (!secrets_fetch_domain_sid(lp_workgroup(), &our_sid)) {
-			if (initial_start) {
-				return False;
-			} else {
-				smb_panic("Could not fetch our SID - did we join?\n");
-			}
+			DEBUG(0, ("Could not fetch our SID - did we join?\n"));
+			return False;
 		}
 	
 		domain = add_trusted_domain( lp_workgroup(), lp_realm(),

Modified: trunk/source/nsswitch/winbindd.c
===================================================================
--- trunk/source/nsswitch/winbindd.c	2006-03-16 14:34:55 UTC (rev 14479)
+++ trunk/source/nsswitch/winbindd.c	2006-03-16 15:21:41 UTC (rev 14480)
@@ -1071,7 +1071,7 @@
 
 	netsamlogon_cache_init(); /* Non-critical */
 	
-	if (!init_domain_list(True)) {
+	if (!init_domain_list()) {
 		DEBUG(0,("unable to initalize domain list\n"));
 		exit(1);
 	}

Modified: trunk/source/nsswitch/winbindd_util.c
===================================================================
--- trunk/source/nsswitch/winbindd_util.c	2006-03-16 14:34:55 UTC (rev 14479)
+++ trunk/source/nsswitch/winbindd_util.c	2006-03-16 15:21:41 UTC (rev 14480)
@@ -61,8 +61,9 @@
 {
 	/* Initialise list */
 
-	if (!_domain_list) 
-		init_domain_list(False);
+	if ((!_domain_list) && (!init_domain_list())) {
+		smb_panic("Init_domain_list failed\n");
+	}
 
 	return _domain_list;
 }
@@ -498,7 +499,7 @@
 }
 
 /* Look up global info for the winbind daemon */
-BOOL init_domain_list(BOOL initial_start)
+BOOL init_domain_list(void)
 {
 	extern struct winbindd_methods cache_methods;
 	extern struct winbindd_methods passdb_methods;
@@ -518,11 +519,8 @@
 		DOM_SID our_sid;
 
 		if (!secrets_fetch_domain_sid(lp_workgroup(), &our_sid)) {
-			if (initial_start) {
-				return False;
-			} else {
-				smb_panic("Could not fetch our SID - did we join?\n");
-			}
+			DEBUG(0, ("Could not fetch our SID - did we join?\n"));
+			return False;
 		}
 	
 		domain = add_trusted_domain( lp_workgroup(), lp_realm(),