From: Mark Andrews <marka@isc.org>
Date: Wed, 22 Jul 2020 23:47:49 +0000 (+1000)
Subject: Map DNS_R_BADTSIG to FORMERR
X-Git-Tag: v9.17.4~15^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20488d6ad36c7b48f043e583ff32eb14ca52f035;p=thirdparty%2Fbind9.git

Map DNS_R_BADTSIG to FORMERR

Now that the log message has been printed set the result code to
DNS_R_FORMERR.  We don't do this via dns_result_torcode() as we
don't want upstream errors to produce FORMERR if that processing
end with DNS_R_BADTSIG.
---

diff --git a/lib/ns/client.c b/lib/ns/client.c
index 6b00dae8894..7e1bde98750 100644
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -1827,7 +1827,7 @@ ns__client_request(isc_nmhandle_t *handle, isc_result_t eresult,
 			      NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(1),
 			      "message parsing failed: %s",
 			      isc_result_totext(result));
-		if (result == ISC_R_NOSPACE) {
+		if (result == ISC_R_NOSPACE || result == DNS_R_BADTSIG) {
 			result = DNS_R_FORMERR;
 		}
 		ns_client_error(client, result);