[src/netbsd-9]: src Pull up following revision(s) (requested by is in ticket ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cc79a8bd2de4
branches:  netbsd-9
changeset: 964201:cc79a8bd2de4
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Nov 29 11:25:31 2020 +0000

description:
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:

 include/arpa/nameser_compat.h |  3 ++-
 lib/libc/net/getaddrinfo.c    |  6 +++---
 lib/libc/net/gethnamaddr.c    |  6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (71 lines):

diff -r eb2b12540ec2 -r cc79a8bd2de4 include/arpa/nameser_compat.h
--- a/include/arpa/nameser_compat.h     Thu Nov 19 11:26:10 2020 +0000
+++ b/include/arpa/nameser_compat.h     Sun Nov 29 11:25:31 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nameser_compat.h,v 1.6 2015/02/24 17:57:08 christos Exp $      */
+/*     $NetBSD: nameser_compat.h,v 1.6.18.1 2020/11/29 11:25:31 martin Exp $   */
 
 /* Copyright (c) 1983, 1989
  *    The Regents of the University of California.  All rights reserved.
@@ -210,6 +210,7 @@
 #define T_ATMA         ns_t_atma
 #define T_NAPTR                ns_t_naptr
 #define T_A6           ns_t_a6
+#define T_DNAME                ns_t_dname
 #define        T_TSIG          ns_t_tsig
 #define        T_IXFR          ns_t_ixfr
 #define T_AXFR         ns_t_axfr
diff -r eb2b12540ec2 -r cc79a8bd2de4 lib/libc/net/getaddrinfo.c
--- a/lib/libc/net/getaddrinfo.c        Thu Nov 19 11:26:10 2020 +0000
+++ b/lib/libc/net/getaddrinfo.c        Sun Nov 29 11:25:31 2020 +0000
@@ -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 @@
                                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 -r eb2b12540ec2 -r cc79a8bd2de4 lib/libc/net/gethnamaddr.c
--- a/lib/libc/net/gethnamaddr.c        Thu Nov 19 11:26:10 2020 +0000
+++ b/lib/libc/net/gethnamaddr.c        Sun Nov 29 11:25:31 2020 +0000
@@ -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 @@
                        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),