From 4456f87dee1b9ee130f290ba9b7fb61a89b72333 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 13 Sep 2004 03:55:28 +0000 Subject: r2306: in lp_set_cmdline(), also set any aliases as having been set by the commandline (This used to be commit 2c0b5e119eddc6389500bcc80d1ae417dd9bfbb9) --- source4/param/loadparm.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'source4') diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 7ae4a29483..33612e1732 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -2622,6 +2622,7 @@ static BOOL do_parameter(const char *pszParmName, const char *pszParmValue) 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 @@ BOOL lp_set_cmdline(const char *pszParmName, const char *pszParmValue) } 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