From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 25 May 2011 06:09:01 +0000 (+0000)
Subject: 1.4.10 tag created.
X-Git-Tag: release-1.4.11rc1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b23ed42b5512169f4f0f084beafceef7171e95de;p=thirdparty%2Funbound.git

1.4.10 tag created.


git-svn-id: file:///svn/unbound/trunk@2419 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/configure b/configure
index aa5110c16..96bafefa8 100755
--- a/configure
+++ b/configure
@@ -2369,7 +2369,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 LIBUNBOUND_CURRENT=2
-LIBUNBOUND_REVISION=10
+LIBUNBOUND_REVISION=11
 LIBUNBOUND_AGE=0
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -2394,7 +2394,8 @@ LIBUNBOUND_AGE=0
 # 1.4.7 had 2:7:0
 # 1.4.8 had 2:8:0
 # 1.4.9 had 2:9:0
-# 1.5.0 had 2:10:0
+# 1.4.10 had 2:10:0
+# 1.5.0 had 2:11:0
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
diff --git a/configure.ac b/configure.ac
index 56597a9be..be5457dd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ sinclude(ac_pkg_swig.m4)
 AC_INIT(unbound, 1.5.0, unbound-bugs@nlnetlabs.nl, unbound)
 
 LIBUNBOUND_CURRENT=2
-LIBUNBOUND_REVISION=10
+LIBUNBOUND_REVISION=11
 LIBUNBOUND_AGE=0
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -34,7 +34,8 @@ LIBUNBOUND_AGE=0
 # 1.4.7 had 2:7:0
 # 1.4.8 had 2:8:0
 # 1.4.9 had 2:9:0
-# 1.5.0 had 2:10:0
+# 1.4.10 had 2:10:0
+# 1.5.0 had 2:11:0
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
diff --git a/daemon/worker.c b/daemon/worker.c
index 0b0ef679b..eafdb8f1e 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -779,6 +779,7 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 		qinfo.qtype == LDNS_RR_TYPE_IXFR) {
 		verbose(VERB_ALGO, "worker request: refused zone transfer.");
 		log_addr(VERB_CLIENT,"from",&repinfo->addr, repinfo->addrlen);
+		ldns_buffer_rewind(c->buffer);
 		LDNS_QR_SET(ldns_buffer_begin(c->buffer));
 		LDNS_RCODE_SET(ldns_buffer_begin(c->buffer), 
 			LDNS_RCODE_REFUSED);
diff --git a/doc/Changelog b/doc/Changelog
index 547fcbd01..b569593d6 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+25 May 2011: Wouter
+	- Fix assertion failure when unbound generates an empty error reply
+	  in response to a query, CVE-2011-1922 VU#531342.
+	- This fix is in tag 1.4.10.
+
 10 May 2011: Wouter
 	- bug#386: --enable-allsymbols option links all binaries to libunbound
 	  and reduces install size significantly.