From 1f68d3371899e78e9bed6d74ae385c761bfd3442 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Dec 2013 16:04:13 +1300 Subject: [PATCH] param: Rename variable used for lp_lock_spin_time iLockSpinTime 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 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index eaca104c51d..fa3d5a6ed9b 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -305,7 +305,7 @@ FN_GLOBAL_INTEGER(ldap_ssl, ldap_ssl) FN_GLOBAL_INTEGER(ldap_timeout, ldap_timeout) FN_GLOBAL_INTEGER(lm_announce, lm_announce) FN_GLOBAL_INTEGER(lm_interval, lm_interval) -FN_GLOBAL_INTEGER(lock_spin_time, iLockSpinTime) +FN_GLOBAL_INTEGER(lock_spin_time, lock_spin_time) FN_GLOBAL_INTEGER(lpqcachetime, lpqcachetime) FN_GLOBAL_INTEGER(machine_password_timeout, machine_password_timeout) FN_GLOBAL_INTEGER(mangle_prefix, mangle_prefix) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 9092511b588..5e6be21535c 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -2992,7 +2992,7 @@ static struct parm_struct parm_table[] = { .label = "lock spin time", .type = P_INTEGER, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(iLockSpinTime), + .offset = GLOBAL_VAR(lock_spin_time), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED | FLAG_GLOBAL, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 135322bde40..b6f15a9bdc3 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -884,7 +884,7 @@ static void init_globals(bool reinit_globals) Globals.map_to_guest = 0; /* By Default, "Never" */ Globals.oplock_break_wait_time = 0; /* By Default, 0 msecs. */ Globals.enhanced_browsing = true; - Globals.iLockSpinTime = WINDOWS_MINIMUM_LOCK_TIMEOUT_MS; /* msec. */ + Globals.lock_spin_time = WINDOWS_MINIMUM_LOCK_TIMEOUT_MS; /* msec. */ #ifdef MMAP_BLACKLIST Globals.use_mmap = false; #else -- 2.11.4.GIT