param: Rename variable used for lp_template_shell szTemplateShell

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 e430a4d3d6fa1bdb03bf44a453e7825c156501d7..b10b8b898eaeca11db61492e6fdab0c60ff657fd 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -262,7 +262,7 @@ FN_GLOBAL_CONST_STRING(realm, realm)
 FN_GLOBAL_CONST_STRING(smb_passwd_file, smb_passwd_file)
 FN_GLOBAL_CONST_STRING(socket_options, socket_options)
 FN_GLOBAL_CONST_STRING(template_homedir, template_homedir)
-FN_GLOBAL_CONST_STRING(template_shell, szTemplateShell)
+FN_GLOBAL_CONST_STRING(template_shell, template_shell)
 FN_GLOBAL_CONST_STRING(unix_charset, unix_charset)
 FN_GLOBAL_CONST_STRING(utmpdir, szUtmpDir)
 FN_GLOBAL_CONST_STRING(winbindd_privileged_socket_directory, szWinbinddPrivilegedSocketDirectory)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 030f6655df820590000e9fb3684ce4250f7079f3..e5929529242aaf40a875562ed6d168216c394573 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3986,7 +3986,7 @@ static struct parm_struct parm_table[] = {
                .label          = "template shell",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szTemplateShell),
+               .offset         = GLOBAL_VAR(template_shell),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 293a8afedb610c993342a7f24d15ef95e69b0300..6199fd699149905780a635ff196fcd9b9b8c33d7 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -958,7 +958,7 @@ static void init_globals(bool reinit_globals)
        Globals.allow_trusted_domains = true;
        string_set(&Globals.szIdmapBackend, "tdb");
 
-       string_set(&Globals.szTemplateShell, "/bin/false");
+       string_set(&Globals.template_shell, "/bin/false");
        string_set(&Globals.template_homedir, "/home/%D/%U");
        string_set(&Globals.szWinbindSeparator, "\\");
        string_set(&Globals.szWinbinddSocketDirectory, dyn_WINBINDD_SOCKET_DIR);