summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-12-24 16:04:10 +1300
committerJeremy Allison <jra@samba.org>2014-01-24 16:18:59 -0800
commit774d29318d0342b56bcb98807dc185ae17ad678e (patch)
treec01d5a5bfe6ef6da016ffed52f1b3b1c9fa9d481
parent9ef5fe0180eb2fd495206097ea421709d18d2fc0 (diff)
downloadsamba-774d29318d0342b56bcb98807dc185ae17ad678e.tar.gz
samba-774d29318d0342b56bcb98807dc185ae17ad678e.tar.xz
samba-774d29318d0342b56bcb98807dc185ae17ad678e.zip
param: Rename variable used for lp_keepalive iKeepalive
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--lib/param/param_functions.c2
-rw-r--r--lib/param/param_table.c2
-rw-r--r--source3/param/loadparm.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index b58c70f4c1..fa0d1a6cce 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -289,7 +289,7 @@ FN_GLOBAL_INTEGER(_domain_master, domain_master)
FN_GLOBAL_INTEGER(idmap_cache_time, idmap_cache_time)
FN_GLOBAL_INTEGER(idmap_negative_cache_time, idmap_negative_cache_time)
FN_GLOBAL_INTEGER(init_logon_delay, init_logon_delay)
-FN_GLOBAL_INTEGER(keepalive, iKeepalive)
+FN_GLOBAL_INTEGER(keepalive, keepalive)
FN_GLOBAL_INTEGER(kerberos_method, iKerberosMethod)
FN_GLOBAL_INTEGER(kpasswd_port, kpasswd_port)
FN_GLOBAL_INTEGER(krb5_port, krb5_port)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 7c8e3573a7..8e03cfdb0a 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1758,7 +1758,7 @@ static struct parm_struct parm_table[] = {
.label = "keepalive",
.type = P_INTEGER,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(iKeepalive),
+ .offset = GLOBAL_VAR(keepalive),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 689622dd95..135322bde4 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1023,7 +1023,7 @@ static void init_globals(bool reinit_globals)
/* By default disallow guest access to usershares. */
Globals.usershare_allow_guests = false;
- Globals.iKeepalive = DEFAULT_KEEPALIVE;
+ Globals.keepalive = DEFAULT_KEEPALIVE;
/* By default no shares out of the registry */
Globals.registry_shares = false;