svn commit: samba r23579 - in branches: SAMBA_3_0/source/param SAMBA_3_0_26/source/param

[obnox at samba.org]

Author: obnox
Date: 2007-06-21 23:11:21 +0000 (Thu, 21 Jun 2007)
New Revision: 23579

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

Log:
Up to now, the "allparameters" argument to lp_next_parameter was
not effective for the global section (snum < 0). This checkin
makes it effective for the global section, too.

This does not produce changes in the results of the present calls of
lp_next_parameter: Beside the new use in utils/net_conf.c (which is
hereby fixed), the only calls of lp_next_parameter are in web/swat.c, 
where it is effectively always called with allparameters == 1.

Michael


Modified:
   branches/SAMBA_3_0/source/param/loadparm.c
   branches/SAMBA_3_0_26/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0/source/param/loadparm.c	2007-06-21 22:18:42 UTC (rev 23578)
+++ branches/SAMBA_3_0/source/param/loadparm.c	2007-06-21 23:11:21 UTC (rev 23579)
@@ -4308,6 +4308,9 @@
 			    && (parm_table[*i].ptr ==
 				parm_table[(*i) - 1].ptr))
 				continue;
+			
+			if (is_default(*i) && !allparameters)
+				continue;
 
 			return &parm_table[(*i)++];
 		}

Modified: branches/SAMBA_3_0_26/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0_26/source/param/loadparm.c	2007-06-21 22:18:42 UTC (rev 23578)
+++ branches/SAMBA_3_0_26/source/param/loadparm.c	2007-06-21 23:11:21 UTC (rev 23579)
@@ -4311,6 +4311,9 @@
 			    && (parm_table[*i].ptr ==
 				parm_table[(*i) - 1].ptr))
 				continue;
+			
+			if (is_default(*i) && !allparameters)
+				continue;
 
 			return &parm_table[(*i)++];
 		}