From 1f9209a5505d5a5bb99b991d03ed2de70b6f0a39 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Dec 2013 16:04:30 +1300 Subject: [PATCH] param: Rename variable used for lp_ldap_suffix szLdapSuffix Signed-off-by: Andrew Bartlett Signed-off-by: Garming Sam Reviewed-by: Jeremy Allison --- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- source3/param/loadparm.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 4ab9c8a5864..0c7d3de9fcb 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -389,7 +389,7 @@ 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, ldap_admin_dn) -FN_GLOBAL_STRING(ldap_suffix, szLdapSuffix) +FN_GLOBAL_STRING(ldap_suffix, ldap_suffix) FN_GLOBAL_STRING(logfile, logfile) FN_GLOBAL_STRING(log_nt_token_command, szLogNtTokenCommand) FN_GLOBAL_STRING(mangling_method, szManglingMethod) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 626b5d21d40..fe1089180d2 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -3130,7 +3130,7 @@ static struct parm_struct parm_table[] = { .label = "ldap suffix", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szLdapSuffix), + .offset = GLOBAL_VAR(ldap_suffix), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 08046597bb9..ce0d64e61b4 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -902,7 +902,7 @@ static void init_globals(bool reinit_globals) Globals.hostname_lookups = false; string_set(&Globals.passdb_backend, "tdbsam"); - string_set(&Globals.szLdapSuffix, ""); + string_set(&Globals.ldap_suffix, ""); string_set(&Globals.szLdapMachineSuffix, ""); string_set(&Globals.szLdapUserSuffix, ""); string_set(&Globals.szLdapGroupSuffix, ""); @@ -2986,7 +2986,7 @@ static const char *append_ldap_suffix(TALLOC_CTX *ctx, const char *str ) const char *suffix_string; suffix_string = talloc_asprintf(ctx, "%s,%s", str, - Globals.szLdapSuffix ); + Globals.ldap_suffix ); if ( !suffix_string ) { DEBUG(0,("append_ldap_suffix: talloc_asprintf() failed!\n")); return ""; @@ -3000,7 +3000,7 @@ const char *lp_ldap_machine_suffix(TALLOC_CTX *ctx) if (Globals.szLdapMachineSuffix[0]) return append_ldap_suffix(ctx, Globals.szLdapMachineSuffix); - return lp_string(ctx, Globals.szLdapSuffix); + return lp_string(ctx, Globals.ldap_suffix); } const char *lp_ldap_user_suffix(TALLOC_CTX *ctx) @@ -3008,7 +3008,7 @@ const char *lp_ldap_user_suffix(TALLOC_CTX *ctx) if (Globals.szLdapUserSuffix[0]) return append_ldap_suffix(ctx, Globals.szLdapUserSuffix); - return lp_string(ctx, Globals.szLdapSuffix); + return lp_string(ctx, Globals.ldap_suffix); } const char *lp_ldap_group_suffix(TALLOC_CTX *ctx) @@ -3016,7 +3016,7 @@ const char *lp_ldap_group_suffix(TALLOC_CTX *ctx) if (Globals.szLdapGroupSuffix[0]) return append_ldap_suffix(ctx, Globals.szLdapGroupSuffix); - return lp_string(ctx, Globals.szLdapSuffix); + return lp_string(ctx, Globals.ldap_suffix); } const char *lp_ldap_idmap_suffix(TALLOC_CTX *ctx) @@ -3024,7 +3024,7 @@ const char *lp_ldap_idmap_suffix(TALLOC_CTX *ctx) if (Globals.szLdapIdmapSuffix[0]) return append_ldap_suffix(ctx, Globals.szLdapIdmapSuffix); - return lp_string(ctx, Globals.szLdapSuffix); + return lp_string(ctx, Globals.ldap_suffix); } /**************************************************************************** -- 2.11.4.GIT