summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-11-11 22:41:07 +0000
committerRoger Dingledine <arma@torproject.org>2005-11-11 22:41:07 +0000
commit014c6bfe00d4f07144fb0a02915df7e0aa85630f (patch)
tree74d193d342253140f118b9c240ed23106b922414
parent5ef29278706e7d487ba167ab4f0329fa3cb61818 (diff)
downloadtor-014c6bfe00d4f07144fb0a02915df7e0aa85630f.tar.gz
tor-014c6bfe00d4f07144fb0a02915df7e0aa85630f.zip
We were refusing to start if you define SocksListenAddress
but define SocksPort to be 0. But this is a standard configuration! So don't fail. svn:r5361
-rw-r--r--src/or/config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index f0ea414e5f..b1ad5f8717 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1747,8 +1747,10 @@ options_validate(or_options_t *options)
if (options->DirPort == 0 && options->DirListenAddress != NULL)
REJECT("DirPort must be defined if DirListenAddress is defined.");
+#if 0 /* don't complain, since a standard configuration does this! */
if (options->SocksPort == 0 && options->SocksListenAddress != NULL)
REJECT("SocksPort must be defined if SocksListenAddress is defined.");
+#endif
if (validate_data_directory(options)<0)
REJECT("Invalid DataDirectory");