From 8c0217c2a2107230a034d514bd2cd0aa9a185d32 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 22 Jul 2015 19:11:12 +0200 Subject: [PATCH] param: rename szIdmapBackend -> idmap_backend Signed-off-by: Michael Adam Reviewed-by: Jeremy Allison --- lib/param/loadparm.h | 2 +- lib/param/param_table.c | 2 +- source3/param/loadparm.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 0893feedb7c..7e429f667c6 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -250,7 +250,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER}; char *realm_original; \ char *szIdmapUID; \ char *szIdmapGID; \ - char *szIdmapBackend; + char *idmap_backend; const char* server_role_str(uint32_t role); int lp_find_server_role(int server_role, int security, int domain_logons, int domain_master); diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 2c292ecf72e..f2762da43a9 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -3564,7 +3564,7 @@ struct parm_struct parm_table[] = { .label = "idmap backend", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szIdmapBackend), + .offset = GLOBAL_VAR(idmap_backend), .special = handle_idmap_backend, .enum_list = NULL, .flags = FLAG_DEPRECATED, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index caa98568562..87e63e2f765 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -776,7 +776,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals) Globals.wins_dns_proxy = true; Globals.allow_trusted_domains = true; - string_set(Globals.ctx, &Globals.szIdmapBackend, "tdb"); + string_set(Globals.ctx, &Globals.idmap_backend, "tdb"); string_set(Globals.ctx, &Globals.template_shell, "/bin/false"); string_set(Globals.ctx, &Globals.template_homedir, "/home/%D/%U"); @@ -3633,7 +3633,7 @@ static bool lp_load_ex(const char *pszFname, apply_lp_set_cmdline(); } - lp_do_parameter(-1, "idmap config * : backend", Globals.szIdmapBackend); + lp_do_parameter(-1, "idmap config * : backend", Globals.idmap_backend); /* We get sections first, so have to start 'behind' to make up */ iServiceIndex = -1; -- 2.11.4.GIT