From 614a0b9eff00bc88f200dac86615f269b4ac750f Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 16 Jun 2015 00:12:51 +0200 Subject: [PATCH] param: rename szLdapMachineSuffix -> _ldap_machine_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 352b90b9db0..ff9c8a8e87a 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -254,7 +254,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER}; char *szPrintcapname; \ int CupsEncrypt; \ int iPreferredMaster; \ - char *szLdapMachineSuffix; \ + char *_ldap_machine_suffix; \ char *szIdmapUID; \ char *szIdmapGID; \ char *szIdmapBackend; \ diff --git a/lib/param/param_table.c b/lib/param/param_table.c index f4adbd38fc0..986def536cc 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -2834,7 +2834,7 @@ struct parm_struct parm_table[] = { .label = "ldap machine suffix", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szLdapMachineSuffix), + .offset = GLOBAL_VAR(_ldap_machine_suffix), .special = NULL, .enum_list = NULL, }, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index f43be583c16..0f645b6b914 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -725,7 +725,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals) string_set(Globals.ctx, &Globals.passdb_backend, "tdbsam"); string_set(Globals.ctx, &Globals.ldap_suffix, ""); - string_set(Globals.ctx, &Globals.szLdapMachineSuffix, ""); + string_set(Globals.ctx, &Globals._ldap_machine_suffix, ""); string_set(Globals.ctx, &Globals._ldap_user_suffix, ""); string_set(Globals.ctx, &Globals._ldap_group_suffix, ""); string_set(Globals.ctx, &Globals._ldap_idmap_suffix, ""); @@ -2361,8 +2361,8 @@ static const char *append_ldap_suffix(TALLOC_CTX *ctx, const char *str ) const char *lp_ldap_machine_suffix(TALLOC_CTX *ctx) { - if (Globals.szLdapMachineSuffix[0]) - return append_ldap_suffix(ctx, Globals.szLdapMachineSuffix); + if (Globals._ldap_machine_suffix[0]) + return append_ldap_suffix(ctx, Globals._ldap_machine_suffix); return lp_string(ctx, Globals.ldap_suffix); } -- 2.34.1