tor

commit 89d0261eb5abe75e798a120793df5df64a7c770f
parent 80360ed9fa86c22ee3f9cf7e14076ef64466918a
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 23 Jun 2017 14:38:20 -0400

Merge remote-tracking branch 'isis/bug4019'

Diffstat:
A
changes/bug4019
 | 
4
++++
M
src/or/config.c
 | 
8
+++++---

2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/changes/bug4019 b/changes/bug4019
@@ -0,0 +1,4 @@
+  o Minor bugfixes (logging):
+    - Remove duplicate log messages regarding opening non-local SocksPorts
+      upon parsing config and opening listeners at startup. Fixes bug 4019;
+      bugfix on tor-0.2.3.3-alpha.
diff --git a/src/or/config.c b/src/or/config.c
@@ -6258,8 +6258,9 @@ port_cfg_free(port_cfg_t *port)
 /** Warn for every port in <b>ports</b> of type <b>listener_type</b> that is
  * on a publicly routable address. */
 static void
-warn_nonlocal_client_ports(const smartlist_t *ports, const char *portname,
-                           int listener_type)
+warn_nonlocal_client_ports(const smartlist_t *ports,
+                           const char *portname,
+                           const int listener_type)
 {
   SMARTLIST_FOREACH_BEGIN(ports, const port_cfg_t *, port) {
     if (port->type != listener_type)
@@ -6943,7 +6944,8 @@ parse_ports(or_options_t *options, int validate_only,
              options->SocksPort_lines,
              "Socks", CONN_TYPE_AP_LISTENER,
              "127.0.0.1", 9050,
-             CL_PORT_WARN_NONLOCAL|CL_PORT_TAKES_HOSTNAMES|gw_flag) < 0) {
+             ((validate_only ? 0 : CL_PORT_WARN_NONLOCAL)
+              | CL_PORT_TAKES_HOSTNAMES | gw_flag)) < 0) {
     *msg = tor_strdup("Invalid SocksPort configuration");
     goto err;
   }