diff options
| author | teor <teor@torproject.org> | 2019-04-19 11:51:05 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-19 11:51:05 +1000 |
| commit | cb084de5e5dddee69abd55e3f4ed3a5ce9ebc9a2 (patch) | |
| tree | 14d209ce09a7b3e0e28ce01b59a78b6a230db5b9 | |
| parent | 2ae67fee4244ff3ea1e9f3345f2cfde48cf64435 (diff) | |
| parent | 1b9e77349ffbe813c7b16af67c069d967327f63b (diff) | |
| download | tor-cb084de5e5dddee69abd55e3f4ed3a5ce9ebc9a2.tar.gz tor-cb084de5e5dddee69abd55e3f4ed3a5ce9ebc9a2.zip | |
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5
| -rw-r--r-- | changes/bug13221 | 5 | ||||
| -rw-r--r-- | src/app/config/config.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/changes/bug13221 b/changes/bug13221 new file mode 100644 index 0000000000..13935a1921 --- /dev/null +++ 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 index e06c77e439..2a504d3065 100644 --- 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; } |