svn commit: samba r7531 - in branches/SAMBA_4_0/source/param: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-06-13 10:54:18 +0000 (Mon, 13 Jun 2005)
New Revision: 7531

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

Log:
Finally fix lp_load().  I had left hooks in place which restricted us
to globals only (no shares).

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c	2005-06-13 10:01:11 UTC (rev 7530)
+++ branches/SAMBA_4_0/source/param/loadparm.c	2005-06-13 10:54:18 UTC (rev 7531)
@@ -2428,9 +2428,6 @@
 
 static BOOL do_parameter(const char *pszParmName, const char *pszParmValue)
 {
-	if (!bInGlobalSection)
-		return (True);
-
 	return (lp_do_parameter(bInGlobalSection ? -2 : iServiceIndex,
 				pszParmName, pszParmValue));
 }
@@ -2631,9 +2628,6 @@
 		return (True);
 	}
 
-	if (!bInGlobalSection)
-		return (True);
-
 	/* if we have a current service, tidy it up before moving on */
 	bRetval = True;