Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull up following revision(s) (requested by is in ticket #1625): 

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).
This commit is contained in:
martin 2020-11-29 11:18:54 +00:00
parent 81f68e5b2a
commit 6048eca130
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/arpa/nameser_compat.h
View File

@ -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.8.1 2020/11/29 11:18:54 martin Exp $ */
/* Copyright (c) 1983, 1989
* The Regents of the University of California. All rights reserved.
@ -210,6 +210,7 @@ typedef struct {
#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

6
lib/libc/net/getaddrinfo.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: getaddrinfo.c,v 1.115.6.1 2017/10/25 06:56:41 snj Exp $ */
/* $NetBSD: getaddrinfo.c,v 1.115.6.2 2020/11/29 11:18:54 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.115.6.1 2017/10/25 06:56:41 snj Exp $");
__RCSID("$NetBSD: getaddrinfo.c,v 1.115.6.2 2020/11/29 11:18:54 martin Exp $");
#endif /* LIBC_SCCS and not lint */
#ifndef RUMP_ACTION
@ -1814,7 +1814,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\"",

6
lib/libc/net/gethnamaddr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gethnamaddr.c,v 1.92 2015/09/22 16:16:02 christos Exp $ */
/* $NetBSD: gethnamaddr.c,v 1.92.8.1 2020/11/29 11:18:54 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.8.1 2020/11/29 11:18:54 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),