]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3-utils: Fix loading smb.conf in smbcquotas
authorAndreas Schneider <asn@samba.org>
Wed, 5 Oct 2016 06:22:54 +0000 (08:22 +0200)
committerStefan Metzmacher <metze@samba.org>
Mon, 24 Oct 2016 08:56:13 +0000 (10:56 +0200)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12364

Pair-Programmed-With: Uri Simchoni <uri@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit c7bcbd166d23b6ebcc2d968b76b0640b9a9beebb)

source3/utils/smbcquotas.c

index e6f1dfb6d4670398a47c5263fdade5f1a2c83bca..539cabafcb1c27e2027de25f710c0d718760bff6 100644 (file)
@@ -568,6 +568,7 @@ int main(int argc, char *argv[])
        static bool test_args = False;
        struct cli_state *cli;
        bool fix_user = False;
+       bool ok;
        SMB_NTQUOTA_STRUCT qt;
        TALLOC_CTX *frame = talloc_stackframe();
        poptContext pc;
@@ -601,9 +602,6 @@ FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT", "SETSTRING" },
 
        fault_setup();
 
-       lp_load_global(get_dyn_CONFIGFILE());
-       load_interfaces();
-
        smbcquotas_auth_info = user_auth_info_init(frame);
        if (smbcquotas_auth_info == NULL) {
                exit(1);
@@ -694,6 +692,17 @@ FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT", "SETSTRING" },
        poptFreeContext(pc);
        popt_burn_cmdline_password(argc, argv);
 
+       ok = lp_load_global(get_dyn_CONFIGFILE());
+       if (!ok) {
+               DBG_ERR("ERROR: Loading config file %s - "
+                       "run testparm to debug it\n",
+                       get_dyn_CONFIGFILE());
+               exit(EXIT_PARSE_ERROR);
+       }
+
+       /* We must load interfaces after we load the smb.conf */
+       load_interfaces();
+
        string_replace(path, '/', '\\');
 
        server = SMB_STRDUP(path+2);