From: Andreas Schneider <asn@samba.org>
Date: Wed, 13 Jan 2021 08:56:41 +0000 (+0100)
Subject: lib:cmdline: Add SAMBA_CMDLINE_CONFIG_NONE
X-Git-Tag: tevent-0.11.0~786
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9caa71efa96b502b65ae59fb54397eb43b55e333;p=thirdparty%2Fsamba.git

lib:cmdline: Add SAMBA_CMDLINE_CONFIG_NONE

This will prevent loading a config file. This will be needed for
testparm.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/lib/cmdline/cmdline.h b/lib/cmdline/cmdline.h
index 14a928d0b5b..8d8f3ebe5a7 100644
--- a/lib/cmdline/cmdline.h
+++ b/lib/cmdline/cmdline.h
@@ -33,7 +33,8 @@
 #endif
 
 enum samba_cmdline_config_type {
-	SAMBA_CMDLINE_CONFIG_CLIENT = 0,
+	SAMBA_CMDLINE_CONFIG_NONE = 0,
+	SAMBA_CMDLINE_CONFIG_CLIENT,
 	SAMBA_CMDLINE_CONFIG_SERVER,
 };
 
diff --git a/lib/cmdline/cmdline_s3.c b/lib/cmdline/cmdline_s3.c
index d9bda695203..31250b1996e 100644
--- a/lib/cmdline/cmdline_s3.c
+++ b/lib/cmdline/cmdline_s3.c
@@ -50,6 +50,8 @@ static bool _samba_cmdline_load_config_s3(void)
 	config_file = get_dyn_CONFIGFILE();
 
 	switch (_config_type) {
+	case SAMBA_CMDLINE_CONFIG_NONE:
+		return true;
 	case SAMBA_CMDLINE_CONFIG_CLIENT:
 		ok = lp_load_client(config_file);
 		break;