From d2572dcb06338c3ee522009fd2ef9ad288d6a1cb Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Dec 2013 16:03:55 +1300 Subject: [PATCH] param: Rename variable used for lp_unicode bUnicode Signed-off-by: Andrew Bartlett Signed-off-by: Garming Sam Reviewed-by: Jeremy Allison --- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- source3/param/loadparm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 8c45622b272..e44cc8da52e 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 3246904735f..9bdb7a117de 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 420b2f97deb..09f2988fc3a 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; -- 2.11.4.GIT