diff options
| author |   Patrick McLean <patrick.mclean@sony.com> | 2020-09-15 10:57:18 -0700 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2020-09-15 10:57:33 -0700 |
| commit | afebccb91e5cb5df6fbb95523be96bdc60b430de (patch) | |
| tree | 0561e273a18b6ccb37e94bf215a5e03f378204ad /net-dns/bind/files | |
| parent | net-im/element-desktop-bin: upgrade 1.7.5 -> 1.7.7 (diff) | |
| download | gentoo-afebccb91e5cb5df6fbb95523be96bdc60b430de.tar.gz gentoo-afebccb91e5cb5df6fbb95523be96bdc60b430de.tar.bz2 gentoo-afebccb91e5cb5df6fbb95523be96bdc60b430de.zip | |
net-dns/bind-9.16.6-r1: Revbump, pull in patch for bug #741162
Closes: https://bugs.gentoo.org/741162
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'net-dns/bind/files')
| -rw-r--r-- | net-dns/bind/files/bind-9.16.6-bug-741162.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/net-dns/bind/files/bind-9.16.6-bug-741162.patch b/net-dns/bind/files/bind-9.16.6-bug-741162.patch new file mode 100644 index 000000000000..9cc030c82b36 --- /dev/null +++ b/net-dns/bind/files/bind-9.16.6-bug-741162.patch @@ -0,0 +1,31 @@ +commit 56d2cf6f1ef008ab6cb50545af9b1d8a5c1ece81 +Author: Ondřej Surý <ondrej@isc.org> +Date: Mon Aug 24 10:15:07 2020 +0200 + + Print diagnostics on dns_name_issubdomain() failure in fctx_create() + + Log diagnostic message when dns_name_issubdomain() in the fctx_create() + when the resolver is qname minimizing and forwarding at the same time. + + (cherry picked from commit 0a22024c270a38a54f0d51621a046b726df158c0) + +diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c +index 8a36693a9a..b37e756c53 100644 +--- a/lib/dns/resolver.c ++++ b/lib/dns/resolver.c +@@ -5122,7 +5122,14 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, + + log_ns_ttl(fctx, "fctx_create"); + +- INSIST(dns_name_issubdomain(&fctx->name, &fctx->domain)); ++ if (!dns_name_issubdomain(&fctx->name, &fctx->domain)) { ++ dns_name_format(&fctx->domain, buf, sizeof(buf)); ++ UNEXPECTED_ERROR(__FILE__, __LINE__, ++ "'%s' is not subdomain of '%s'", fctx->info, ++ buf); ++ result = ISC_R_UNEXPECTED; ++ goto cleanup_fcount; ++ } + + fctx->qmessage = NULL; + result = dns_message_create(mctx, DNS_MESSAGE_INTENTRENDER, |