From b7fdb3a92715e1f3c37f84676d6f9e89188c5518 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 21 Sep 2012 19:48:38 -0400 Subject: [PATCH] add changes file and whitespace fixes for bug 4020 --- changes/bug4020 | 5 +++++ src/or/config.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 changes/bug4020 diff --git a/changes/bug4020 b/changes/bug4020 new file mode 100644 index 0000000000..3ca86e29db --- /dev/null +++ b/changes/bug4020 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - When complaining about a client port on a public address, log + which address we're complaining about. Fixes bug 4020; bugfix on + 0.2.3.3-alpha. Patch by Tom Fitzhenry. + diff --git a/src/or/config.c b/src/or/config.c index 79beb17274..6f946ce987 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4351,11 +4351,13 @@ warn_nonlocal_client_ports(const smartlist_t *ports, const char *portname) log_warn(LD_CONFIG, "You specified a public address '%s:%d' for %sPort. " "Other people on the Internet might find your computer and " "use it as an open proxy. Please don't allow this unless you " - "have a good reason.", fmt_addr(&port->addr), port->port, portname); + "have a good reason.", + fmt_addr(&port->addr), port->port, portname); } else if (!tor_addr_is_loopback(&port->addr)) { - log_notice(LD_CONFIG, "You configured a non-loopback address '%s:%d' for " - "%sPort. This allows everybody on your local network to use " - "your machine as a proxy. Make sure this is what you wanted.", + log_notice(LD_CONFIG, "You configured a non-loopback address '%s:%d' " + "for %sPort. This allows everybody on your local network to " + "use your machine as a proxy. Make sure this is what you " + "wanted.", fmt_addr(&port->addr), port->port, portname); } } SMARTLIST_FOREACH_END(port);