From 64c3eeee82fd22998f50d5e48f95cb16e41c39c0 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Dec 2013 16:04:08 +1300 Subject: [PATCH] param: Rename variable used for lp_config_backend ConfigBackend 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 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index cd226139f68..77b15a5b8ae 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -279,7 +279,7 @@ FN_GLOBAL_INTEGER(client_schannel, client_schannel) FN_GLOBAL_INTEGER(client_signing, client_signing) FN_GLOBAL_INTEGER(cli_maxprotocol, cli_maxprotocol) FN_GLOBAL_INTEGER(cli_minprotocol, cli_minprotocol) -FN_GLOBAL_INTEGER(config_backend, ConfigBackend) +FN_GLOBAL_INTEGER(config_backend, config_backend) FN_GLOBAL_INTEGER(ctdb_locktime_warn_threshold, ctdb_locktime_warn_threshold) FN_GLOBAL_INTEGER(ctdb_timeout, ctdb_timeout) FN_GLOBAL_INTEGER(cups_connection_timeout, cups_connection_timeout) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 6231391828c..32ab2557f65 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -400,7 +400,7 @@ static struct parm_struct parm_table[] = { .label = "config backend", .type = P_ENUM, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(ConfigBackend), + .offset = GLOBAL_VAR(config_backend), .special = NULL, .enum_list = enum_config_backend, .flags = FLAG_HIDE|FLAG_ADVANCED|FLAG_META, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 3f92d549f69..7156d47928d 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -808,7 +808,7 @@ static void init_globals(bool reinit_globals) Globals.load_printers = true; Globals.PrintcapCacheTime = 750; /* 12.5 minutes */ - Globals.ConfigBackend = config_backend; + Globals.config_backend = config_backend; Globals.server_role = ROLE_AUTO; /* Was 65535 (0xFFFF). 0x4101 matches W2K and causes major speed improvements... */ @@ -4865,7 +4865,7 @@ static bool lp_load_ex(const char *pszFname, /* * We need to use this extra global variable here to * survive restart: init_globals uses this as a default - * for ConfigBackend. Otherwise, init_globals would + * for config_backend. Otherwise, init_globals would * send us into an endless loop here. */ config_backend = CONFIG_BACKEND_REGISTRY; -- 2.11.4.GIT