diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-08 18:02:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-13 12:41:15 -0500 |
| commit | 9d0fab9872807ef212fadb3feb299cf6309a185f (patch) | |
| tree | e7dcafceb46a841cfe1fe67da22b747ebe3aa675 /src/test/test_config.c | |
| parent | ab6bd78eca0f3edc7ed910d8567c409fe3dfdd92 (diff) | |
| download | tor-9d0fab9872807ef212fadb3feb299cf6309a185f.tar.gz tor-9d0fab9872807ef212fadb3feb299cf6309a185f.zip | |
Allow MapAddress and Automap to work together
The trick here is to apply mapaddress first, and only then apply
automapping. Otherwise, the automap checks don't get done.
Fix for bug 7555; bugfix on all versions of Tor supporting both
MapAddress and AutoMap.
Diffstat (limited to 'src/test/test_config.c')
| -rw-r--r-- | src/test/test_config.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/test/test_config.c b/src/test/test_config.c index fb8e4020dc..b1f5017b78 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -51,8 +51,7 @@ test_config_addressmap(void *arg) /* Use old interface for now, so we don't need to rewrite the unit tests */ #define addressmap_rewrite(a,s,eo,ao) \ - addressmap_rewrite((a),(s),AMR_FLAG_USE_IPV4_DNS|AMR_FLAG_USE_IPV6_DNS, \ - (eo),(ao)) + addressmap_rewrite((a),(s), ~0, (eo),(ao)) /* MapAddress .invalidwildcard.com .torserver.exit - no match */ strlcpy(address, "www.invalidwildcard.com", sizeof(address)); |