sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

param: remove unnecessary lp_do_parameter call

Browse Source 
Change-Id: I0cd1842bac3fcb6dde7236b87d5d235f10277e60
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Garming Sam 2014-04-17 13:49:05 +12:00 committed by Michael Adam
parent 47f10ac65c
commit 0693b5d77b
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/param/loadparm.c
View File

@ -1751,15 +1751,9 @@ bool lpcfg_set_cmdline(struct loadparm_context *lp_ctx, const char *pszParmName,
/* reset the CMDLINE flag in case this has been called before */ /* reset the CMDLINE flag in case this has been called before */
lp_ctx->flags[parmnum] &= ~FLAG_CMDLINE; lp_ctx->flags[parmnum] &= ~FLAG_CMDLINE;
if (lp_ctx->s3_fns != NULL) {
if (!lp_ctx->s3_fns->lp_do_parameter(-1, pszParmName, pszParmValue)) {
return false;
}
} else {
if (!lpcfg_do_global_parameter(lp_ctx, pszParmName, pszParmValue)) { if (!lpcfg_do_global_parameter(lp_ctx, pszParmName, pszParmValue)) {
return false; return false;
} }
}
lp_ctx->flags[parmnum] |= FLAG_CMDLINE; lp_ctx->flags[parmnum] |= FLAG_CMDLINE;

1
source3/param/loadparm_ctx.c
View File

@ -71,7 +71,6 @@ static struct loadparm_s3_helpers s3_fns =
.lp_include = lp_include, .lp_include = lp_include,
.init_ldap_debugging = init_ldap_debugging, .init_ldap_debugging = init_ldap_debugging,
.set_netbios_aliases = set_netbios_aliases, .set_netbios_aliases = set_netbios_aliases,
.lp_do_parameter = lp_do_parameter,
.do_section = lp_do_section, .do_section = lp_do_section,
}; };