summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-12-24 16:03:55 +1300
committerJeremy Allison <jra@samba.org>2014-01-24 16:18:55 -0800
commitd2572dcb06338c3ee522009fd2ef9ad288d6a1cb (patch)
treea22545ac07fe1e767e2b9acb0e0c1d3d10f277c9
parent00efddb90692c6516ba507b8bdd82f5541073111 (diff)
downloadsamba-d2572dcb06338c3ee522009fd2ef9ad288d6a1cb.tar.gz
samba-d2572dcb06338c3ee522009fd2ef9ad288d6a1cb.tar.xz
samba-d2572dcb06338c3ee522009fd2ef9ad288d6a1cb.zip
param: Rename variable used for lp_unicode bUnicode
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 8c45622b27..e44cc8da52 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -215,7 +215,7 @@ FN_GLOBAL_BOOL(syslog_only, syslog_only)
FN_GLOBAL_BOOL(timestamp_logs, timestamp_logs)
FN_GLOBAL_BOOL(time_server, time_server)
FN_GLOBAL_BOOL(tls_enabled, tls_enabled)
-FN_GLOBAL_BOOL(unicode, bUnicode)
+FN_GLOBAL_BOOL(unicode, unicode)
FN_GLOBAL_BOOL(unix_extensions, bUnixExtensions)
FN_GLOBAL_BOOL(unix_password_sync, bUnixPasswdSync)
FN_GLOBAL_BOOL(use_mmap, bUseMmap)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 3246904735..9bdb7a117d 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1385,7 +1385,7 @@ static struct parm_struct parm_table[] = {
.label = "unicode",
.type = P_BOOL,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(bUnicode),
+ .offset = GLOBAL_VAR(unicode),
.special = NULL,
.enum_list = NULL
},
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 420b2f97de..09f2988fc3 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -890,7 +890,7 @@ static void init_globals(bool reinit_globals)
#else
Globals.bUseMmap = true;
#endif
- Globals.bUnicode = true;
+ Globals.unicode = true;
Globals.bUnixExtensions = true;
Globals.reset_on_zero_vc = false;
Globals.log_writeable_files_on_exit = false;