param: Rename variable used for lp__security security

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index a32211dd1a116a1afe17b6b67cafdb05f1bfbbbd..a429c6a76de680f9a49a0cd113a1dc249c845127 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -327,7 +327,7 @@ FN_GLOBAL_INTEGER(os_level, os_level)
 FN_GLOBAL_INTEGER(passwd_chat_timeout, passwd_chat_timeout)
 FN_GLOBAL_INTEGER(printcap_cache_time, printcap_cache_time)
 FN_GLOBAL_INTEGER(restrict_anonymous, restrict_anonymous)
-FN_GLOBAL_INTEGER(_security, security)
+FN_GLOBAL_INTEGER(_security, _security)
 FN_GLOBAL_INTEGER(_server_role, server_role)
 FN_GLOBAL_INTEGER(server_schannel, server_schannel)
 FN_GLOBAL_INTEGER(server_signing, server_signing)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 49fc7b2b11914fa2063c3ca775ef7dd404069c0f..667c204a49ef874047b3f9283874100ec2c4fbc3 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -421,7 +421,7 @@ static struct parm_struct parm_table[] = {
                .label          = "security",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(security),
+               .offset         = GLOBAL_VAR(_security),
                .special        = NULL,
                .enum_list      = enum_security,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 126a29d49836a6c344ffd4903fd3f1a0d709ac56..3d0a5c76ab68ee62cf9c6191f31663fc8c302215 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -827,7 +827,7 @@ static void init_globals(bool reinit_globals)
        Globals.srv_minprotocol = PROTOCOL_LANMAN1;
        Globals.cli_maxprotocol = PROTOCOL_NT1;
        Globals.cli_minprotocol = PROTOCOL_CORE;
-       Globals.security = SEC_AUTO;
+       Globals._security = SEC_AUTO;
        Globals.encrypted_passwords = true;
        Globals.client_schannel = Auto;
        Globals.winbind_sealed_pipes = true;