From 9caa71efa96b502b65ae59fb54397eb43b55e333 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 13 Jan 2021 09:56:41 +0100 Subject: [PATCH] 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 Reviewed-by: Andrew Bartlett --- lib/cmdline/cmdline.h | 3 ++- lib/cmdline/cmdline_s3.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) 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; -- 2.47.3