summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-07-17 12:02:55 -0400
committerNick Mathewson <nickm@torproject.org>2012-07-17 12:02:55 -0400
commit4cac5df5548e0051a6927a778da3e6f01f45dc56 (patch)
tree49a597192ef6a5daa0228a45479015a8c4a37130
parent21c6c8485367ce66ab0791c153177c17bccd25c5 (diff)
downloadtor-4cac5df5548e0051a6927a778da3e6f01f45dc56.tar.gz
tor-4cac5df5548e0051a6927a778da3e6f01f45dc56.zip
Improve message on spurious SOCKSListenAddress
-rw-r--r--changes/port_doc3
-rw-r--r--src/or/config.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/port_doc b/changes/port_doc
new file mode 100644
index 0000000000..0e8662f0ab
--- /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 f5b5c8fb58..bacb06ee99 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;
}