diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-28 15:44:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-28 15:44:06 -0400 |
| commit | 2bc4c55d7d17ba9d4dcfacd3f2b118e7144a146d (patch) | |
| tree | e13c924935116bf25ad5fb5f259d2aca51140882 /src/app | |
| parent | 82d758afa80724f4b8322e002d351c8e7923062a (diff) | |
| parent | f282375fb7d9c527e4bff19dc1e8c6dc7627d137 (diff) | |
| download | tor-2bc4c55d7d17ba9d4dcfacd3f2b118e7144a146d.tar.gz tor-2bc4c55d7d17ba9d4dcfacd3f2b118e7144a146d.zip | |
Merge remote-tracking branch 'tor-github/pr/245'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 1a43c7fd5b..105c408614 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -3359,7 +3359,6 @@ STATIC int options_validate(or_options_t *old_options, or_options_t *options, or_options_t *default_options, int from_setconf, char **msg) { - int i; config_line_t *cl; const char *uname = get_uname(); int n_ports=0; @@ -3680,30 +3679,6 @@ options_validate(or_options_t *old_options, or_options_t *options, } } - /* Terminate Reachable*Addresses with reject * - */ - for (i=0; i<3; i++) { - config_line_t **linep = - (i==0) ? &options->ReachableAddresses : - (i==1) ? &options->ReachableORAddresses : - &options->ReachableDirAddresses; - if (!*linep) - continue; - /* We need to end with a reject *:*, not an implicit accept *:* */ - for (;;) { - linep = &((*linep)->next); - if (!*linep) { - *linep = tor_malloc_zero(sizeof(config_line_t)); - (*linep)->key = tor_strdup( - (i==0) ? "ReachableAddresses" : - (i==1) ? "ReachableORAddresses" : - "ReachableDirAddresses"); - (*linep)->value = tor_strdup("reject *:*"); - break; - } - } - } - if ((options->ReachableAddresses || options->ReachableORAddresses || options->ReachableDirAddresses || |