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 14a928d0b5bca8325f53830d858140eda260c298..8d8f3ebe5a7e2fa6054766f2698ee2df9e96b8e2 100644 (file)
--- 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 d9bda695203a8ea9ac7b23fdc78f5f3120e0ef2e..31250b1996e273968de912f3d04d7424d8e7304b 100644 (file)
--- 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;