diff options
| author | martin <martin@NetBSD.org> | 2020-11-29 11:25:31 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2020-11-29 11:25:31 +0000 |
| commit | faffbbf20f5a2f5d86b6df2fb362db13971997ef (patch) | |
| tree | 3d78b5ee73c18fdac253b11b1cc2463902c8c202 /lib | |
| parent | 1e850744796fc89abda8b752c2ed8f0b28969636 (diff) | |
Pull up following revision(s) (requested by is in ticket #1135):
lib/libc/net/getaddrinfo.c: revision 1.120
lib/libc/net/gethnamaddr.c: revision 1.93
include/arpa/nameser_compat.h: revision 1.8
Don't complain about additional DNAME records received when resolving A or
AAAA (like already done for SIG/KEY and CNAME).
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/net/getaddrinfo.c | 6 | ||||
| -rw-r--r-- | lib/libc/net/gethnamaddr.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c index c5689c623ec..dca657a2ae2 100644 --- a/lib/libc/net/getaddrinfo.c +++ b/lib/libc/net/getaddrinfo.c @@ -1,4 +1,4 @@ -/* $NetBSD: getaddrinfo.c,v 1.119 2018/12/13 04:41:41 dholland Exp $ */ +/* $NetBSD: getaddrinfo.c,v 1.119.2.1 2020/11/29 11:25:31 martin Exp $ */ /* $KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $ */ /* @@ -55,7 +55,7 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: getaddrinfo.c,v 1.119 2018/12/13 04:41:41 dholland Exp $"); +__RCSID("$NetBSD: getaddrinfo.c,v 1.119.2.1 2020/11/29 11:25:31 martin Exp $"); #endif /* LIBC_SCCS and not lint */ #ifndef RUMP_ACTION @@ -1821,7 +1821,7 @@ getanswer(res_state res, const querybuf *answer, int anslen, const char *qname, continue; } } else if (type != qtype) { - if (type != T_KEY && type != T_SIG) { + if (type != T_KEY && type != T_SIG && type != T_DNAME) { struct syslog_data sd = SYSLOG_DATA_INIT; syslog_r(LOG_NOTICE|LOG_AUTH, &sd, "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"", diff --git a/lib/libc/net/gethnamaddr.c b/lib/libc/net/gethnamaddr.c index a83435ceb9c..a4203c7417f 100644 --- a/lib/libc/net/gethnamaddr.c +++ b/lib/libc/net/gethnamaddr.c @@ -1,4 +1,4 @@ -/* $NetBSD: gethnamaddr.c,v 1.92 2015/09/22 16:16:02 christos Exp $ */ +/* $NetBSD: gethnamaddr.c,v 1.92.18.1 2020/11/29 11:25:31 martin Exp $ */ /* * ++Copyright++ 1985, 1988, 1993 @@ -57,7 +57,7 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; static char rcsid[] = "Id: gethnamaddr.c,v 8.21 1997/06/01 20:34:37 vixie Exp "; #else -__RCSID("$NetBSD: gethnamaddr.c,v 1.92 2015/09/22 16:16:02 christos Exp $"); +__RCSID("$NetBSD: gethnamaddr.c,v 1.92.18.1 2020/11/29 11:25:31 martin Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -358,7 +358,7 @@ getanswer(const querybuf *answer, int anslen, const char *qname, int qtype, continue; } if (type != qtype) { - if (type != T_KEY && type != T_SIG) + if (type != T_KEY && type != T_SIG && type != T_DNAME) syslog(LOG_NOTICE|LOG_AUTH, "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"", qname, p_class(C_IN), p_type(qtype), |
