diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-12-24 16:04:06 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-01-24 16:18:58 -0800 |
| commit | 37f67b8d5afd7695e7f43bc847de28f7218c9063 (patch) | |
| tree | a402dd5f5d920a8278596575ec38429a8d738e66 | |
| parent | d7d16a8e7989f6468060d17eb019310fed79cc5a (diff) | |
| download | samba-37f67b8d5afd7695e7f43bc847de28f7218c9063.tar.gz samba-37f67b8d5afd7695e7f43bc847de28f7218c9063.tar.xz samba-37f67b8d5afd7695e7f43bc847de28f7218c9063.zip | |
param: Rename variable used for lp_workgroup szWorkgroup
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 632272d6d2..9df7a8b1ae 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -268,7 +268,7 @@ 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, winbind_separator) -FN_GLOBAL_CONST_STRING(workgroup, szWorkgroup) +FN_GLOBAL_CONST_STRING(workgroup, workgroup) FN_GLOBAL_CONST_STRING(wtmpdir, szWtmpDir) FN_GLOBAL_INTEGER(afs_token_lifetime, iAfsTokenLifetime) FN_GLOBAL_INTEGER(algorithmic_rid_base, AlgorithmicRidBase) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index b0c4e7690d..40d99d2841 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -328,7 +328,7 @@ static struct parm_struct parm_table[] = { .label = "workgroup", .type = P_USTRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szWorkgroup), + .offset = GLOBAL_VAR(workgroup), .special = NULL, .enum_list = NULL, .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index eac92115b2..ea0afff277 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -770,7 +770,7 @@ static void init_globals(bool reinit_globals) */ string_set(&Globals.szPasswdChat, DEFAULT_PASSWD_CHAT); - string_set(&Globals.szWorkgroup, DEFAULT_WORKGROUP); + string_set(&Globals.workgroup, DEFAULT_WORKGROUP); string_set(&Globals.szPasswdProgram, ""); string_set(&Globals.lockdir, get_dyn_LOCKDIR()); |