param: rename szLdapIdmapSuffix -> _ldap_sz_idmap_suffix

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index 9b4d47bb401822c75b9877ba0f54821506c4aeff..eff7e239d57716f0acea161b76c4513c62bec413 100644 (file)
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -255,7 +255,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER};
        int CupsEncrypt;                                                \
        int  iPreferredMaster;                                          \
        char *szLdapMachineSuffix;                                      \
-       char *szLdapIdmapSuffix;                                        \
+       char *_ldap_idmap_suffix;                                       \
        char *szIdmapUID;                                               \
        char *szIdmapGID;                                               \
        char *szIdmapBackend;                                           \

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 54a70ca7c2655fd01aa3bf329136fe8070f45848..f4adbd38fc084005fa23eae574c2da5a34d25e3e 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2826,7 +2826,7 @@ struct parm_struct parm_table[] = {
                .label          = "ldap idmap suffix",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szLdapIdmapSuffix),
+               .offset         = GLOBAL_VAR(_ldap_idmap_suffix),
                .special        = NULL,
                .enum_list      = NULL,
        },

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index ccb5a571d51a7b71e12f4370b77b8efab4c350a5..f43be583c1634ca013d0dbd3707d42b072d15239 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -728,7 +728,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        string_set(Globals.ctx, &Globals.szLdapMachineSuffix, "");
        string_set(Globals.ctx, &Globals._ldap_user_suffix, "");
        string_set(Globals.ctx, &Globals._ldap_group_suffix, "");
-       string_set(Globals.ctx, &Globals.szLdapIdmapSuffix, "");
+       string_set(Globals.ctx, &Globals._ldap_idmap_suffix, "");
 
        string_set(Globals.ctx, &Globals.ldap_admin_dn, "");
        Globals.ldap_ssl = LDAP_SSL_START_TLS;
@@ -2385,8 +2385,8 @@ const char *lp_ldap_group_suffix(TALLOC_CTX *ctx)
 
 const char *lp_ldap_idmap_suffix(TALLOC_CTX *ctx)
 {
-       if (Globals.szLdapIdmapSuffix[0])
-               return append_ldap_suffix(ctx, Globals.szLdapIdmapSuffix);
+       if (Globals._ldap_idmap_suffix[0])
+               return append_ldap_suffix(ctx, Globals._ldap_idmap_suffix);
 
        return lp_string(ctx, Globals.ldap_suffix);
 }