sync identd et al style loggers severity to log.c

[Florian Obser]

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.

OK?

diff --git identd/identd.c identd/identd.c
index f995f6a56a0..a5dd5cc702a 100644
--- identd/identd.c
+++ identd/identd.c
@@ -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 slowcgi/slowcgi.c slowcgi/slowcgi.c
index dec4df8d1a1..d126dcfc281 100644
--- slowcgi/slowcgi.c
+++ slowcgi/slowcgi.c
@@ -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 tftp-proxy/tftp-proxy.c tftp-proxy/tftp-proxy.c
index 030f9c8bfca..0c359bd1776 100644
--- tftp-proxy/tftp-proxy.c
+++ tftp-proxy/tftp-proxy.c
@@ -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 tftpd/tftpd.c tftpd/tftpd.c
index a7e415649d2..1f064b66330 100644
--- tftpd/tftpd.c
+++ tftpd/tftpd.c
@@ -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);
 }
 


-- 
I'm not entirely sure you are real.