lib:cmdline: Add callback for loading the config file

[samba.git] / lib / cmdline / cmdline_s3.c

diff --git a/lib/cmdline/cmdline_s3.c b/lib/cmdline/cmdline_s3.c
index 5dcf1ef8e125b22a24f8f38af848dd423bfd59f0..77d2818f453b508f504ca2eb4f46e6c380399a09 100644 (file)
--- a/lib/cmdline/cmdline_s3.c
+++ b/lib/cmdline/cmdline_s3.c
@@ -21,11 +21,50 @@
 #include "lib/util/debug.h"
 #include "lib/util/fault.h"
 #include "source3/param/loadparm.h"
+#include "source3/lib/interface.h"
 #include "auth/credentials/credentials.h"
+#include "dynconfig/dynconfig.h"
 #include "cmdline_private.h"
 
 static bool _require_smbconf;
 
+static bool _samba_cmdline_load_config_s3(void)
+{
+       struct loadparm_context *lp_ctx = samba_cmdline_get_lp_ctx();
+       const char *config_file = NULL;
+       bool ok;
+
+       /* Load smb conf */
+       config_file = lpcfg_configfile(lp_ctx);
+       if (config_file == NULL) {
+               if (is_default_dyn_CONFIGFILE()) {
+                       const char *env = getenv("SMB_CONF_PATH");
+                       if (env != NULL && strlen(env) > 0) {
+                               set_dyn_CONFIGFILE(env);
+                       }
+               }
+       }
+
+       /*
+        * Load load smb.conf from getenv("SMB_CONF_PATH") default
+        * location.
+        */
+       ok = lp_load_client(lp_default_path());
+       if (!ok) {
+               fprintf(stderr,
+                       "Can't load %s - run testparm to debug it\n",
+                       lp_default_path());
+
+               if (_require_smbconf) {
+                       return false;
+               }
+       }
+
+       load_interfaces();
+
+       return true;
+}
+
 bool samba_cmdline_init(TALLOC_CTX *mem_ctx, bool require_smbconf)
 {
        struct loadparm_context *lp_ctx = NULL;
@@ -57,5 +96,7 @@ bool samba_cmdline_init(TALLOC_CTX *mem_ctx, bool require_smbconf)
                return false;
        }
 
+       samba_cmdline_set_load_config_fn(_samba_cmdline_load_config_s3);
+
        return true;
 }