param: Rename variable used for lp_ldap_admin_dn szLdapAdminDn

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 67e53f3e6e594f34361a87a958fafefeed8db319..4ab9c8a58647a680fec849614547e5e67cb3bb71 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -388,7 +388,7 @@ FN_GLOBAL_STRING(deluser_script, deluser_script)
 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, szLdapAdminDn)
+FN_GLOBAL_STRING(ldap_admin_dn, ldap_admin_dn)
 FN_GLOBAL_STRING(ldap_suffix, szLdapSuffix)
 FN_GLOBAL_STRING(logfile, logfile)
 FN_GLOBAL_STRING(log_nt_token_command, szLogNtTokenCommand)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 1545670a8ed8311d4b0acb0f8480459774c3de52..626b5d21d400a6c24cb3daf8c55894152bc9672f 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3058,7 +3058,7 @@ static struct parm_struct parm_table[] = {
                .label          = "ldap admin dn",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szLdapAdminDn),
+               .offset         = GLOBAL_VAR(ldap_admin_dn),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 1076479666e5a643ca8745a07e1567b98988d5a2..08046597bb947bbe1f1bb5097dd827361c178b83 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -908,7 +908,7 @@ static void init_globals(bool reinit_globals)
        string_set(&Globals.szLdapGroupSuffix, "");
        string_set(&Globals.szLdapIdmapSuffix, "");
 
-       string_set(&Globals.szLdapAdminDn, "");
+       string_set(&Globals.ldap_admin_dn, "");
        Globals.ldap_ssl = LDAP_SSL_START_TLS;
        Globals.ldap_ssl_ads = false;
        Globals.ldap_deref = -1;