From 8ef6cdc39f047a7579858a6e23629c1c2718fc0a Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 4 Jan 2015 17:28:54 -0500 Subject: 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. --- src/or/or.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/or/or.h') 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 * AutomapHostsSuffixes, map it to a * virtual address. */ - smartlist_t *AutomapHostsSuffixes; /**< List of suffixes for - * AutomapHostsOnResolve. */ + /** List of suffixes for AutomapHostsOnResolve. 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 -- cgit v1.2.3-54-g00ecf