param: Rename variable used for lp_mangling_method szManglingMethod
authorAndrew Bartlett <abartlet@samba.org>
Tue, 24 Dec 2013 03:04:31 +0000 (16:04 +1300)
committerJeremy Allison <jra@samba.org>
Sat, 25 Jan 2014 00:19:03 +0000 (16:19 -0800)
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>
lib/param/param_functions.c
lib/param/param_table.c
source3/param/loadparm.c

index 8ec38cdf6468ed6dd887122b8f060293aeabd6ec..c2b60af92658ba92d99aebd980ac1055d06c94ae 100644 (file)
@@ -392,7 +392,7 @@ FN_GLOBAL_STRING(ldap_admin_dn, ldap_admin_dn)
 FN_GLOBAL_STRING(ldap_suffix, ldap_suffix)
 FN_GLOBAL_STRING(logfile, logfile)
 FN_GLOBAL_STRING(log_nt_token_command, log_nt_token_command)
-FN_GLOBAL_STRING(mangling_method, szManglingMethod)
+FN_GLOBAL_STRING(mangling_method, mangling_method)
 FN_GLOBAL_STRING(msg_command, szMsgCommand)
 FN_GLOBAL_STRING(nis_home_map_name, szNISHomeMapName)
 FN_GLOBAL_STRING(os2_driver_map, szOs2DriverMap)
index 0bfa6d410358047d11867ab8e2e0c30a4f1aae4e..81cdf37e63e12abcc52fab89fc458738deadde35 100644 (file)
@@ -2351,7 +2351,7 @@ static struct parm_struct parm_table[] = {
                .label          = "mangling method",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szManglingMethod),
+               .offset         = GLOBAL_VAR(mangling_method),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
index ce0d64e61b4dee72185507bf7cd7f67acb255447..6ba6a69f71f1029cc8d10f94e2bbcd418e1e3dec 100644 (file)
@@ -754,7 +754,7 @@ static void init_globals(bool reinit_globals)
        string_set(&Globals.private_dir, get_dyn_PRIVATE_DIR());
 
        /* use the new 'hash2' method by default, with a prefix of 1 */
-       string_set(&Globals.szManglingMethod, "hash2");
+       string_set(&Globals.mangling_method, "hash2");
        Globals.mangle_prefix = 1;
 
        string_set(&Globals.guestaccount, GUEST_ACCOUNT);
@@ -5391,7 +5391,7 @@ void set_store_dos_attributes(int snum, bool val)
 
 void lp_set_mangling_method(const char *new_method)
 {
-       string_set(&Globals.szManglingMethod, new_method);
+       string_set(&Globals.mangling_method, new_method);
 }
 
 /*******************************************************************