diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-12-24 16:04:04 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-01-24 16:18:58 -0800 |
| commit | c7a09766f1a15489001915f4c9863ca72cc4c52b (patch) | |
| tree | 91937739a33d9ee2cc677f0336458011e67c296a | |
| parent | 8fdb3739c5c826cda7a1a01d365caa84356f6939 (diff) | |
| download | samba-c7a09766f1a15489001915f4c9863ca72cc4c52b.tar.gz samba-c7a09766f1a15489001915f4c9863ca72cc4c52b.tar.xz samba-c7a09766f1a15489001915f4c9863ca72cc4c52b.zip | |
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>
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -rw-r--r-- | 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 e430a4d3d6..b10b8b898e 100644 --- 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 030f6655df..e592952924 100644 --- 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 293a8afedb..6199fd6991 100644 --- 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); |