Rev 5310: Up to now, the "allparameters" argument to lp_next_parameter was in http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

Michael Adam ma at sernet.de
Tue Mar 27 21:47:05 GMT 2007


At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/

------------------------------------------------------------
revno: 5310
revision-id: ma at sernet.de-20070327214703-59efa290cec0ff01
parent: ma at sernet.de-20070323122842-4541ff9d7683a2d2
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Tue 2007-03-27 23:47:03 +0200
message:
  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 current calls of 
  lp_next_parameter: Beside the new use in utils/net_conf.c, the only
  calls of lp_next_parameter are in web/swat.c, where it is effectively
  always called with allparameters == 1. 
modified:
  source/param/loadparm.c        loadparm.c-20060530022627-1efa1edb3eb0e897
=== modified file 'source/param/loadparm.c'
--- a/source/param/loadparm.c	2007-03-23 12:28:42 +0000
+++ b/source/param/loadparm.c	2007-03-27 21:47:03 +0000
@@ -4017,6 +4017,9 @@
 				parm_table[(*i) - 1].ptr))
 				continue;
 
+			if (is_default(*i) && !allparameters)
+				continue;
+
 			return &parm_table[(*i)++];
 		}
 	} else {



More information about the samba-cvs mailing list