param: Rename variable used for lp_winbind_separator szWinbindSeparator

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 ea2b6849642756d04bc7c04986191c79b735a0bb..632272d6d2376389186084baffb7e7ad71ef6e6a 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -267,7 +267,7 @@ FN_GLOBAL_CONST_STRING(unix_charset, unix_charset)
 FN_GLOBAL_CONST_STRING(utmpdir, utmpdir)
 FN_GLOBAL_CONST_STRING(winbindd_privileged_socket_directory, winbindd_privileged_socket_directory)
 FN_GLOBAL_CONST_STRING(winbindd_socket_directory, winbindd_socket_directory)
-FN_GLOBAL_CONST_STRING(winbind_separator, szWinbindSeparator)
+FN_GLOBAL_CONST_STRING(winbind_separator, winbind_separator)
 FN_GLOBAL_CONST_STRING(workgroup, szWorkgroup)
 FN_GLOBAL_CONST_STRING(wtmpdir, szWtmpDir)
 FN_GLOBAL_INTEGER(afs_token_lifetime, iAfsTokenLifetime)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index e1ba841c612452185adad8ed23f9b2764a65fe55..b0c4e7690d1fab2bc64fe8be88bfa21ffbb7d406 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3995,7 +3995,7 @@ static struct parm_struct parm_table[] = {
                .label          = "winbind separator",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szWinbindSeparator),
+               .offset         = GLOBAL_VAR(winbind_separator),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index bd6320bca42693f1c52c396f0f473473fc0859b1..eac92115b22a6a02f3b4c93815a243db33299051 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -960,7 +960,7 @@ static void init_globals(bool reinit_globals)
 
        string_set(&Globals.template_shell, "/bin/false");
        string_set(&Globals.template_homedir, "/home/%D/%U");
-       string_set(&Globals.szWinbindSeparator, "\\");
+       string_set(&Globals.winbind_separator, "\\");
        string_set(&Globals.winbindd_socket_directory, dyn_WINBINDD_SOCKET_DIR);
 
        string_set(&Globals.szCupsServer, "");