From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 9 Jul 2015 09:45:08 +0000 (+0000)
Subject: - Fix #681: Setting forwarders with unbound-control forward
X-Git-Tag: release-1.5.5rc1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f66a15d89450c4a5e284a07b084b27bf7aef2b32;p=thirdparty%2Funbound.git

- Fix #681: Setting forwarders with unbound-control forward
  implicitly turns on forward-first.


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

diff --git a/daemon/remote.c b/daemon/remote.c
index 93d0eda28..a9ec7bd92 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -1683,6 +1683,7 @@ parse_delegpt(SSL* ssl, char* args, uint8_t* nm, int allow_names)
 			}
 		}
 	}
+	dp->has_parent_side_NS = 1;
 	return dp;
 }
 
diff --git a/doc/Changelog b/doc/Changelog
index a8b9c8d96..8c7051c4d 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 9 July 2015: Wouter
 	- 1.5.4 release tag
 	- trunk has 1.5.5 in development.
+	- Fix #681: Setting forwarders with unbound-control forward
+	  implicitly turns on forward-first.
 
 29 June 2015: Wouter
 	- iana portlist update.