tor

commit cb084de5e5dddee69abd55e3f4ed3a5ce9ebc9a2
parent 2ae67fee4244ff3ea1e9f3345f2cfde48cf64435
Author: teor <teor@torproject.org>
Date:   Fri, 19 Apr 2019 11:51:05 +1000

Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5

Diffstat:
A
changes/bug13221
 | 
5
+++++
M
src/app/config/config.c
 | 
8
++++----

2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/changes/bug13221 b/changes/bug13221
@@ -0,0 +1,5 @@
+  o Minor bugfixes (logging):
+    - Correct a misleading error message when IPv4Only or IPv6Only
+      is used but the resolved address can not be interpreted as an
+      address of the specified IP version.  Fixes bug 13221; bugfix
+      on 0.2.3.9-alpha.  Patch from Kris Katterjohn.
diff --git a/src/app/config/config.c b/src/app/config/config.c
@@ -7061,13 +7061,13 @@ parse_port_config(smartlist_t *out,
                  portname, escaped(ports->value));
         goto err;
       }
-      if (bind_ipv4_only && tor_addr_family(&addr) == AF_INET6) {
-        log_warn(LD_CONFIG, "Could not interpret %sPort address as IPv6",
+      if (bind_ipv4_only && tor_addr_family(&addr) != AF_INET) {
+        log_warn(LD_CONFIG, "Could not interpret %sPort address as IPv4",
                  portname);
         goto err;
       }
-      if (bind_ipv6_only && tor_addr_family(&addr) == AF_INET) {
-        log_warn(LD_CONFIG, "Could not interpret %sPort address as IPv4",
+      if (bind_ipv6_only && tor_addr_family(&addr) != AF_INET6) {
+        log_warn(LD_CONFIG, "Could not interpret %sPort address as IPv6",
                  portname);
         goto err;
       }