From 78e276a35d376e45333a6d2227c1e8beaf6e3cb5 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 21 Jul 2015 23:42:09 +0200 Subject: [PATCH] param: rename winbindMaxDomainConnections -> _winbind_max_domain_connections 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 3f1c3c90b2c..73680bb4de3 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -252,7 +252,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER}; char *szIdmapUID; \ char *szIdmapGID; \ char *szIdmapBackend; \ - int winbindMaxDomainConnections; + int _winbind_max_domain_connections; 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 e67a4f68910..7f39b88f389 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -3785,7 +3785,7 @@ struct parm_struct parm_table[] = { .label = "winbind max domain connections", .type = P_INTEGER, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(winbindMaxDomainConnections), + .offset = GLOBAL_VAR(_winbind_max_domain_connections), .special = NULL, .enum_list = NULL, }, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 8aedf225a60..db756d3a07b 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -714,7 +714,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals) Globals.reset_on_zero_vc = false; Globals.log_writeable_files_on_exit = false; Globals.create_krb5_conf = true; - Globals.winbindMaxDomainConnections = 1; + Globals._winbind_max_domain_connections = 1; /* hostname lookups can be very expensive and are broken on a large number of sites (tridge) */ @@ -1020,7 +1020,7 @@ char *lp_ ## fn_name(TALLOC_CTX *ctx,int i) {return(lp_string((ctx), (LP_SNUM_OK char lp_ ## fn_name(const struct share_params *p) {return(LP_SNUM_OK(p->service)? ServicePtrs[(p->service)]->val : sDefault.val);} static FN_GLOBAL_INTEGER(winbind_max_domain_connections_int, - winbindMaxDomainConnections) + _winbind_max_domain_connections) int lp_winbind_max_domain_connections(void) { -- 2.11.4.GIT