Enable interface-automatic for people for whom it works.

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

diff --git a/doc/Changelog b/doc/Changelog
index 0c88f076fb26b13d173c5e2f175b317a01c83b97..09c8bd0c4b69072fd72a0d704dede962f63559c0 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+20 October 2010: Wouter
+       - interface automatic works for some people with ip6 disabled.
+         Therefore the error check is removed, so they can use the option.
+
 19 October 2010: Wouter
        - Fix for request list growth, if a server has long timeout but the
          lost counter is low, then its effective rtt is the one without

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 671ce3daca23e5d524266084b34451f8633fcb17..7f8c10186f2c61c27456165f2c3b1bf8ef6c4132 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -124,9 +124,8 @@ interface and port number), if not specified the default port (from
 .TP
 .B interface\-automatic: \fI<yes or no>
 Detect source interface on UDP queries and copy them to replies.  This 
-feature is experimental, and needs support in your OS for IPv6 
-(and its socket options) and IPv4 (and have source\-interface socket options). 
-Default value is no.
+feature is experimental, and needs support in your OS for particular socket
+options.  Default value is no.
 .TP
 .B outgoing\-interface: \fI<ip address>
 Interface to use to connect to the network. This interface is used to send

diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 49cbeed983f432bf62c2c336cf78438e6fba8653..e8cb70d84eb2567d25f62f926cbdf44538264fd1 100644 (file)
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -744,10 +744,6 @@ listening_ports_open(struct config_file* cfg)
        if(!do_ip4 && !do_ip6) {
                return NULL;
        }
-       if(do_auto && (!do_ip4 || !do_ip6)) {
-               log_warn("interface_automatic option does not work when either do-ip4 or do-ip6 is not enabled. Disabling option.");
-               do_auto = 0;
-       }
        /* create ip4 and ip6 ports so that return addresses are nice. */
        if(do_auto || cfg->num_ifs == 0) {
                if(do_ip6) {