[tor-commits] [tor/maint-0.2.3] Improve message on spurious SOCKSListenAddress

[nickm at torproject.org]

commit 4cac5df5548e0051a6927a778da3e6f01f45dc56
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 17 12:02:55 2012 -0400

    Improve message on spurious SOCKSListenAddress
---
 changes/port_doc |    3 +++
 src/or/config.c  |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/changes/port_doc b/changes/port_doc
new file mode 100644
index 0000000..0e8662f
--- /dev/null
+++ b/changes/port_doc
@@ -0,0 +1,3 @@
+  o Minor features (usability):
+    - Try to make the warning when giving an obsolete SOCKSListenAddress
+      a littel more useful.
diff --git a/src/or/config.c b/src/or/config.c
index f5b5c8f..bacb06e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5642,7 +5642,7 @@ parse_port_config(smartlist_t *out,
         mainport = (int)tor_parse_long(ports->value, 10, 0, 65535, &ok, NULL);
         if (!ok) {
           log_warn(LD_CONFIG, "%sListenAddress can only be used with a single "
-                   "%sPort with value \"auto\" or 1-65535.",
+                   "%sPort with value \"auto\" or 1-65535 and no options set.",
                    portname, portname);
           return -1;
         }