diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-04 17:28:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-04 17:28:54 -0500 |
| commit | 8ef6cdc39f047a7579858a6e23629c1c2718fc0a (patch) | |
| tree | 57c354fe35b3f1055af1459955a939be582ea845 /src/or/or.h | |
| parent | 0872d8e3cf3281fc5831375252db9e39de12e927 (diff) | |
| download | tor-8ef6cdc39f047a7579858a6e23629c1c2718fc0a.tar.gz tor-8ef6cdc39f047a7579858a6e23629c1c2718fc0a.zip | |
Prevent changes to other options from removing . from AutomapHostsSuffixes
This happened because we changed AutomapHostsSuffixes to replace "."
with "", since a suffix of "" means "match everything." But our
option handling code for CSV options likes to remove empty entries
when it re-parses stuff.
Instead, let "." remain ".", and treat it specially when we're
checking for a match.
Fixes bug 12509; bugfix on 0.2.0.1-alpha.
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h index 1609587717..66d10ac436 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3646,8 +3646,9 @@ typedef struct { * hostname ending with one of the suffixes in * <b>AutomapHostsSuffixes</b>, map it to a * virtual address. */ - smartlist_t *AutomapHostsSuffixes; /**< List of suffixes for - * <b>AutomapHostsOnResolve</b>. */ + /** List of suffixes for <b>AutomapHostsOnResolve</b>. The special value + * "." means "match everything." */ + smartlist_t *AutomapHostsSuffixes; int RendPostPeriod; /**< How often do we post each rendezvous service * descriptor? Remember to publish them independently. */ int KeepalivePeriod; /**< How often do we send padding cells to keep |