[tor-commits] [tor/master] Stop parse_client_port_config() from misinterpreting FooListenAddress and FooPort in legacy syntax

[nickm at torproject.org]

commit c6f6b567e0547968c474afd47d56cc03953e0f03
Author: Fabian Keil <fk at fabiankeil.de>
Date:   Sat Sep 10 12:33:23 2011 +0200

    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.
---
 src/or/config.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 684875d..ac7c6ff 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;