[tor-commits] [tor/master] Reinstate address in warning message when binding non-locally

[nickm at torproject.org]

commit 655782f302ed7b4ab0a98e61095f7a664042f2b0
Author: Tom Fitzhenry <tom at tom-fitzhenry.me.uk>
Date:   Thu Apr 26 22:14:01 2012 +0100

    Reinstate address in warning message when binding non-locally
    
    bug4020
    
    Signed-off-by: Tom Fitzhenry <tom at tom-fitzhenry.me.uk>
---
 src/or/config.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index e4e9d52..79beb17 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4348,15 +4348,15 @@ warn_nonlocal_client_ports(const smartlist_t *ports, const char *portname)
     if (port->is_unix_addr) {
       /* Unix sockets aren't accessible over a network. */
     } else if (!tor_addr_is_internal(&port->addr, 1)) {
-      log_warn(LD_CONFIG, "You specified a public address for %sPort. "
+      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.", 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 for "
+      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.",
-                 portname);
+                 fmt_addr(&port->addr), port->port, portname);
     }
   } SMARTLIST_FOREACH_END(port);
 }