diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-12-24 16:04:05 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-01-24 16:18:58 -0800 |
| commit | d7d16a8e7989f6468060d17eb019310fed79cc5a (patch) | |
| tree | 6a434ddcb07761cc1ad228be0c07cd96dd306b07 | |
| parent | b848ffc79e0b2fcde74e77b9c7b447a224f1f803 (diff) | |
| download | samba-d7d16a8e7989f6468060d17eb019310fed79cc5a.tar.gz samba-d7d16a8e7989f6468060d17eb019310fed79cc5a.tar.xz samba-d7d16a8e7989f6468060d17eb019310fed79cc5a.zip | |
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>
| -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 ea2b684964..632272d6d2 100644 --- 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 e1ba841c61..b0c4e7690d 100644 --- 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 bd6320bca4..eac92115b2 100644 --- 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, ""); |