From: Mark Andrews <marka@isc.org>
Date: Tue, 7 Jun 2005 00:39:05 +0000 (+0000)
Subject: 1867.   [bug]           It was possible to trigger a INSIST in
X-Git-Tag: v9.2.6b1~78^2~53
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=116e6b4257e3efceca3e82af1e695579129af93d;p=thirdparty%2Fbind9.git

1867.   [bug]           It was possible to trigger a INSIST in
                        dlv_validatezonekey(). [RT #14846]
---

diff --git a/CHANGES b/CHANGES
index 511ed8b9582..cb522ea9569 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,12 +1,14 @@
 1879.	[func]		Added framework for handling multiple EDNS versions.
+			[RT #14873]
 
 1878.	[func]		dig can now specify the EDNS version when making
-			a query.
+			a query. [RT #14873]
 
 1868.	[func]		edns-udp-size can now be overridden on a per
 			server basis. [RT #14851]
 
-1867.	[placeholder]	rt14846
+1867.	[bug]		It was possible to trigger a INSIST in
+			dlv_validatezonekey(). [RT #14846]
 
 1866.	[placeholder]	rt14841
 
diff --git a/doc/private/branches b/doc/private/branches
index dfe43c249fd..a4c0dba3b19 100644
--- a/doc/private/branches
+++ b/doc/private/branches
@@ -12,7 +12,7 @@ Branch				Status	Whom	// Comments
 bind9-gss-tsig			new	
 bind9-gsstsig			new	
 dlz				open	sra	// dynamicly loadable zones
-edns1				open	marka
+edns1				closed	marka
 gsstsig2			new	
 jinmei-mmapzone-test		new		// mmap based zone file. very experimental, just for reference purposes
 libbind_clean			open	jinmei
@@ -42,10 +42,10 @@ rt14802				new
 rt14814				review	
 rt14815				open	marka
 rt14841				new	
-rt14846				new	
-rt14851				new	
+rt14846				closed	
+rt14851				closed	
 rt14855				new	
-rt14873				new	
+rt14873				closed	
 rt5206_1			open	marka
 rt6432				open	marka
 rt6496a				open	marka
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 25a474d41ab..9bdddcca060 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.129 2005/05/06 01:59:38 marka Exp $ */
+/* $Id: validator.c,v 1.130 2005/06/07 00:39:05 marka Exp $ */
 
 /*! \file */
 
@@ -1483,7 +1483,7 @@ dlv_validatezonekey(dns_validator_t *val) {
 			/*
 			 * We have DLV records.
 			 */
-			val->dsset = &val->frdataset;
+			val->dlv = &val->frdataset;
 			if (val->frdataset.trust == dns_trust_pending &&
 			    dns_rdataset_isassociated(&val->fsigrdataset))
 			{