diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-19 20:21:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-08-19 20:21:04 -0400 |
| commit | 3c8baa77a1d2f5a0235adc48ad5650340683e8ee (patch) | |
| tree | 35e3bf6752624c6c2f0db5f5e805b01ef00af9f8 /src/or/config.c | |
| parent | 05ad2db283744609ea9414c2ba434a495e183a3f (diff) | |
| download | tor-3c8baa77a1d2f5a0235adc48ad5650340683e8ee.tar.gz tor-3c8baa77a1d2f5a0235adc48ad5650340683e8ee.zip | |
Log a warning when Testing options are deprecated.
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index a94e9595d6..941393a603 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -545,7 +545,7 @@ static const config_var_t testing_tor_network_defaults[] = { "0, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 16, 32, 60"), V(ClientBootstrapConsensusMaxDownloadTries, UINT, "80"), V(ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries, UINT, "80"), - V(ClientDNSRejectInternalAddresses, BOOL,"0"), + V(ClientDNSRejectInternalAddresses, BOOL,"0"), // deprecated in 0.2.9.2-alpha V(ClientRejectInternalAddresses, BOOL, "0"), V(CountPrivateBandwidth, BOOL, "1"), V(ExitPolicyRejectPrivate, BOOL, "0"), @@ -4924,6 +4924,12 @@ options_init_from_string(const char *cf_defaults, const char *cf, tor_assert(new_var); tor_assert(old_var); old_var->initvalue = new_var->initvalue; + + if ((config_find_deprecation(&options_format, new_var->name))) { + log_warn(LD_GENERAL, "Testing options override the deprecated " + "option %s. Is that intentional?", + new_var->name); + } } /* Clear newoptions and re-initialize them with new defaults. */ |