sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-21 21:44:21 +03:00
Code Activity

param: rename szLdapGroupSuffix -> _ldap_group_suffix

Browse Source 
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Michael Adam
2015-06-15 23:45:45 +02:00
committed by Jeremy Allison
parent 63e3c75374
commit cd0016d88c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/param/loadparm.h
View File

@@ -257,7 +257,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER};
char *szLdapMachineSuffix; \ char *szLdapMachineSuffix; \
char *szLdapUserSuffix; \ char *szLdapUserSuffix; \
char *szLdapIdmapSuffix; \ char *szLdapIdmapSuffix; \
char *szLdapGroupSuffix; \ char *_ldap_group_suffix; \
char *szIdmapUID; \ char *szIdmapUID; \
char *szIdmapGID; \ char *szIdmapGID; \
char *szIdmapBackend; \ char *szIdmapBackend; \

2
lib/param/param_table.c
View File

@@ -2818,7 +2818,7 @@ struct parm_struct parm_table[] = {
.label = "ldap group suffix", .label = "ldap group suffix",
.type = P_STRING, .type = P_STRING,
.p_class = P_GLOBAL, .p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szLdapGroupSuffix), .offset = GLOBAL_VAR(_ldap_group_suffix),
.special = NULL, .special = NULL,
.enum_list = NULL, .enum_list = NULL,
}, },

6
source3/param/loadparm.c
View File

@@ -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.ldap_suffix, "");
string_set(Globals.ctx, &Globals.szLdapMachineSuffix, ""); string_set(Globals.ctx, &Globals.szLdapMachineSuffix, "");
string_set(Globals.ctx, &Globals.szLdapUserSuffix, ""); 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.szLdapIdmapSuffix, "");
string_set(Globals.ctx, &Globals.ldap_admin_dn, ""); 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) const char *lp_ldap_group_suffix(TALLOC_CTX *ctx)
{ {
if (Globals.szLdapGroupSuffix[0]) if (Globals._ldap_group_suffix[0])
return append_ldap_suffix(ctx, Globals.szLdapGroupSuffix); return append_ldap_suffix(ctx, Globals._ldap_group_suffix);
return lp_string(ctx, Globals.ldap_suffix); return lp_string(ctx, Globals.ldap_suffix);
} }