diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
| commit | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch) | |
| tree | b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /net-dns/bind/files | |
| parent | b17a3ef12038de50228bade1f05502c74e135321 (diff) | |
gentoo resync : 16.09.2020
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, |