sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-31 17:18:04 +03:00
Code

fix log level, set a default, and also copy the value set in smb.conf into parm_struct.ptr

Browse Source 
this one also fixes log level not shown in swat
fix swat help system
(This used to be commit 7532e82896)
This commit is contained in:
Simo Sorce 2002-08-03 01:11:16 +00:00
parent 60078160de
commit 595145337e
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/param/loadparm.c
View File

@ -166,6 +166,7 @@ typedef struct
char *szGuestaccount;
char *szManglingMethod;
int max_log_size;
char *szLogLevel;
int mangled_stack;
int max_xmit;
int max_mux;
@ -767,8 +768,8 @@ static struct parm_struct parm_table[] = {
{"Logging Options", P_SEP, P_SEPARATOR},
{"admin log", P_BOOL, P_GLOBAL, &Globals.bAdminLog, NULL, NULL, 0},
{"log level", P_STRING, P_GLOBAL, NULL, handle_debug_list, NULL, 0},
{"debuglevel", P_STRING, P_GLOBAL, NULL, handle_debug_list, NULL, 0},
{"log level", P_STRING, P_GLOBAL, &Globals.szLogLevel, handle_debug_list, NULL, 0},
{"debuglevel", P_STRING, P_GLOBAL, &Globals.szLogLevel, handle_debug_list, NULL, 0},
{"syslog", P_INTEGER, P_GLOBAL, &Globals.syslog, NULL, NULL, 0},
{"syslog only", P_BOOL, P_GLOBAL, &Globals.bSyslogOnly, NULL, NULL, 0},
{"log file", P_STRING, P_GLOBAL, &Globals.szLogFile, NULL, NULL, 0},
@ -1277,6 +1278,7 @@ static void init_globals(void)
Globals.bSyslogOnly = False;
Globals.bAdminLog = False;
Globals.bTimestampLogs = True;
string_set(&Globals.szLogLevel, "0");
Globals.bDebugHiresTimestamp = False;
Globals.bDebugPid = False;
Globals.bDebugUid = False;
@ -2642,6 +2644,7 @@ static BOOL handle_debug_list( char *pszParmValueIn, char **ptr )
pstring pszParmValue;
pstrcpy(pszParmValue, pszParmValueIn);
string_set(ptr, pszParmValueIn);
return debug_parse_levels( pszParmValue );
}

16
source3/web/swat.c
View File

@ -79,15 +79,15 @@ static char *fix_backslash(char *str)
return newstring;
}
static char *stripspace(char *str)
static char *stripspaceupper(char *str)
{
static char newstring[1024];
char *p = newstring;
static char newstring[1024];
char *p = newstring;
while (*str) {
if (*str != ' ') *p++ = *str;
++str;
}
while (*str) {
if (*str != ' ') *p++ = toupper(*str);
++str;
}
*p = '\0';
return newstring;
}
@ -200,7 +200,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
ptr = lp_local_ptr(snum, ptr);
}
printf("<tr><td>%s</td><td>", get_parm_translated(stripspace(parm->label), _("Help"), parm->label));
printf("<tr><td>%s</td><td>", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label));
switch (parm->type) {
case P_CHAR:
d_printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",