sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

param: harmonsise logfile parameter

Browse Source
This commit is contained in:
Andrew Bartlett 2012-04-12 16:51:54 +10:00
parent fed2380ac5
commit acb64471b3
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/param/loadparm.c
View File

@ -499,7 +499,8 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL, .p_class = P_GLOBAL,
.offset = GLOBAL_VAR(logfile), .offset = GLOBAL_VAR(logfile),
.special = handle_logfile, .special = handle_logfile,
.enum_list = NULL .enum_list = NULL,
.flags = FLAG_ADVANCED,
}, },
{ {

12
source3/param/loadparm.c
View File

@ -1403,7 +1403,7 @@ static struct parm_struct parm_table[] = {
.label = "log file", .label = "log file",
.type = P_STRING, .type = P_STRING,
.p_class = P_GLOBAL, .p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szLogFile), .offset = GLOBAL_VAR(logfile),
.special = NULL, .special = NULL,
.enum_list = NULL, .enum_list = NULL,
.flags = FLAG_ADVANCED, .flags = FLAG_ADVANCED,
@ -4656,9 +4656,9 @@ static void init_globals(bool reinit_globals)
if (!done_init) { if (!done_init) {
/* The logfile can be set before this is invoked. Free it if so. */ /* The logfile can be set before this is invoked. Free it if so. */
if (Globals.szLogFile != NULL) { if (Globals.logfile != NULL) {
string_free(&Globals.szLogFile); string_free(&Globals.logfile);
Globals.szLogFile = NULL; Globals.logfile = NULL;
} }
done_init = true; done_init = true;
} else { } 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_smb_ports, smb_ports)
FN_GLOBAL_CONST_STRING(lp_dos_charset, dos_charset) FN_GLOBAL_CONST_STRING(lp_dos_charset, dos_charset)
FN_GLOBAL_CONST_STRING(lp_unix_charset, unix_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_STRING(lp_configfile, szConfigFile)
FN_GLOBAL_CONST_STRING(lp_smb_passwd_file, szSMBPasswdFile) FN_GLOBAL_CONST_STRING(lp_smb_passwd_file, szSMBPasswdFile)
FN_GLOBAL_CONST_STRING(lp_private_dir, szPrivateDir) 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) void lp_set_logfile(const char *name)
{ {
string_set(&Globals.szLogFile, name); string_set(&Globals.logfile, name);
debug_set_logfile(name); debug_set_logfile(name);
} }