From bcea89bd59306e8da7705a9e98cd6b83b78b831f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Dec 2013 16:04:04 +1300 Subject: [PATCH] param: Rename variable used for lp_smb_passwd_file szSMBPasswdFile Signed-off-by: Andrew Bartlett Signed-off-by: Garming Sam Reviewed-by: Jeremy Allison --- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- 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 b67c385d83c..415a6bfa540 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 6e5e035338e..2bb0f9b611b 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 7ba53c0730e..78ebddf1dd4 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 */ -- 2.11.4.GIT