From 36d2b494694781e07bdb66e7ff1e118c28688403 Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Mar 01 2022 18:19:17 +0000
Subject: Remove lame server errors hiding patch


Those errors can be dropped by simple configuration:

logging {
category lame_servers { null; };
};

Do not hide them into debug log on all servers. Expect lame servers are
not so common to drop it always.

---

diff --git a/bind.spec b/bind.spec
index f2d4650..105cc5d 100644
--- a/bind.spec
+++ b/bind.spec
@@ -99,7 +99,6 @@ Patch20: bind-9.5-dlz-64bit.patch
 # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/5601
 Patch21: bind93-rh490837.patch
 Patch22: bind-9.11-fips-tests.patch
-Patch23: bind97-rh645544.patch
 Patch24: bind-9.9.1-P2-dlz-libdb.patch
 
 # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/2689
diff --git a/bind97-rh645544.patch b/bind97-rh645544.patch
deleted file mode 100644
index e2ae978..0000000
--- a/bind97-rh645544.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
-index 31549c6..65a14b6 100644
---- a/lib/dns/resolver.c
-+++ b/lib/dns/resolver.c
-@@ -1762,7 +1762,7 @@ log_edns(fetchctx_t *fctx) {
- 	 */
- 	dns_name_format(&fctx->domain, domainbuf, sizeof(domainbuf));
- 	isc_log_write(dns_lctx, DNS_LOGCATEGORY_EDNS_DISABLED,
--		      DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,
-+		      DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(1),
- 		      "success resolving '%s' (in '%s'?) after %s", fctx->info,
- 		      domainbuf, fctx->reason);
- }
-@@ -5298,7 +5298,7 @@ log_lame(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo) {
- 	dns_name_format(&fctx->domain, domainbuf, sizeof(domainbuf));
- 	isc_sockaddr_format(&addrinfo->sockaddr, addrbuf, sizeof(addrbuf));
- 	isc_log_write(dns_lctx, DNS_LOGCATEGORY_LAME_SERVERS,
--		      DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,
-+		      DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(1),
- 		      "lame server resolving '%s' (in '%s'?): %s", namebuf,
- 		      domainbuf, addrbuf);
- }
-@@ -5316,7 +5316,7 @@ log_formerr(fetchctx_t *fctx, const char *format, ...) {
- 	isc_sockaddr_format(&fctx->addrinfo->sockaddr, nsbuf, sizeof(nsbuf));
- 
- 	isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,
--		      DNS_LOGMODULE_RESOLVER, ISC_LOG_NOTICE,
-+		      DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(1),
- 		      "DNS format error from %s resolving %s for %s: %s", nsbuf,
- 		      fctx->info, fctx->clientstr, msgbuf);
- }