summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-04-12 16:51:54 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-04-16 14:32:37 +1000
commitacb64471b376e55e7a51355d0ce5e8a041719ba6 (patch)
treebdf8c93c5039022bc90d19f1222b9a9ee2ca5f6b
parentfed2380ac5051d739ea0f322381f187244a8bc49 (diff)
downloadsamba-acb64471b376e55e7a51355d0ce5e8a041719ba6.tar.gz
samba-acb64471b376e55e7a51355d0ce5e8a041719ba6.tar.bz2
samba-acb64471b376e55e7a51355d0ce5e8a041719ba6.zip
param: harmonsise logfile parameter
-rw-r--r--lib/param/loadparm.c3
-rw-r--r--source3/param/loadparm.c12
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index c407429f15..a743b529f4 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -499,7 +499,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(logfile),
.special = handle_logfile,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
},
{
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 41c29cb0b8..b3c053ef58 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1403,7 +1403,7 @@ static struct parm_struct parm_table[] = {
.label = "log file",
.type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szLogFile),
+ .offset = GLOBAL_VAR(logfile),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
@@ -4656,9 +4656,9 @@ static void init_globals(bool reinit_globals)
if (!done_init) {
/* The logfile can be set before this is invoked. Free it if so. */
- if (Globals.szLogFile != NULL) {
- string_free(&Globals.szLogFile);
- Globals.szLogFile = NULL;
+ if (Globals.logfile != NULL) {
+ string_free(&Globals.logfile);
+ Globals.logfile = NULL;
}
done_init = true;
} else {
@@ -5054,7 +5054,7 @@ static char *lp_string(const char *s)
FN_GLOBAL_CONST_STRING(lp_smb_ports, smb_ports)
FN_GLOBAL_CONST_STRING(lp_dos_charset, dos_charset)
FN_GLOBAL_CONST_STRING(lp_unix_charset, unix_charset)
-FN_GLOBAL_STRING(lp_logfile, szLogFile)
+FN_GLOBAL_STRING(lp_logfile, logfile)
FN_GLOBAL_STRING(lp_configfile, szConfigFile)
FN_GLOBAL_CONST_STRING(lp_smb_passwd_file, szSMBPasswdFile)
FN_GLOBAL_CONST_STRING(lp_private_dir, szPrivateDir)
@@ -9407,7 +9407,7 @@ const char *lp_printername(int snum)
void lp_set_logfile(const char *name)
{
- string_set(&Globals.szLogFile, name);
+ string_set(&Globals.logfile, name);
debug_set_logfile(name);
}