diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-12-24 16:04:03 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-01-24 16:18:58 -0800 |
| commit | 3198a055bfcec0ef954119edcb3df2da37acc93e (patch) | |
| tree | 6fd236086242093424dee5c8a8a0c350527d429f | |
| parent | 137d72dd28eeea53e12e02cf3280e2f1a23bbc02 (diff) | |
| download | samba-3198a055bfcec0ef954119edcb3df2da37acc93e.tar.gz samba-3198a055bfcec0ef954119edcb3df2da37acc93e.tar.xz samba-3198a055bfcec0ef954119edcb3df2da37acc93e.zip | |
param: Rename variable used for lp_private_dir szPrivateDir
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 | 4 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 0ac87a39ec..04d7fa5d29 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -257,7 +257,7 @@ FN_GLOBAL_CONST_STRING(ntp_signd_socket_directory, ntp_signd_socket_directory) FN_GLOBAL_CONST_STRING(passdb_backend, passdb_backend) FN_GLOBAL_CONST_STRING(passwordserver, passwordserver) FN_GLOBAL_CONST_STRING(piddir, piddir) -FN_GLOBAL_CONST_STRING(private_dir, szPrivateDir) +FN_GLOBAL_CONST_STRING(private_dir, private_dir) FN_GLOBAL_CONST_STRING(realm, szRealm_upper) FN_GLOBAL_CONST_STRING(smb_passwd_file, szSMBPasswdFile) FN_GLOBAL_CONST_STRING(socket_options, socket_options) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 8c696cddb0..34decc9595 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -520,7 +520,7 @@ static struct parm_struct parm_table[] = { .label = "private dir", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szPrivateDir), + .offset = GLOBAL_VAR(private_dir), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, @@ -529,7 +529,7 @@ static struct parm_struct parm_table[] = { .label = "private directory", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szPrivateDir), + .offset = GLOBAL_VAR(private_dir), .special = NULL, .enum_list = NULL, .flags = FLAG_HIDE, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index b9562c7e90..1197755316 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -751,7 +751,7 @@ static void init_globals(bool reinit_globals) string_set(&Globals.netbios_name, myhostname_upper()); string_set(&Globals.szSMBPasswdFile, get_dyn_SMB_PASSWD_FILE()); - string_set(&Globals.szPrivateDir, get_dyn_PRIVATE_DIR()); + string_set(&Globals.private_dir, get_dyn_PRIVATE_DIR()); /* use the new 'hash2' method by default, with a prefix of 1 */ string_set(&Globals.szManglingMethod, "hash2"); |