From: Tatuya JINMEI 神明達哉 <jinmei@isc.org>
Date: Fri, 18 Sep 2009 21:55:21 +0000 (+0000)
Subject: 2681.	[bug]		IPSECKEY RR of gateway type 3 was not correctly
X-Git-Tag: v9.7.0b1~138
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=790e471f6e97fd4da5dc03dd34824d814a50b9a1;p=thirdparty%2Fbind9.git

2681.	[bug]		IPSECKEY RR of gateway type 3 was not correctly
			decoded [RT #20269].

BIND 9.7.0, 9.6.2, 9.5.2, 9.4.4
---

diff --git a/CHANGES b/CHANGES
index 385341d1cfa..2dd3bb7fbab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2681.	[bug]		IPSECKEY RR of gateway type 3 was not correctly
+			decoded [RT #20269].
+
 2680.	[func]		Move some contrib/pkcs11-keygen to bin/pkcs11.
 			[RT #20067]
 
diff --git a/lib/dns/rdata/generic/ipseckey_45.c b/lib/dns/rdata/generic/ipseckey_45.c
index 15c7cdcf59b..2cf13b28311 100644
--- a/lib/dns/rdata/generic/ipseckey_45.c
+++ b/lib/dns/rdata/generic/ipseckey_45.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipseckey_45.c,v 1.6 2009/01/17 23:47:43 tbox Exp $ */
+/* $Id: ipseckey_45.c,v 1.7 2009/09/18 21:55:21 jinmei Exp $ */
 
 #ifndef RDATA_GENERIC_IPSECKEY_45_C
 #define RDATA_GENERIC_IPSECKEY_45_C
@@ -243,6 +243,7 @@ fromwire_ipseckey(ARGS_FROMWIRE) {
 		isc_buffer_forward(source, 3);
 		RETERR(dns_name_fromwire(&name, source, dctx, options, target));
 		isc_buffer_activeregion(source, &region);
+		isc_buffer_forward(source, region.length);
 		return(mem_tobuffer(target, region.base, region.length));
 
 	default: