lib/cmdline: fix --configfile handling of POPT_COMMON_CONFIG_ONLY used by ntlm_auth

ntlm_auth only every knew about '--configfile' without the '-s' alias,
keep it that way and make sure we actually process the argument via
the OPT_CONFIGFILE handling.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/lib/cmdline/cmdline.c b/lib/cmdline/cmdline.c
index a299a229f6955af6a0bb1f9a0e80f0bd68807450..b22306963a5b91f6a8da5adc20382f0cbb914ba6 100644 (file)
--- a/lib/cmdline/cmdline.c
+++ b/lib/cmdline/cmdline.c
@@ -487,9 +487,8 @@ static struct poptOption popt_common_config[] = {
        },
        {
                .longName   = "configfile",
-               .shortName  = 's',
                .argInfo    = POPT_ARG_STRING,
-               .val        = 's',
+               .val        = OPT_CONFIGFILE,
                .descrip    = "Use alternative configuration file",
                .argDescrip = "CONFIGFILE",
        },