diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-04-17 13:49:05 +1200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-07-31 08:17:11 +0200 |
| commit | 0693b5d77bb9cd70e10a9f90682c78964904f541 (patch) | |
| tree | 956b2c27866ba91b242fe8fbfb2e30296bc8e8c6 | |
| parent | 47f10ac65c2df3034ae5e943a396d86aa201667a (diff) | |
| download | samba-0693b5d77bb9cd70e10a9f90682c78964904f541.tar.gz samba-0693b5d77bb9cd70e10a9f90682c78964904f541.tar.xz samba-0693b5d77bb9cd70e10a9f90682c78964904f541.zip | |
param: remove unnecessary lp_do_parameter call
Change-Id: I0cd1842bac3fcb6dde7236b87d5d235f10277e60
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | lib/param/loadparm.c | 10 | ||||
| -rw-r--r-- | source3/param/loadparm_ctx.c | 1 |
2 files changed, 2 insertions, 9 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index d9159f372d..aff8986a5f 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1751,14 +1751,8 @@ bool lpcfg_set_cmdline(struct loadparm_context *lp_ctx, const char *pszParmName, /* reset the CMDLINE flag in case this has been called before */ 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)) { - return false; - } + if (!lpcfg_do_global_parameter(lp_ctx, pszParmName, pszParmValue)) { + return false; } lp_ctx->flags[parmnum] |= FLAG_CMDLINE; diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c index 8f1572fdaa..5782a9614b 100644 --- a/source3/param/loadparm_ctx.c +++ b/source3/param/loadparm_ctx.c @@ -71,7 +71,6 @@ static struct loadparm_s3_helpers s3_fns = .lp_include = lp_include, .init_ldap_debugging = init_ldap_debugging, .set_netbios_aliases = set_netbios_aliases, - .lp_do_parameter = lp_do_parameter, .do_section = lp_do_section, }; |