From: Evan Hunt <each@isc.org>
Date: Thu, 20 Feb 2014 05:26:31 +0000 (-0800)
Subject: [master] assert if sitok/sitbad are insane
X-Git-Tag: v9.10.0b1~49
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9576baafc095aa9928f144e9af707adbd9594da0;p=thirdparty%2Fbind9.git

[master] assert if sitok/sitbad are insane
---

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 9494cb416dd..09c78416ae4 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -3290,11 +3290,12 @@ process_sit(dig_lookup_t *l, dns_message_t *msg,
 		len = sizeof(cookie);
 	}
 
+	INSIST(msg->sitok == 0 && msg->sitbad == 0);
 	if (optlen >= len && optlen >= 8U) {
 		if (memcmp(isc_buffer_current(optbuf), sit, 8) == 0) {
 			msg->sitok = 1;
 		} else {
-			printf(";; Warning: SIT client cookie part mis-match\n");
+			printf(";; Warning: SIT client cookie mismatch\n");
 			msg->sitbad = 1;
 		}
 	} else {
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 29852030cbe..7a3df5a13a7 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -7033,6 +7033,8 @@ process_opt(resquery_t *query, dns_rdataset_t *opt) {
 			case DNS_OPT_SIT:
 				sit = isc_buffer_current(&optbuf);
 				compute_cc(query, cookie, sizeof(cookie));
+				INSIST(query->fctx->rmessage->sitbad == 0 &&
+				       query->fctx->rmessage->sitok == 0);
 				if (optlen >= 8U &&
 				    memcmp(cookie, sit, 8) == 0) {
 					query->fctx->rmessage->sitok = 1;