param: Rename variable used for lp_ldap_suffix szLdapSuffix

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 4ab9c8a58647a680fec849614547e5e67cb3bb71..0c7d3de9fcb8adf0dbdb586fc3098b87a39b13dc 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -389,7 +389,7 @@ FN_GLOBAL_STRING(enumports_cmd, enumports_cmd)
 FN_GLOBAL_STRING(get_quota_command, get_quota_command)
 FN_GLOBAL_STRING(iprint_server, iprint_server)
 FN_GLOBAL_STRING(ldap_admin_dn, ldap_admin_dn)
-FN_GLOBAL_STRING(ldap_suffix, szLdapSuffix)
+FN_GLOBAL_STRING(ldap_suffix, ldap_suffix)
 FN_GLOBAL_STRING(logfile, logfile)
 FN_GLOBAL_STRING(log_nt_token_command, szLogNtTokenCommand)
 FN_GLOBAL_STRING(mangling_method, szManglingMethod)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 626b5d21d400a6c24cb3daf8c55894152bc9672f..fe1089180d200f0808d1c83af22b9ecc43388daa 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3130,7 +3130,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap suffix",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szLdapSuffix),
+               .offset         = GLOBAL_VAR(ldap_suffix),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 08046597bb947bbe1f1bb5097dd827361c178b83..ce0d64e61b4dee72185507bf7cd7f67acb255447 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -902,7 +902,7 @@ static void init_globals(bool reinit_globals)
        Globals.hostname_lookups = false;
 
        string_set(&Globals.passdb_backend, "tdbsam");
-       string_set(&Globals.szLdapSuffix, "");
+       string_set(&Globals.ldap_suffix, "");
        string_set(&Globals.szLdapMachineSuffix, "");
        string_set(&Globals.szLdapUserSuffix, "");
        string_set(&Globals.szLdapGroupSuffix, "");
@@ -2986,7 +2986,7 @@ static const char *append_ldap_suffix(TALLOC_CTX *ctx, const char *str )
        const char *suffix_string;
 
        suffix_string = talloc_asprintf(ctx, "%s,%s", str,
-                                       Globals.szLdapSuffix );
+                                       Globals.ldap_suffix );
        if ( !suffix_string ) {
                DEBUG(0,("append_ldap_suffix: talloc_asprintf() failed!\n"));
                return "";
@@ -3000,7 +3000,7 @@ const char *lp_ldap_machine_suffix(TALLOC_CTX *ctx)
        if (Globals.szLdapMachineSuffix[0])
                return append_ldap_suffix(ctx, Globals.szLdapMachineSuffix);
 
-       return lp_string(ctx, Globals.szLdapSuffix);
+       return lp_string(ctx, Globals.ldap_suffix);
 }
 
 const char *lp_ldap_user_suffix(TALLOC_CTX *ctx)
@@ -3008,7 +3008,7 @@ const char *lp_ldap_user_suffix(TALLOC_CTX *ctx)
        if (Globals.szLdapUserSuffix[0])
                return append_ldap_suffix(ctx, Globals.szLdapUserSuffix);
 
-       return lp_string(ctx, Globals.szLdapSuffix);
+       return lp_string(ctx, Globals.ldap_suffix);
 }
 
 const char *lp_ldap_group_suffix(TALLOC_CTX *ctx)
@@ -3016,7 +3016,7 @@ const char *lp_ldap_group_suffix(TALLOC_CTX *ctx)
        if (Globals.szLdapGroupSuffix[0])
                return append_ldap_suffix(ctx, Globals.szLdapGroupSuffix);
 
-       return lp_string(ctx, Globals.szLdapSuffix);
+       return lp_string(ctx, Globals.ldap_suffix);
 }
 
 const char *lp_ldap_idmap_suffix(TALLOC_CTX *ctx)
@@ -3024,7 +3024,7 @@ const char *lp_ldap_idmap_suffix(TALLOC_CTX *ctx)
        if (Globals.szLdapIdmapSuffix[0])
                return append_ldap_suffix(ctx, Globals.szLdapIdmapSuffix);
 
-       return lp_string(ctx, Globals.szLdapSuffix);
+       return lp_string(ctx, Globals.ldap_suffix);
 }
 
 /****************************************************************************