diff options
| author |   gilles <gilles@openbsd.org> | 2019-01-03 15:46:07 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2019-01-03 15:46:07 +0000 |
| commit | 7b3b690235b3affd441b75152e3f1f99ffc17b37 (patch) | |
| tree | 35c00326a0bb95a5d9ceaa209a78ce1b94b0f386 | |
| parent | do not strip dot-escaping when sending to filters, dot-escape is removed on (diff) | |
| download | wireguard-openbsd-7b3b690235b3affd441b75152e3f1f99ffc17b37.tar.xz wireguard-openbsd-7b3b690235b3affd441b75152e3f1f99ffc17b37.zip | |
be less verbose on resolver "errors", only log_warnx() real errors and not
EAI_NODATA / EAI_NONAME in cases where these are expected and already part
of a log line.
ok eric@
| -rw-r--r-- | usr.sbin/smtpd/smtp_session.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c index 70ef681330b..e2a21de186b 100644 --- a/usr.sbin/smtpd/smtp_session.c +++ b/usr.sbin/smtpd/smtp_session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtp_session.c,v 1.384 2019/01/03 14:40:25 gilles Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.385 2019/01/03 15:46:07 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -627,14 +627,15 @@ smtp_getnameinfo_cb(void *arg, int gaierrno, const char *host, const char *serv) struct addrinfo hints; if (gaierrno) { - log_warnx("getnameinfo: %s: %s", ss_to_text(&s->ss), - gai_strerror(gaierrno)); (void)strlcpy(s->rdns, "<unknown>", sizeof(s->rdns)); if (gaierrno == EAI_NODATA || gaierrno == EAI_NONAME) s->fcrdns = 0; - else + else { + log_warnx("getnameinfo: %s: %s", ss_to_text(&s->ss), + gai_strerror(gaierrno)); s->fcrdns = -1; + } smtp_lookup_servername(s); return; @@ -656,13 +657,13 @@ smtp_getaddrinfo_cb(void *arg, int gaierrno, struct addrinfo *ai0) char fwd[64], rev[64]; if (gaierrno) { - log_warnx("getaddrinfo: %s: %s", s->rdns, - gai_strerror(gaierrno)); - if (gaierrno == EAI_NODATA || gaierrno == EAI_NONAME) s->fcrdns = 0; - else + else { + log_warnx("getaddrinfo: %s: %s", s->rdns, + gai_strerror(gaierrno)); s->fcrdns = -1; + } } else { strlcpy(rev, ss_to_text(&s->ss), sizeof(rev)); |