[tor-commits] [tor/master] addr: Continue trying all Address options on resolve failure

nickm at torproject.org nickm at torproject.org
Wed Jul 1 20:27:24 UTC 2020


commit 6f1423cb57b35525babb08fe317df126f7363b46
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jun 30 12:12:04 2020 -0400

    addr: Continue trying all Address options on resolve failure
    
    When going over all Address lines from the configuration, continue to attempt
    resolving other lines if one fails.
    
    Before that, we would bail right away and never noticed the other Address
    lines.
    
    Fixed in #33235
    Related to #33233
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/app/config/resolve_addr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c
index 61662c340..9c208efea 100644
--- a/src/app/config/resolve_addr.c
+++ b/src/app/config/resolve_addr.c
@@ -212,7 +212,7 @@ get_address_from_config(const or_options_t *options, int warn_severity,
       /* Hostname that can't be resolved, this is a fatal error. */
       log_fn(warn_severity, LD_CONFIG,
              "Could not resolve local Address '%s'. Failing.", cfg->value);
-      return FN_RET_BAIL;
+      continue;
     }
   }
 





More information about the tor-commits mailing list