diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-01-06 01:14:11 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-01-06 01:14:11 +0000 |
| commit | 17036de8b7d0b33b46d5ee0a7b87b8052992e5d3 (patch) | |
| tree | 0f7b98e4280107fedf2764bae50c10cfefba7389 /src/or/config.c | |
| parent | 614dc52623e07d833f1ccd7bf68d835227209f07 (diff) | |
| download | tor-17036de8b7d0b33b46d5ee0a7b87b8052992e5d3.tar.gz tor-17036de8b7d0b33b46d5ee0a7b87b8052992e5d3.zip | |
r17469@catbus: nickm | 2008-01-05 20:14:07 -0500
Fix bug 579: Count DNSPort and hidden services when checking whether Tor is going to do anything. Change "no configured ports" from fatal to warning.
svn:r13036
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c index 4fabe9ecf7..8bcedbf53b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2745,9 +2745,12 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("NatdPort option out of bounds."); if (options->SocksPort == 0 && options->TransPort == 0 && - options->NatdPort == 0 && options->ORPort == 0) - REJECT("SocksPort, TransPort, NatdPort, and ORPort are all undefined? " - "Quitting."); + options->NatdPort == 0 && options->ORPort == 0 && + options->DNSPort == 0 && !options->RendConfigLines) + log(LOG_WARN, LD_CONFIG, + "SocksPort, TransPort, NatdPort, DNSPort, and ORPort are all " + "undefined, and there aren't any hidden services configured. " + "Tor will still run, but probably won't do anything."); if (options->ControlPort < 0 || options->ControlPort > 65535) REJECT("ControlPort option out of bounds."); |