- 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 ccf2594914da211f29229ed656a6af70098e0cfe..ed66ecf54c328583df9bb7653f2bf39955c9808f 100644 (file)
--- 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 c5e2d4d61fd4e686097d60adc62dc65913ee19f1..b994b8f7eefd2a94f5fef9b7cc53c76fc162bd44 100644 (file)
--- 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)++;