summaryrefslogtreecommitdiff
path: root/log-server.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-01-08 06:13:41 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-01-08 06:13:41 +0000
commita383baac4604a7de1710e87fba0403e4a56d5472 (patch)
tree62d267f992fd15d00e9382f95199b138877435b7 /log-server.c
parent9ce907c3d60637943dfa46a4542164498be19ea8 (diff)
20010108
- (bal) Fixed another typo in cli.c - (bal) OpenBSD Sync - markus@cvs.openbsd.org 2001/01/07 21:26:55 [cli.c] typo - markus@cvs.openbsd.org 2001/01/07 21:26:55 [cli.c] missing free, stevesk@pobox.com - markus@cvs.openbsd.org 2001/01/07 19:06:25 [auth1.c] missing free, stevesk@pobox.com - markus@cvs.openbsd.org 2001/01/07 11:28:04 [log-client.c log-server.c log.c readconf.c servconf.c ssh.1 ssh.h sshd.8 sshd.c] rename SYSLOG_LEVEL_INFO->SYSLOG_LEVEL_NOTICE syslog priority changes: fatal() LOG_ERR -> LOG_CRIT log() LOG_INFO -> LOG_NOTICE
Diffstat (limited to 'log-server.c')
-rw-r--r--log-server.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/log-server.c b/log-server.c
index 943c3141..2335a3ef 100644
--- a/log-server.c
+++ b/log-server.c
@@ -36,14 +36,14 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: log-server.c,v 1.17 2000/09/12 20:53:10 markus Exp $");
+RCSID("$OpenBSD: log-server.c,v 1.18 2001/01/07 11:28:05 markus Exp $");
#include <syslog.h>
#include "packet.h"
#include "xmalloc.h"
#include "ssh.h"
-static LogLevel log_level = SYSLOG_LEVEL_INFO;
+static LogLevel log_level = SYSLOG_LEVEL_NOTICE;
static int log_on_stderr = 0;
static int log_facility = LOG_AUTH;
@@ -58,9 +58,9 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
{
switch (level) {
case SYSLOG_LEVEL_QUIET:
- case SYSLOG_LEVEL_ERROR:
case SYSLOG_LEVEL_FATAL:
- case SYSLOG_LEVEL_INFO:
+ case SYSLOG_LEVEL_ERROR:
+ case SYSLOG_LEVEL_NOTICE:
case SYSLOG_LEVEL_VERBOSE:
case SYSLOG_LEVEL_DEBUG1:
case SYSLOG_LEVEL_DEBUG2:
@@ -133,15 +133,17 @@ do_log(LogLevel level, const char *fmt, va_list args)
if (level > log_level)
return;
switch (level) {
+ case SYSLOG_LEVEL_FATAL:
+ txt = "fatal";
+ pri = LOG_CRIT;
+ break;
case SYSLOG_LEVEL_ERROR:
txt = "error";
pri = LOG_ERR;
break;
- case SYSLOG_LEVEL_FATAL:
- txt = "fatal";
- pri = LOG_ERR;
+ case SYSLOG_LEVEL_NOTICE:
+ pri = LOG_NOTICE;
break;
- case SYSLOG_LEVEL_INFO:
case SYSLOG_LEVEL_VERBOSE:
pri = LOG_INFO;
break;