From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 9 Sep 2021 09:11:03 +0000 (+0200)
Subject: lib/cmdline: fix --configfile handling of POPT_COMMON_CONFIG_ONLY used by ntlm_auth
X-Git-Tag: ldb-2.5.0~729
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f3ef4e6c5a440c6582f7af268c6c27c8a2273d4;p=thirdparty%2Fsamba.git

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 a299a229f69..b22306963a5 100644
--- 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",
 	},