From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 8 Apr 2014 07:13:49 +0000 (+0000)
Subject: - Fix #574: make test fails on Ubuntu 14.04.  Disabled remote-control
X-Git-Tag: release-1.5.0rc1~154
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7d1e6ccf915416c1895e8201c2d1dbf34ae09c1;p=thirdparty%2Funbound.git

- Fix #574: make test fails on Ubuntu 14.04.  Disabled remote-control
  in testbound scripts.


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

diff --git a/doc/Changelog b/doc/Changelog
index ccf259491..ed66ecf54 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+8 April 2014: Wouter
+	- Fix #574: make test fails on Ubuntu 14.04.  Disabled remote-control
+	  in testbound scripts.
+
 7 April 2014: Wouter
 	- C.ROOT-SERVERS.NET has an IPv6 address, and we updated the root
 	  hints (patch from Anand Buddhdev).
diff --git a/testcode/testbound.c b/testcode/testbound.c
index c5e2d4d61..b994b8f7e 100644
--- a/testcode/testbound.c
+++ b/testcode/testbound.c
@@ -193,6 +193,7 @@ setup_config(FILE* in, int* lineno, int* pass_argc, char* pass_argv[])
 	fprintf(cfg, "		username: \"\"\n");
 	fprintf(cfg, "		pidfile: \"\"\n");
 	fprintf(cfg, "		val-log-level: 2\n");
+	fprintf(cfg, "remote-control:	control-enable: no\n");
 	while(fgets(line, MAX_LINE_LEN-1, in)) {
 		parse = line;
 		(*lineno)++;