From 91cd924efdfde655740cc903c14fd8610adab9cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= Date: Wed, 10 Jan 2018 16:34:03 +0100 Subject: [PATCH] params: deprecate a number of alias parameters Those alias parameters will be logged as deprecated by this: casesignames group allow hosts deny hosts debuglevel directory exec prefered master printer printcap vfs object write ok writeable writable root root dir protocol max protocol min protocol private directory only guest lock directory Signed-off-by: Bjoern Jacke --- lib/param/loadparm.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index a18407d..37583a6 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1822,6 +1822,31 @@ bool lpcfg_do_global_parameter(struct loadparm_context *lp_ctx, DEBUG(1, ("WARNING: The \"%s\" option is deprecated\n", pszParmName)); } + if ( strcmp(pszParmName, "casesignames") == 0 || + strcmp(pszParmName, "group") == 0 || + strcmp(pszParmName, "allow hosts") == 0 || + strcmp(pszParmName, "deny hosts") == 0 || + strcmp(pszParmName, "debuglevel") == 0 || + strcmp(pszParmName, "directory") == 0 || + strcmp(pszParmName, "exec") == 0 || + strcmp(pszParmName, "prefered master") == 0 || + strcmp(pszParmName, "printer") == 0 || + strcmp(pszParmName, "printcap") == 0 || + strcmp(pszParmName, "vfs object") == 0 || + strcmp(pszParmName, "write ok") == 0 || + strcmp(pszParmName, "writeable") == 0 || + strcmp(pszParmName, "writable") == 0 || + strcmp(pszParmName, "root") == 0 || + strcmp(pszParmName, "root dir") == 0 || + strcmp(pszParmName, "protocol") == 0 || + strcmp(pszParmName, "max protocol") == 0 || + strcmp(pszParmName, "min protocol") == 0 || + strcmp(pszParmName, "private directory") == 0 || + strcmp(pszParmName, "only guest") == 0 || + strcmp(pszParmName, "lock directory") == 0) { + DEBUG(1, ("WARNING: The \"%s\" alias option is deprecated\n", + pszParmName)); + } parm_ptr = lpcfg_parm_ptr(lp_ctx, NULL, &parm_table[parmnum]); @@ -1856,6 +1881,22 @@ bool lpcfg_do_service_parameter(struct loadparm_context *lp_ctx, pszParmName)); } + if ( strcmp(pszParmName, "casesignames") == 0 || + strcmp(pszParmName, "group") == 0 || + strcmp(pszParmName, "allow hosts") == 0 || + strcmp(pszParmName, "deny hosts") == 0 || + strcmp(pszParmName, "directory") == 0 || + strcmp(pszParmName, "exec") == 0 || + strcmp(pszParmName, "printer") == 0 || + strcmp(pszParmName, "vfs object") == 0 || + strcmp(pszParmName, "write ok") == 0 || + strcmp(pszParmName, "writeable") == 0 || + strcmp(pszParmName, "writable") == 0 || + strcmp(pszParmName, "only guest") == 0) { + DEBUG(1, ("WARNING: The \"%s\" alias option is deprecated\n", + pszParmName)); + } + if (parm_table[parmnum].p_class == P_GLOBAL) { DEBUG(0, ("Global parameter %s found in service section!\n", -- 2.7.4