diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2010-10-30 06:38:50 +0200 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2010-11-10 15:48:26 +0100 |
| commit | 5040c855d19eaac23e35d34c73cb5bbe40f95a88 (patch) | |
| tree | 473964634a80e8a474480fb93835ba1c55a81366 /src/or/config.c | |
| parent | 556a1b9e459d28b5f37fa012176d6931fe721844 (diff) | |
| download | tor-5040c855d19eaac23e35d34c73cb5bbe40f95a88.tar.gz tor-5040c855d19eaac23e35d34c73cb5bbe40f95a88.zip | |
Break NoPublish support
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/or/config.c b/src/or/config.c index c28cf58aeb..d9e74dcc1e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -304,7 +304,7 @@ static config_var_t _option_vars[] = { V(NATDPort, UINT, "0"), V(Nickname, STRING, NULL), V(WarnUnsafeSocks, BOOL, "1"), - V(NoPublish, BOOL, "0"), + OBSOLETE("NoPublish"), VAR("NodeFamily", LINELIST, NodeFamilies, NULL), V(NumCPUs, UINT, "1"), V(NumEntryGuards, UINT, "3"), @@ -2996,14 +2996,6 @@ 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."); - SMARTLIST_FOREACH(options->PublishServerDescriptor, char *, s, - tor_free(s)); - smartlist_clear(options->PublishServerDescriptor); - } - if (authdir_mode(options)) { /* confirm that our address isn't broken, so we can complain now */ uint32_t tmp; @@ -3832,7 +3824,6 @@ options_transition_affects_descriptor(or_options_t *old_options, old_options->ORPort != new_options->ORPort || old_options->DirPort != new_options->DirPort || old_options->ClientOnly != new_options->ClientOnly || - old_options->NoPublish != new_options->NoPublish || old_options->_PublishServerDescriptor != new_options->_PublishServerDescriptor || get_effective_bwrate(old_options) != get_effective_bwrate(new_options) || |