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 | bcea89bd59306e8da7705a9e98cd6b83b78b831f (patch) | |
| tree | b8337bcc0de6bafcfe31b3150a4a00af44f1d0c3 | |
| parent | 0053af8f5df3f5a203bacbdda18932c5a639fbd6 (diff) | |
| download | samba-bcea89bd59306e8da7705a9e98cd6b83b78b831f.tar.gz samba-bcea89bd59306e8da7705a9e98cd6b83b78b831f.tar.xz samba-bcea89bd59306e8da7705a9e98cd6b83b78b831f.zip | |
param: Rename variable used for lp_smb_passwd_file szSMBPasswdFile
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 b67c385d83..415a6bfa54 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -259,7 +259,7 @@ FN_GLOBAL_CONST_STRING(passwordserver, passwordserver) FN_GLOBAL_CONST_STRING(piddir, piddir) FN_GLOBAL_CONST_STRING(private_dir, private_dir) FN_GLOBAL_CONST_STRING(realm, realm) -FN_GLOBAL_CONST_STRING(smb_passwd_file, szSMBPasswdFile) +FN_GLOBAL_CONST_STRING(smb_passwd_file, smb_passwd_file) FN_GLOBAL_CONST_STRING(socket_options, socket_options) FN_GLOBAL_CONST_STRING(template_homedir, szTemplateHomedir) FN_GLOBAL_CONST_STRING(template_shell, szTemplateShell) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 6e5e035338..2bb0f9b611 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -511,7 +511,7 @@ static struct parm_struct parm_table[] = { .label = "smb passwd file", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szSMBPasswdFile), + .offset = GLOBAL_VAR(smb_passwd_file), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 7ba53c0730..78ebddf1dd 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -750,7 +750,7 @@ static void init_globals(bool reinit_globals) /* Must manually force to upper case here, as this does not go via the handler */ string_set(&Globals.netbios_name, myhostname_upper()); - string_set(&Globals.szSMBPasswdFile, get_dyn_SMB_PASSWD_FILE()); + string_set(&Globals.smb_passwd_file, get_dyn_SMB_PASSWD_FILE()); string_set(&Globals.private_dir, get_dyn_PRIVATE_DIR()); /* use the new 'hash2' method by default, with a prefix of 1 */ |