Changeset 989 for vendor/current/source3/utils/smbcquotas.c

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/source3/utils/smbcquotas.c (modified) (3 diffs)

vendor/current/source3/utils/smbcquotas.c

@@ -569 +569 @@
         struct cli_state *cli;
         bool fix_user = False;
+        bool ok;
         SMB_NTQUOTA_STRUCT qt;
         TALLOC_CTX *frame = talloc_stackframe();
@@ -602 +603 @@
         fault_setup();
 
-        lp_load_global(get_dyn_CONFIGFILE());
-        load_interfaces();
-
         smbcquotas_auth_info = user_auth_info_init(frame);
         if (smbcquotas_auth_info == NULL) {
@@ -695 +693 @@
         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, '/', '\\');