nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

make NoPublish (even though deprecated) work again.

Browse Source 
svn:r6287
This commit is contained in:
Roger Dingledine 2006-04-02 02:59:48 +00:00
parent dfb3c5f47a
commit 1e04b70d49
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/config.c
View File

@ -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) */ if (options_init_logs(options, 1)<0) /* Validate the log(s) */
REJECT("Failed to validate Log options. See logs for details."); 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)) { if (server_mode(options)) {
/* confirm that our address isn't broken, so we can complain now */ /* confirm that our address isn't broken, so we can complain now */
uint32_t tmp; uint32_t tmp;
@ -2153,12 +2159,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
if (options->AuthoritativeDir && options->ClientOnly) if (options->AuthoritativeDir && options->ClientOnly)
REJECT("Running as authoritative directory, but ClientOnly also set."); 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) { if (options->ConnLimit <= 0) {
r = tor_snprintf(buf, sizeof(buf), r = tor_snprintf(buf, sizeof(buf),
"ConnLimit must be greater than 0, but was set to %d", "ConnLimit must be greater than 0, but was set to %d",