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>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index b58c70f4c1e902fbbe3116d81c7670d6fed74132..fa0d1a6cce6ca0741aa3eac0b152fac165cfbff6 100644 (file)
--- 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 7c8e3573a744584c755dcbf92daac1c520db24b5..8e03cfdb0a8079cd91a639857b870486da78b702 100644 (file)
--- 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 689622dd9599d9ab312c9745211704652245cc0a..135322bde40a6d26b55ec94c27502345486ef505 100644 (file)
--- 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;