From: Mark Andrews <marka@isc.org>
Date: Tue, 25 Mar 2014 05:46:11 +0000 (+1100)
Subject: othererror should not include badvers now that we have a badvers counter
X-Git-Tag: v9.10.0rc1~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4a819a44f452cd5653dc9d999f78a290626d2ac;p=thirdparty%2Fbind9.git

othererror should not include badvers now that we have a badvers counter
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 6142f53367c..11c805f7e8f 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -7441,6 +7441,9 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 		case dns_rcode_refused:
 			inc_stats(fctx->res, dns_resstatscounter_refused);
 			break;
+		case dns_rcode_badvers:
+			inc_stats(fctx->res, dns_resstatscounter_badvers);
+			break;
 		default:
 			inc_stats(fctx->res, dns_resstatscounter_othererror);
 			break;
@@ -7507,11 +7510,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 			unsigned int version;
 #ifdef ISC_PLATFORM_USESIT
 			unsigned char sit[64];
-#endif
 
-			inc_stats(fctx->res, dns_resstatscounter_badvers);
-
-#ifdef ISC_PLATFORM_USESIT
 			/*
 			 * Some servers return BADVERS to unknown
 			 * EDNS options.  This cannot be long term