s3:loadparm: rename parameter "allow_registry_shares" to "load_all_shares"
authorMichael Adam <obnox@samba.org>
Thu, 21 Jul 2011 12:05:24 +0000 (14:05 +0200)
committerMichael Adam <obnox@samba.org>
Thu, 28 Jul 2011 09:17:25 +0000 (11:17 +0200)
source3/param/loadparm.c

index 6cab934aecfe142a3c26e2b15c7e0e3198abeb51..32aaed4fdb582f5d4c7bc5905d6e12a5c1bab184 100644 (file)
@@ -8965,7 +8965,7 @@ static bool lp_load_ex(const char *pszFname,
                       bool add_ipc,
                       bool initialize_globals,
                       bool allow_include_registry,
-                      bool allow_registry_shares)
+                      bool load_all_shares)
 {
        char *n2 = NULL;
        bool bRetval;
@@ -9032,7 +9032,7 @@ static bool lp_load_ex(const char *pszFname,
                        return lp_load_ex(pszFname, global_only, save_defaults,
                                          add_ipc, initialize_globals,
                                          allow_include_registry,
-                                         allow_registry_shares);
+                                         load_all_shares);
                }
        } else if (lp_config_backend_is_registry()) {
                bRetval = process_registry_globals();
@@ -9043,7 +9043,7 @@ static bool lp_load_ex(const char *pszFname,
        }
 
        if (bRetval && lp_registry_shares()) {
-               if (allow_registry_shares) {
+               if (load_all_shares) {
                        bRetval = process_registry_shares();
                } else {
                        bRetval = reload_registry_shares();
@@ -9104,7 +9104,7 @@ bool lp_load(const char *pszFname,
                          add_ipc,
                          initialize_globals,
                          true,   /* allow_include_registry */
-                         false); /* allow_registry_shares*/
+                         false); /* load_all_shares*/
 }
 
 bool lp_load_initial_only(const char *pszFname)
@@ -9115,7 +9115,7 @@ bool lp_load_initial_only(const char *pszFname)
                          false,  /* add_ipc */
                          true,   /* initialize_globals */
                          false,  /* allow_include_registry */
-                         false); /* allow_registry_shares*/
+                         false); /* load_all_shares*/
 }
 
 bool lp_load_with_registry_shares(const char *pszFname,
@@ -9130,7 +9130,7 @@ bool lp_load_with_registry_shares(const char *pszFname,
                          add_ipc,
                          initialize_globals,
                          true,  /* allow_include_registry */
-                         true); /* allow_registry_shares*/
+                         true); /* load_all_shares*/
 }
 
 /***************************************************************************