- Fix that prefer-ip4 and prefer-ip6 can be get and set with

  unbound-control, with libunbound and the unbound-checkconf option
  output function.

diff --git a/doc/Changelog b/doc/Changelog
index db4b27a2c4387520a93431000faa0c40551a9d30..d9aeec1c8d09043d6232f9800c1b6d53cae1649a 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+18 September 2020: Wouter
+       - Fix that prefer-ip4 and prefer-ip6 can be get and set with
+         unbound-control, with libunbound and the unbound-checkconf option
+         output function.
+
 15 September 2020: George
        - Introduce test for statistics.
 

diff --git a/util/config_file.c b/util/config_file.c
index 5f79baa7ec3ba811e7001a7134f45450f7d584f2..a2fb4c42952d3658f0a4cc69ca9b01e81d10a0c9 100644 (file)
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -489,6 +489,8 @@ int config_set_option(struct config_file* cfg, const char* opt,
        else S_YNO("do-ip6:", do_ip6)
        else S_YNO("do-udp:", do_udp)
        else S_YNO("do-tcp:", do_tcp)
+       else S_YNO("prefer-ip4:", prefer_ip4)
+       else S_YNO("prefer-ip6:", prefer_ip6)
        else S_YNO("tcp-upstream:", tcp_upstream)
        else S_YNO("udp-upstream-without-downstream:",
                udp_upstream_without_downstream)
@@ -947,6 +949,8 @@ config_get_option(struct config_file* cfg, const char* opt,
        else O_YNO(opt, "do-ip6", do_ip6)
        else O_YNO(opt, "do-udp", do_udp)
        else O_YNO(opt, "do-tcp", do_tcp)
+       else O_YNO(opt, "prefer-ip4", prefer_ip4)
+       else O_YNO(opt, "prefer-ip6", prefer_ip6)
        else O_YNO(opt, "tcp-upstream", tcp_upstream)
        else O_YNO(opt, "udp-upstream-without-downstream", udp_upstream_without_downstream)
        else O_DEC(opt, "tcp-mss", tcp_mss)