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

[tridge at samba.org]

Author: tridge
Date: 2004-09-13 03:55:28 +0000 (Mon, 13 Sep 2004)
New Revision: 2306

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/param&rev=2306&nolog=1

Log:
in lp_set_cmdline(), also set any aliases as having been set by the commandline




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	2004-09-13 02:37:39 UTC (rev 2305)
+++ branches/SAMBA_4_0/source/param/loadparm.c	2004-09-13 03:55:28 UTC (rev 2306)
@@ -2622,6 +2622,7 @@
 BOOL lp_set_cmdline(const char *pszParmName, const char *pszParmValue)
 {
 	int parmnum = map_parameter(pszParmName);
+	int i;
 
 	if (parmnum < 0 && strchr(pszParmName, ':')) {
 		/* set a parametric option */
@@ -2636,6 +2637,15 @@
 	}
 
 	parm_table[parmnum].flags |= FLAG_CMDLINE;
+
+	/* we have to also set FLAG_CMDLINE on aliases */
+	for (i=parmnum-1;i>=0 && parm_table[i].ptr == parm_table[parmnum].ptr;i--) {
+		parm_table[i].flags |= FLAG_CMDLINE;
+	}
+	for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].ptr == parm_table[parmnum].ptr;i++) {
+		parm_table[i].flags |= FLAG_CMDLINE;
+	}
+
 	return True;
 }