From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 10 Sep 2011 10:33:23 +0000 (+0200)
Subject: Stop parse_client_port_config() from misinterpreting FooListenAddress and FooPort... 
X-Git-Tag: tor-0.2.3.4-alpha~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6f6b567e0547968c474afd47d56cc03953e0f03;p=thirdparty%2Ftor.git

Stop parse_client_port_config() from misinterpreting FooListenAddress and FooPort in legacy syntax

Previously the FooPort was ignored and the default used instead,
causing Tor to bind to the wrong port if FooPort and the default
port don't match or the CONN_TYPE_FOO_LISTENER has no default port.

Fixes #3936.
---

diff --git a/src/or/config.c b/src/or/config.c
index 684875d83a..ac7c6fff7e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5019,7 +5019,7 @@ parse_client_port_config(smartlist_t *out,
      if (out) {
        port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t));
        cfg->type = listener_type;
-       cfg->port = port ? port : defaultport;
+       cfg->port = port ? port : mainport;
        tor_addr_copy(&cfg->addr, &addr);
        cfg->session_group = SESSION_GROUP_UNSET;
        cfg->isolation_flags = ISO_DEFAULT;