From cd0016d88c5594b72b61bc63d43578151bc9e8de Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 15 Jun 2015 23:45:45 +0200 Subject: [PATCH] param: rename szLdapGroupSuffix -> _ldap_group_suffix Signed-off-by: Michael Adam Reviewed-by: Jeremy Allison --- lib/param/loadparm.h | 2 +- lib/param/param_table.c | 2 +- source3/param/loadparm.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index c762259ba74..4efcd1b88c9 100644 --- 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 3a0247c066f..f73ef0308a8 100644 --- 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 beba137aacf..07981a11ffc 100644 --- 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); } -- 2.11.4.GIT