diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-04-02 02:59:48 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-04-02 02:59:48 +0000 |
| commit | 1e04b70d49e0de7b27801173a3e6793857abd113 (patch) | |
| tree | e201735dc3402ebd59caf727b3942420cc24c5bf /src/or/config.c | |
| parent | dfb3c5f47a3d814bb2c5667b9e82256a8887310f (diff) | |
| download | tor-1e04b70d49e0de7b27801173a3e6793857abd113.tar tor-1e04b70d49e0de7b27801173a3e6793857abd113.tar.gz | |
make NoPublish (even though deprecated) work again.
svn:r6287
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/or/config.c b/src/or/config.c index da7a435f6..a1fc6b434 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2084,6 +2084,12 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options_init_logs(options, 1)<0) /* Validate the log(s) */ REJECT("Failed to validate Log options. See logs for details."); + if (options->NoPublish) { + log(LOG_WARN, LD_CONFIG, + "NoPublish is obsolete. Use PublishServerDescriptor instead."); + options->PublishServerDescriptor = 0; + } + if (server_mode(options)) { /* confirm that our address isn't broken, so we can complain now */ uint32_t tmp; @@ -2153,12 +2159,6 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->AuthoritativeDir && options->ClientOnly) REJECT("Running as authoritative directory, but ClientOnly also set."); - if (options->NoPublish) { - log(LOG_WARN, LD_CONFIG, - "NoPublish is obsolete. Use PublishServerDescriptor instead."); - options->PublishServerDescriptor = 0; - } - if (options->ConnLimit <= 0) { r = tor_snprintf(buf, sizeof(buf), "ConnLimit must be greater than 0, but was set to %d", |