diff options
| author | Robert Hogan <robert@roberthogan.net> | 2010-12-27 17:35:16 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:08:10 -0500 |
| commit | 53ce6bb52d29e80c7efd29b8604bdd680c9515ea (patch) | |
| tree | 2e0f5c939c8e13549ea51e00980916ab828799e8 /src/or/connection_edge.c | |
| parent | 909e9769ece9e89ad0c4bbb558a6f8247c6a62bd (diff) | |
| download | tor-53ce6bb52d29e80c7efd29b8604bdd680c9515ea.tar.gz tor-53ce6bb52d29e80c7efd29b8604bdd680c9515ea.zip | |
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:8
1. Only allow '*.' in MapAddress expressions. Ignore '*ample.com' and '.example.com'.
This has resulted in a slight refactoring of config_register_addressmaps.
2. Add some more detail to the man page entry for AddressMap.
3. Fix initialization of a pointer to NULL rather than 0.
4. Update the unit tests to cater for the changes in 1 and test more explicitly for
recursive mapping.
Diffstat (limited to 'src/or/connection_edge.c')
| -rw-r--r-- | src/or/connection_edge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 2c8c9da259..284b320452 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1052,7 +1052,7 @@ addressmap_match_superdomains(char *address) const char *key; void *_val; addressmap_entry_t *val; - char *matched_domains = 0; + char *matched_domains = NULL; for (iter = strmap_iter_init(addressmap); !strmap_iter_done(iter); ) { strmap_iter_get(iter, &key, &_val); |