diff options
| -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, }; |