summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-01-10 11:26:15 +1300
committerMichael Adam <obnox@samba.org>2014-01-31 08:05:50 +0100
commit7ebd3bb3f138ade267c03b1efdcd71d52acc356f (patch)
tree24fd8848cc498bfcf4bdc563b01199ad3a1f4105
parent09b8816b8f733570f25d3d67365b611767e223ab (diff)
downloadsamba-7ebd3bb3f138ade267c03b1efdcd71d52acc356f.tar.gz
samba-7ebd3bb3f138ade267c03b1efdcd71d52acc356f.tar.xz
samba-7ebd3bb3f138ade267c03b1efdcd71d52acc356f.zip
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>
-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 a32211dd1a..a429c6a76d 100644
--- 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 49fc7b2b11..667c204a49 100644
--- 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 126a29d498..3d0a5c76ab 100644
--- 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;