From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 5 Sep 2016 14:30:24 +0000 (+0000)
Subject: - Fix #828: missing type in access-control-tag-action redirect results
X-Git-Tag: release-1.5.10~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=843300dec5ccd3cfe0778614d23d22d721325004;p=thirdparty%2Funbound.git

- Fix #828: missing type in access-control-tag-action redirect results
  in NXDOMAIN.


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

diff --git a/doc/Changelog b/doc/Changelog
index 248ed13b1..92b9e0c81 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,8 @@
 	- Fix #829: doc of sldns_wire2str_rdata_buf() return value has an
 	  off-by-one typo, from Jinmei Tatuya (Infoblox).
 	- Fix incomplete prototypes reported by Dag-Erling Smørgrav.
+	- Fix #828: missing type in access-control-tag-action redirect results
+	  in NXDOMAIN.
 
 2 September 2016: Wouter
 	- Fix compile with openssl 1.1.0 with api=1.1.0.
diff --git a/services/localzone.c b/services/localzone.c
index aeea2c6f5..7091b01a2 100644
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -1351,7 +1351,8 @@ lz_zone_answer(struct local_zone* z, struct query_info* qinfo,
 		 * or using closest match for NSEC.
 		 * or using closest match for returning delegation downwards
 		 */
-		int rcode = ld?LDNS_RCODE_NOERROR:LDNS_RCODE_NXDOMAIN;
+		int rcode = (ld || lz_type == local_zone_redirect)?
+			LDNS_RCODE_NOERROR:LDNS_RCODE_NXDOMAIN;
 		if(z->soa)
 			return local_encode(qinfo, edns, buf, temp, 
 				z->soa, 0, rcode);