diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-12-29 05:51:50 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-12-29 05:51:50 +0000 |
| commit | 6fbf17e7b0a690d95abe9cc889133b607e6f2e28 (patch) | |
| tree | 81724cab811617dbbc8ba1652b676152598c92cc /src/or/config.c | |
| parent | 0e172d9f6e0f6b1fbe20618879b892662a7dc051 (diff) | |
| download | tor-6fbf17e7b0a690d95abe9cc889133b607e6f2e28.tar.gz tor-6fbf17e7b0a690d95abe9cc889133b607e6f2e28.zip | |
r11749@Kushana: nickm | 2006-12-29 00:51:42 -0500
Remove dead code; make targets of addressmap commands/configs use AllowNonRFC953Hostnames
svn:r9211
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/or/config.c b/src/or/config.c index 383ecc62f6..67c6140748 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2286,10 +2286,8 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->NatdPort == 0 && options->NatdListenAddress != NULL) REJECT("NatdPort must be defined if NatdListenAddress is defined."); -#if 0 /* don't complain, since a standard configuration does this! */ - if (options->SocksPort == 0 && options->SocksListenAddress != NULL) - REJECT("SocksPort must be defined if SocksListenAddress is defined."); -#endif + /* Don't gripe about SocksPort 0 with SocksListenAddress set; a standard + * configuration does this. */ for (i = 0; i < 3; ++i) { int is_socks = i==0; @@ -3090,10 +3088,7 @@ config_register_addressmaps(or_options_t *options) if (smartlist_len(elts) >= 2) { from = smartlist_get(elts,0); to = smartlist_get(elts,1); - if (!is_plausible_address(from)) { - log_warn(LD_CONFIG, - "Skipping invalid argument '%s' to MapAddress", from); - } else if (!is_plausible_address(to)) { + if (address_is_invalid_destination(to)) { log_warn(LD_CONFIG, "Skipping invalid argument '%s' to MapAddress", to); } else { |