From nobody Mon Nov 14 11:23:44 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N9n4c6T2kz4fc6N; Mon, 14 Nov 2022 11:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N9n4c60Kxz3hc5; Mon, 14 Nov 2022 11:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668425024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W5hQC3q28oD5RxwnP6TolQoNHpbH3sGlsb7aIfOx0hg=; b=Iza5sWvYOKbe2oT7p1+L9lr6oLM79jp2cettXyb8d0pYP2vC0iBcAr+OgOTZo5N6+vMzlY oS0hUtn7M2bo+bJnWeg09BFz4x/5UkLZKpaClADTvtUJqFzwJ9tPMv5oKvnppc2N14IQzF 0YKc3BTil2THPhr6fviUv2++FGJpxYir5RG2GYlL2rx6EOBOoCJPMfXjXinAxbSAOIP1iE n5tIZDOM0VyZjSeoolzvgT1KTs97//3fkAnFqkBGmmnBpc3jJdhGpK+LpLHI+Hh1wEYlkr cLCyOKV2A3gNsfP+nfEueAKxA0ge1c6HLggUUtbOOEWMPZmN47Ekf51v17bFWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668425024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W5hQC3q28oD5RxwnP6TolQoNHpbH3sGlsb7aIfOx0hg=; b=xeNmdSTlpFs2DKlYRTksJnkWM9EndzK0624cTeFcPAUUEnUQAGz/v97f6mtUkm9vqo6mLL LR3jlksbmpt/5nI9xJjIC3sZ32iplWWX9KP06RSGIAayNH2wlJrC62T2F6FQ0iIPTVmEf3 VpANyl45OB+5/fmJ2C9LrMArNCugY23TAEYnCTCCfRXmayVGgXXh/fw1njDB46JeD30oEf fvjGhCWaXfPe04XSkPIC6JN3l6w/Wt9RxohR4z77qSRNsrNCqafd+yda/5FOpbdj2xskw4 HNoflfiSrF9A6hYof751EQ0m19tk9TuHykzSzKarXTwoyWa4TqavixoTyVquvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668425024; a=rsa-sha256; cv=none; b=HVupfUJVRWLMbNO72DvlarLZjb74I3lwo6G1kPfPL28twnvcNPx6aQh3RV/qDY8ghLH8LH SlYEtg5M2P6zMLJildFMR+CRzd5up8EmNXtxGKwOas6RYGb9dBNoIr2/gLRullJtdkMzzt MWCGfv7sWTZ2Myy+GW8ezhlIl3OGCMrRVvzeF5TgfsIik8YUL1t2zN/5QQXX89b1KVe/G2 AH+MSJukT915Tc0nSXwH5aLO7AHjaTPhd6/QnGhRV7VFeoDxw6QkmUKDFgH9/pJgAvvvB5 35pogYGm47AAzT2sU6bCdNod7/w2LRGLcZKD4j+JFk7vNr6o2DgrtLKo76Duog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N9n4c54JxzgYx; Mon, 14 Nov 2022 11:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AEBNiE7040776; Mon, 14 Nov 2022 11:23:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AEBNiie040775; Mon, 14 Nov 2022 11:23:44 GMT (envelope-from git) Date: Mon, 14 Nov 2022 11:23:44 GMT Message-Id: <202211141123.2AEBNiie040775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 48aa2fa71b2d - stable/13 - libc: Don't warn about RRSIG replies. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 48aa2fa71b2d08bf65278c404325e6df419db49e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=48aa2fa71b2d08bf65278c404325e6df419db49e commit 48aa2fa71b2d08bf65278c404325e6df419db49e Author: Dag-Erling Smørgrav AuthorDate: 2022-11-07 15:48:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2022-11-14 11:23:32 +0000 libc: Don't warn about RRSIG replies. PR: 213178 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37303 (cherry picked from commit 817f1f3064db25f821032c8fffb131183206bba1) --- include/arpa/nameser_compat.h | 18 ++++++++++++++++++ lib/libc/net/getaddrinfo.c | 2 +- lib/libc/net/gethostbydns.c | 5 ++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h index 7562984ab0ff..d70bc199b823 100644 --- a/include/arpa/nameser_compat.h +++ b/include/arpa/nameser_compat.h @@ -177,15 +177,33 @@ typedef struct { #define T_SRV ns_t_srv #define T_ATMA ns_t_atma #define T_NAPTR ns_t_naptr +#define T_KX ns_t_kx +#define T_CERT ns_t_cert #define T_A6 ns_t_a6 #define T_DNAME ns_t_dname +#define T_SINK ns_t_sink #define T_OPT ns_t_opt +#define T_APL ns_t_apl +#define T_DS ns_t_ds +#define T_SSHFP ns_t_sshfp +#define T_IPSECKEY ns_t_ipseckey +#define T_RRSIG ns_t_rrsig +#define T_NSEC ns_t_nsec +#define T_DNSKEY ns_t_dnskey +#define T_DHCID ns_t_dhcid +#define T_NSEC3 ns_t_nsec3 +#define T_NSEC3PARAM ns_t_nsec3param +#define T_HIP ns_t_hip +#define T_SPF ns_t_spf +#define T_TKEY ns_t_tkey #define T_TSIG ns_t_tsig #define T_IXFR ns_t_ixfr #define T_AXFR ns_t_axfr #define T_MAILB ns_t_mailb #define T_MAILA ns_t_maila #define T_ANY ns_t_any +#define T_ZXFR ns_t_zxfr +#define T_DLV ns_t_dlv #define C_IN ns_c_in #define C_CHAOS ns_c_chaos diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c index a33f240bc376..abe4eb17cf72 100644 --- a/lib/libc/net/getaddrinfo.c +++ b/lib/libc/net/getaddrinfo.c @@ -2091,7 +2091,7 @@ getanswer(const querybuf *answer, int anslen, const char *qname, int qtype, } else if (type != qtype) { #ifdef DEBUG if (type != T_KEY && type != T_SIG && - type != ns_t_dname) + type != T_DNAME && type != T_RRSIG) syslog(LOG_NOTICE|LOG_AUTH, "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"", qname, p_class(C_IN), p_type(qtype), diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c index 09800b874f90..142b67f7ace9 100644 --- a/lib/libc/net/gethostbydns.c +++ b/lib/libc/net/gethostbydns.c @@ -292,11 +292,14 @@ gethostanswer(const querybuf *answer, int anslen, const char *qname, int qtype, continue; } if (type != qtype) { - if (type != T_SIG && type != ns_t_dname) +#ifdef DEBUG + if (type != T_KEY && type != T_SIG && + type != T_DNAME && type != T_RRSIG) syslog(LOG_NOTICE|LOG_AUTH, "gethostby*.gethostanswer: asked for \"%s %s %s\", got type \"%s\"", qname, p_class(C_IN), p_type(qtype), p_type(type)); +#endif cp += n; continue; /* XXX - had_error++ ? */ }