param: rename szLdapGroupSuffix -> _ldap_group_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 c762259ba747f3b8dd7af0998dd80ea92fd96ecb..4efcd1b88c9132cb6a1168d5e73a311d6071b52e 100644 (file)
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -257,7 +257,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER};
        char *szLdapMachineSuffix;                                      \
        char *szLdapUserSuffix;                                         \
        char *szLdapIdmapSuffix;                                        \
-       char *szLdapGroupSuffix;                                        \
+       char *_ldap_group_suffix;                                       \
        char *szIdmapUID;                                               \
        char *szIdmapGID;                                               \
        char *szIdmapBackend;                                           \

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 3a0247c066f4c9738d3bb64ccbacc92597e3b61a..f73ef0308a840ff9d78581c690bac609d83f3165 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2818,7 +2818,7 @@ struct parm_struct parm_table[] = {
                .label          = "ldap group suffix",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szLdapGroupSuffix),
+               .offset         = GLOBAL_VAR(_ldap_group_suffix),
                .special        = NULL,
                .enum_list      = NULL,
        },

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index beba137aacf211081816c68aec1367b4081fb242..07981a11ffcf831af4a61654f7daa8c71a582185 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -727,7 +727,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        string_set(Globals.ctx, &Globals.ldap_suffix, "");
        string_set(Globals.ctx, &Globals.szLdapMachineSuffix, "");
        string_set(Globals.ctx, &Globals.szLdapUserSuffix, "");
-       string_set(Globals.ctx, &Globals.szLdapGroupSuffix, "");
+       string_set(Globals.ctx, &Globals._ldap_group_suffix, "");
        string_set(Globals.ctx, &Globals.szLdapIdmapSuffix, "");
 
        string_set(Globals.ctx, &Globals.ldap_admin_dn, "");
@@ -2377,8 +2377,8 @@ const char *lp_ldap_user_suffix(TALLOC_CTX *ctx)
 
 const char *lp_ldap_group_suffix(TALLOC_CTX *ctx)
 {
-       if (Globals.szLdapGroupSuffix[0])
-               return append_ldap_suffix(ctx, Globals.szLdapGroupSuffix);
+       if (Globals._ldap_group_suffix[0])
+               return append_ldap_suffix(ctx, Globals._ldap_group_suffix);
 
        return lp_string(ctx, Globals.ldap_suffix);
 }