diff options
author | florian <florian@openbsd.org> | 2017-05-26 17:38:46 +0000 |
---|---|---|
committer | florian <florian@openbsd.org> | 2017-05-26 17:38:46 +0000 |
commit | a52b97d1599665c49e986ca658b57eac1bf9d6d4 (patch) | |
tree | a19b0d8efa8e2edb20960022a66d3c8dd1c1a098 /usr.sbin | |
parent | Synchronise chacha test cases with the referenced draft - this adds a (diff) | |
download | wireguard-openbsd-a52b97d1599665c49e986ca658b57eac1bf9d6d4.tar.xz wireguard-openbsd-a52b97d1599665c49e986ca658b57eac1bf9d6d4.zip |
Sync the severity of the syslog_* functions shared between identd, slowcgi,
tftp-proxy and tftpd to the severity used in log.c style loggers.
This also fixes an issue where syslog_err and syslog_errx logged with
different severities.
Sure deraadt@
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/identd/identd.c | 10 | ||||
-rw-r--r-- | usr.sbin/slowcgi/slowcgi.c | 10 | ||||
-rw-r--r-- | usr.sbin/tftp-proxy/tftp-proxy.c | 10 | ||||
-rw-r--r-- | usr.sbin/tftpd/tftpd.c | 10 |
4 files changed, 20 insertions, 20 deletions
diff --git a/usr.sbin/identd/identd.c b/usr.sbin/identd/identd.c index f995f6a56a0..176e01f1bac 100644 --- a/usr.sbin/identd/identd.c +++ b/usr.sbin/identd/identd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: identd.c,v 1.35 2017/04/18 03:54:27 deraadt Exp $ */ +/* $OpenBSD: identd.c,v 1.36 2017/05/26 17:38:46 florian Exp $ */ /* * Copyright (c) 2013 David Gwynne <dlg@openbsd.org> @@ -1078,7 +1078,7 @@ syslog_err(int ecode, const char *fmt, ...) va_list ap; va_start(ap, fmt); - syslog_vstrerror(errno, LOG_EMERG, fmt, ap); + syslog_vstrerror(errno, LOG_CRIT, fmt, ap); va_end(ap); exit(ecode); } @@ -1089,7 +1089,7 @@ syslog_errx(int ecode, const char *fmt, ...) va_list ap; va_start(ap, fmt); - vsyslog(LOG_WARNING, fmt, ap); + vsyslog(LOG_CRIT, fmt, ap); va_end(ap); exit(ecode); } @@ -1100,7 +1100,7 @@ syslog_warn(const char *fmt, ...) va_list ap; va_start(ap, fmt); - syslog_vstrerror(errno, LOG_WARNING, fmt, ap); + syslog_vstrerror(errno, LOG_ERR, fmt, ap); va_end(ap); } @@ -1110,7 +1110,7 @@ syslog_warnx(const char *fmt, ...) va_list ap; va_start(ap, fmt); - vsyslog(LOG_WARNING, fmt, ap); + vsyslog(LOG_ERR, fmt, ap); va_end(ap); } diff --git a/usr.sbin/slowcgi/slowcgi.c b/usr.sbin/slowcgi/slowcgi.c index dec4df8d1a1..b8629d202cd 100644 --- a/usr.sbin/slowcgi/slowcgi.c +++ b/usr.sbin/slowcgi/slowcgi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: slowcgi.c,v 1.50 2016/09/04 14:40:34 florian Exp $ */ +/* $OpenBSD: slowcgi.c,v 1.51 2017/05/26 17:38:46 florian Exp $ */ /* * Copyright (c) 2013 David Gwynne <dlg@openbsd.org> * Copyright (c) 2013 Florian Obser <florian@openbsd.org> @@ -1236,7 +1236,7 @@ syslog_err(int ecode, const char *fmt, ...) va_list ap; va_start(ap, fmt); - syslog_vstrerror(errno, LOG_EMERG, fmt, ap); + syslog_vstrerror(errno, LOG_CRIT, fmt, ap); va_end(ap); exit(ecode); } @@ -1247,7 +1247,7 @@ syslog_errx(int ecode, const char *fmt, ...) va_list ap; va_start(ap, fmt); - vsyslog(LOG_WARNING, fmt, ap); + vsyslog(LOG_CRIT, fmt, ap); va_end(ap); exit(ecode); } @@ -1258,7 +1258,7 @@ syslog_warn(const char *fmt, ...) va_list ap; va_start(ap, fmt); - syslog_vstrerror(errno, LOG_WARNING, fmt, ap); + syslog_vstrerror(errno, LOG_ERR, fmt, ap); va_end(ap); } @@ -1268,7 +1268,7 @@ syslog_warnx(const char *fmt, ...) va_list ap; va_start(ap, fmt); - vsyslog(LOG_WARNING, fmt, ap); + vsyslog(LOG_ERR, fmt, ap); va_end(ap); } diff --git a/usr.sbin/tftp-proxy/tftp-proxy.c b/usr.sbin/tftp-proxy/tftp-proxy.c index 030f9c8bfca..150428c1de6 100644 --- a/usr.sbin/tftp-proxy/tftp-proxy.c +++ b/usr.sbin/tftp-proxy/tftp-proxy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftp-proxy.c,v 1.19 2016/09/04 14:41:16 florian Exp $ +/* $OpenBSD: tftp-proxy.c,v 1.20 2017/05/26 17:38:46 florian Exp $ * * Copyright (c) 2005 DLS Internet Services * Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl> @@ -980,7 +980,7 @@ syslog_err(int ecode, const char *fmt, ...) va_list ap; va_start(ap, fmt); - syslog_vstrerror(errno, LOG_EMERG, fmt, ap); + syslog_vstrerror(errno, LOG_CRIT, fmt, ap); va_end(ap); exit(ecode); @@ -992,7 +992,7 @@ syslog_errx(int ecode, const char *fmt, ...) va_list ap; va_start(ap, fmt); - vsyslog(LOG_WARNING, fmt, ap); + vsyslog(LOG_CRIT, fmt, ap); va_end(ap); exit(ecode); @@ -1004,7 +1004,7 @@ syslog_warn(const char *fmt, ...) va_list ap; va_start(ap, fmt); - syslog_vstrerror(errno, LOG_WARNING, fmt, ap); + syslog_vstrerror(errno, LOG_ERR, fmt, ap); va_end(ap); } @@ -1014,7 +1014,7 @@ syslog_warnx(const char *fmt, ...) va_list ap; va_start(ap, fmt); - vsyslog(LOG_WARNING, fmt, ap); + vsyslog(LOG_ERR, fmt, ap); va_end(ap); } diff --git a/usr.sbin/tftpd/tftpd.c b/usr.sbin/tftpd/tftpd.c index a7e415649d2..de12d2ac3b1 100644 --- a/usr.sbin/tftpd/tftpd.c +++ b/usr.sbin/tftpd/tftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpd.c,v 1.38 2016/09/26 17:15:19 jca Exp $ */ +/* $OpenBSD: tftpd.c,v 1.39 2017/05/26 17:38:46 florian Exp $ */ /* * Copyright (c) 2012 David Gwynne <dlg@uq.edu.au> @@ -1633,7 +1633,7 @@ syslog_err(int ecode, const char *fmt, ...) va_list ap; va_start(ap, fmt); - syslog_vstrerror(errno, LOG_EMERG, fmt, ap); + syslog_vstrerror(errno, LOG_CRIT, fmt, ap); va_end(ap); exit(ecode); @@ -1645,7 +1645,7 @@ syslog_errx(int ecode, const char *fmt, ...) va_list ap; va_start(ap, fmt); - vsyslog(LOG_WARNING, fmt, ap); + vsyslog(LOG_CRIT, fmt, ap); va_end(ap); exit(ecode); @@ -1657,7 +1657,7 @@ syslog_warn(const char *fmt, ...) va_list ap; va_start(ap, fmt); - syslog_vstrerror(errno, LOG_WARNING, fmt, ap); + syslog_vstrerror(errno, LOG_ERR, fmt, ap); va_end(ap); } @@ -1667,7 +1667,7 @@ syslog_warnx(const char *fmt, ...) va_list ap; va_start(ap, fmt); - vsyslog(LOG_WARNING, fmt, ap); + vsyslog(LOG_ERR, fmt, ap); va_end(ap); } |