OK florian@

looks like the "dlg"-style logging in identd, slowcgi, tftp-proxy and
tftpd needs some love, too :/

On Mon, Mar 20, 2017 at 10:59:29PM +0100, Alexander Bluhm wrote:
> Hi,
> 
> From a syslog perspective it does not make sense to log fatal and
> warn with the same severity.  I would like to switch log_warn() to
> LOG_ERR and keep fatal() at LOG_CRIT.
> 
> ok?
> 
> bluhm
> 
> Index: /usr/src/sbin/dhclient/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sbin/dhclient/log.c,v
> retrieving revision 1.1
> diff -u -p -r1.1 log.c
> --- /usr/src/sbin/dhclient/log.c      12 Feb 2017 13:15:50 -0000      1.1
> +++ /usr/src/sbin/dhclient/log.c      17 Mar 2017 18:18:56 -0000
> @@ -105,17 +105,17 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(saved_errno));
> +             logit(LOG_ERR, "%s", strerror(saved_errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg,
>                   strerror(saved_errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(saved_errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(saved_errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -130,7 +130,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/sbin/iked/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sbin/iked/log.c,v
> retrieving revision 1.11
> diff -u -p -r1.11 log.c
> --- /usr/src/sbin/iked/log.c  9 Jan 2017 14:49:21 -0000       1.11
> +++ /usr/src/sbin/iked/log.c  17 Mar 2017 18:19:03 -0000
> @@ -124,17 +124,17 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(saved_errno));
> +             logit(LOG_ERR, "%s", strerror(saved_errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg,
>                   strerror(saved_errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(saved_errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(saved_errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -149,7 +149,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/bgpd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/bgpd/log.c,v
> retrieving revision 1.63
> diff -u -p -r1.63 log.c
> --- /usr/src/usr.sbin/bgpd/log.c      24 Jan 2017 04:22:42 -0000      1.63
> +++ /usr/src/usr.sbin/bgpd/log.c      17 Mar 2017 18:19:23 -0000
> @@ -105,17 +105,17 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(saved_errno));
> +             logit(LOG_ERR, "%s", strerror(saved_errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg,
>                   strerror(saved_errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(saved_errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(saved_errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -130,7 +130,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/dhcpd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/dhcpd/log.c,v
> retrieving revision 1.1
> diff -u -p -r1.1 log.c
> --- /usr/src/usr.sbin/dhcpd/log.c     13 Feb 2017 19:13:14 -0000      1.1
> +++ /usr/src/usr.sbin/dhcpd/log.c     17 Mar 2017 18:19:34 -0000
> @@ -105,17 +105,17 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(saved_errno));
> +             logit(LOG_ERR, "%s", strerror(saved_errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg,
>                   strerror(saved_errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(saved_errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(saved_errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -130,7 +130,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/dhcrelay/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/dhcrelay/log.c,v
> retrieving revision 1.1
> diff -u -p -r1.1 log.c
> --- /usr/src/usr.sbin/dhcrelay/log.c  13 Feb 2017 19:15:39 -0000      1.1
> +++ /usr/src/usr.sbin/dhcrelay/log.c  17 Mar 2017 18:19:41 -0000
> @@ -105,17 +105,17 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(saved_errno));
> +             logit(LOG_ERR, "%s", strerror(saved_errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg,
>                   strerror(saved_errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(saved_errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(saved_errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -130,7 +130,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/dvmrpd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/dvmrpd/log.c,v
> retrieving revision 1.5
> diff -u -p -r1.5 log.c
> --- /usr/src/usr.sbin/dvmrpd/log.c    2 Sep 2016 16:20:34 -0000       1.5
> +++ /usr/src/usr.sbin/dvmrpd/log.c    17 Mar 2017 18:19:50 -0000
> @@ -89,16 +89,16 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(errno));
> +             logit(LOG_ERR, "%s", strerror(errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg, strerror(errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -111,7 +111,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/eigrpd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/eigrpd/log.c,v
> retrieving revision 1.7
> diff -u -p -r1.7 log.c
> --- /usr/src/usr.sbin/eigrpd/log.c    2 Sep 2016 17:59:58 -0000       1.7
> +++ /usr/src/usr.sbin/eigrpd/log.c    17 Mar 2017 18:19:58 -0000
> @@ -94,16 +94,16 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(errno));
> +             logit(LOG_ERR, "%s", strerror(errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg, strerror(errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -116,7 +116,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/httpd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/httpd/log.c,v
> retrieving revision 1.13
> diff -u -p -r1.13 log.c
> --- /usr/src/usr.sbin/httpd/log.c     9 Jan 2017 14:49:22 -0000       1.13
> +++ /usr/src/usr.sbin/httpd/log.c     17 Mar 2017 18:20:04 -0000
> @@ -124,17 +124,17 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(saved_errno));
> +             logit(LOG_ERR, "%s", strerror(saved_errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg,
>                   strerror(saved_errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(saved_errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(saved_errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -149,7 +149,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/ifstated/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/ifstated/log.c,v
> retrieving revision 1.3
> diff -u -p -r1.3 log.c
> --- /usr/src/usr.sbin/ifstated/log.c  2 Sep 2016 16:21:33 -0000       1.3
> +++ /usr/src/usr.sbin/ifstated/log.c  17 Mar 2017 18:20:13 -0000
> @@ -86,16 +86,16 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(errno));
> +             logit(LOG_ERR, "%s", strerror(errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg, strerror(errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -108,7 +108,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/iscsid/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/iscsid/log.c,v
> retrieving revision 1.8
> diff -u -p -r1.8 log.c
> --- /usr/src/usr.sbin/iscsid/log.c    23 Jan 2017 08:40:07 -0000      1.8
> +++ /usr/src/usr.sbin/iscsid/log.c    17 Mar 2017 18:20:19 -0000
> @@ -86,16 +86,16 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(errno));
> +             logit(LOG_ERR, "%s", strerror(errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg, strerror(errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -108,7 +108,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/ldapd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/ldapd/log.c,v
> retrieving revision 1.7
> diff -u -p -r1.7 log.c
> --- /usr/src/usr.sbin/ldapd/log.c     20 Jan 2017 12:08:24 -0000      1.7
> +++ /usr/src/usr.sbin/ldapd/log.c     17 Mar 2017 18:20:27 -0000
> @@ -101,16 +101,16 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(errno));
> +             logit(LOG_ERR, "%s", strerror(errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg, strerror(errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -123,7 +123,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/ldpd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/ldpd/log.c,v
> retrieving revision 1.33
> diff -u -p -r1.33 log.c
> --- /usr/src/usr.sbin/ldpd/log.c      20 Jan 2017 12:19:18 -0000      1.33
> +++ /usr/src/usr.sbin/ldpd/log.c      17 Mar 2017 18:20:35 -0000
> @@ -88,16 +88,16 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(errno));
> +             logit(LOG_ERR, "%s", strerror(errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg, strerror(errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -110,7 +110,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/npppd/npppd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/npppd/npppd/log.c,v
> retrieving revision 1.3
> diff -u -p -r1.3 log.c
> --- /usr/src/usr.sbin/npppd/npppd/log.c       12 May 2015 03:23:15 -0000      
> 1.3
> +++ /usr/src/usr.sbin/npppd/npppd/log.c       17 Mar 2017 18:20:45 -0000
> @@ -73,16 +73,16 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(errno));
> +             logit(LOG_ERR, "%s", strerror(errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg, strerror(errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -95,7 +95,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/ntpd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/ntpd/log.c,v
> retrieving revision 1.16
> diff -u -p -r1.16 log.c
> --- /usr/src/usr.sbin/ntpd/log.c      9 Jan 2017 14:49:22 -0000       1.16
> +++ /usr/src/usr.sbin/ntpd/log.c      17 Mar 2017 18:20:51 -0000
> @@ -124,17 +124,17 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(saved_errno));
> +             logit(LOG_ERR, "%s", strerror(saved_errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg,
>                   strerror(saved_errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(saved_errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(saved_errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -149,7 +149,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/ospf6d/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/ospf6d/log.c,v
> retrieving revision 1.13
> diff -u -p -r1.13 log.c
> --- /usr/src/usr.sbin/ospf6d/log.c    23 Jan 2017 08:41:02 -0000      1.13
> +++ /usr/src/usr.sbin/ospf6d/log.c    17 Mar 2017 18:21:00 -0000
> @@ -87,16 +87,16 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(errno));
> +             logit(LOG_ERR, "%s", strerror(errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg, strerror(errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -109,7 +109,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/ospfd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/ospfd/log.c,v
> retrieving revision 1.11
> diff -u -p -r1.11 log.c
> --- /usr/src/usr.sbin/ospfd/log.c     24 Jan 2017 04:24:25 -0000      1.11
> +++ /usr/src/usr.sbin/ospfd/log.c     17 Mar 2017 18:21:07 -0000
> @@ -105,17 +105,17 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(saved_errno));
> +             logit(LOG_ERR, "%s", strerror(saved_errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg,
>                   strerror(saved_errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(saved_errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(saved_errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -130,7 +130,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/relayd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/relayd/log.c,v
> retrieving revision 1.34
> diff -u -p -r1.34 log.c
> --- /usr/src/usr.sbin/relayd/log.c    9 Jan 2017 14:49:21 -0000       1.34
> +++ /usr/src/usr.sbin/relayd/log.c    17 Mar 2017 18:22:01 -0000
> @@ -124,17 +124,17 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(saved_errno));
> +             logit(LOG_ERR, "%s", strerror(saved_errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg,
>                   strerror(saved_errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(saved_errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(saved_errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -149,7 +149,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/ripd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/ripd/log.c,v
> retrieving revision 1.6
> diff -u -p -r1.6 log.c
> --- /usr/src/usr.sbin/ripd/log.c      2 Sep 2016 14:07:52 -0000       1.6
> +++ /usr/src/usr.sbin/ripd/log.c      17 Mar 2017 18:22:07 -0000
> @@ -88,16 +88,16 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(errno));
> +             logit(LOG_ERR, "%s", strerror(errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg, strerror(errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -110,7 +110,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/route6d/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/route6d/log.c,v
> retrieving revision 1.2
> diff -u -p -r1.2 log.c
> --- /usr/src/usr.sbin/route6d/log.c   13 Mar 2017 21:20:56 -0000      1.2
> +++ /usr/src/usr.sbin/route6d/log.c   17 Mar 2017 18:22:13 -0000
> @@ -111,17 +111,17 @@ log_warn(const char *emsg, ...)
>       va_list  ap;
>  
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(errno));
> +             logit(LOG_ERR, "%s", strerror(errno));
>       else {
>               va_start(ap, emsg);
>  
>               /* best effort to even work in out of memory situations */
>               if (asprintf(&nfmt, "%s: %s", emsg, strerror(errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -134,7 +134,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/rtadvd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/rtadvd/log.c,v
> retrieving revision 1.2
> diff -u -p -r1.2 log.c
> --- /usr/src/usr.sbin/rtadvd/log.c    20 Jan 2017 23:29:58 -0000      1.2
> +++ /usr/src/usr.sbin/rtadvd/log.c    17 Mar 2017 18:22:20 -0000
> @@ -87,16 +87,16 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(errno));
> +             logit(LOG_ERR, "%s", strerror(errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg, strerror(errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -109,7 +109,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/smtpd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/smtpd/log.c,v
> retrieving revision 1.19
> diff -u -p -r1.19 log.c
> --- /usr/src/usr.sbin/smtpd/log.c     9 Jan 2017 14:49:22 -0000       1.19
> +++ /usr/src/usr.sbin/smtpd/log.c     17 Mar 2017 18:22:46 -0000
> @@ -124,17 +124,17 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(saved_errno));
> +             logit(LOG_ERR, "%s", strerror(saved_errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg,
>                   strerror(saved_errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(saved_errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(saved_errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -149,7 +149,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/snmpd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/snmpd/log.c,v
> retrieving revision 1.15
> diff -u -p -r1.15 log.c
> --- /usr/src/usr.sbin/snmpd/log.c     9 Jan 2017 14:49:22 -0000       1.15
> +++ /usr/src/usr.sbin/snmpd/log.c     17 Mar 2017 18:22:54 -0000
> @@ -124,17 +124,17 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(saved_errno));
> +             logit(LOG_ERR, "%s", strerror(saved_errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg,
>                   strerror(saved_errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(saved_errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(saved_errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -149,7 +149,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/switchd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/switchd/log.c,v
> retrieving revision 1.4
> diff -u -p -r1.4 log.c
> --- /usr/src/usr.sbin/switchd/log.c   9 Jan 2017 14:49:22 -0000       1.4
> +++ /usr/src/usr.sbin/switchd/log.c   17 Mar 2017 18:23:00 -0000
> @@ -124,17 +124,17 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(saved_errno));
> +             logit(LOG_ERR, "%s", strerror(saved_errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg,
>                   strerror(saved_errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(saved_errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(saved_errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -149,7 +149,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/vmd/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/vmd/log.c,v
> retrieving revision 1.7
> diff -u -p -r1.7 log.c
> --- /usr/src/usr.sbin/vmd/log.c       9 Jan 2017 14:49:22 -0000       1.7
> +++ /usr/src/usr.sbin/vmd/log.c       17 Mar 2017 18:23:23 -0000
> @@ -124,17 +124,17 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(saved_errno));
> +             logit(LOG_ERR, "%s", strerror(saved_errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg,
>                   strerror(saved_errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(saved_errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(saved_errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -149,7 +149,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> Index: /usr/src/usr.sbin/ypldap/log.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/ypldap/log.c,v
> retrieving revision 1.3
> diff -u -p -r1.3 log.c
> --- /usr/src/usr.sbin/ypldap/log.c    20 Jan 2017 12:39:36 -0000      1.3
> +++ /usr/src/usr.sbin/ypldap/log.c    17 Mar 2017 18:23:30 -0000
> @@ -87,16 +87,16 @@ log_warn(const char *emsg, ...)
>  
>       /* best effort to even work in out of memory situations */
>       if (emsg == NULL)
> -             logit(LOG_CRIT, "%s", strerror(errno));
> +             logit(LOG_ERR, "%s", strerror(errno));
>       else {
>               va_start(ap, emsg);
>  
>               if (asprintf(&nfmt, "%s: %s", emsg, strerror(errno)) == -1) {
>                       /* we tried it... */
> -                     vlog(LOG_CRIT, emsg, ap);
> -                     logit(LOG_CRIT, "%s", strerror(errno));
> +                     vlog(LOG_ERR, emsg, ap);
> +                     logit(LOG_ERR, "%s", strerror(errno));
>               } else {
> -                     vlog(LOG_CRIT, nfmt, ap);
> +                     vlog(LOG_ERR, nfmt, ap);
>                       free(nfmt);
>               }
>               va_end(ap);
> @@ -109,7 +109,7 @@ log_warnx(const char *emsg, ...)
>       va_list  ap;
>  
>       va_start(ap, emsg);
> -     vlog(LOG_CRIT, emsg, ap);
> +     vlog(LOG_ERR, emsg, ap);
>       va_end(ap);
>  }
>  
> 

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

Reply via email to