[tor-commits] [tor/maint-0.4.5] config: Set flag for implicit port address

[dgoulet at torproject.org]

commit 80b33ae1ca148753558afa7bc8b43ba3df6d7948
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Feb 11 16:12:59 2021 -0500

    config: Set flag for implicit port address
    
    Fun bug where we thought we were using the default "false" value when an
    implicit address was detected but if we had an explicit address before, the
    flag was set to true and then we would only use that value.
    
    And thus, for some configurations, implicit addresses would be flagged as
    explicit and then configuring ports goes bad.
    
    Related to #40289
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/app/config/config.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index c7799ec1a2..fa74907b3d 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -6034,6 +6034,7 @@ port_parse_config(smartlist_t *out,
       port = (int) tor_parse_long(addrport, 10, 0, 65535, &ok, NULL);
       if (ok) {
         tor_addr_copy(&addr, &default_addr);
+        addr_is_explicit = false;
       } else if (tor_addr_port_lookup(addrport, &addr, &ptmp) == 0) {
         if (ptmp == 0) {
           log_warn(LD_CONFIG, "%sPort line has address but no port", portname);