diff options
author | Nick Mathewson <nickm@torproject.org> | 2010-07-31 13:16:48 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2010-07-31 13:16:48 -0400 |
commit | 39378bf1829dc9f5c9a1172442dcb8b9864ec25c (patch) | |
tree | c2ad094334f785b69d1c753cb8642421a0a7fd65 /changes | |
parent | 15424bf800a56007d802db3a9d3fe40fbdf2bee5 (diff) | |
download | tor-39378bf1829dc9f5c9a1172442dcb8b9864ec25c.tar tor-39378bf1829dc9f5c9a1172442dcb8b9864ec25c.tar.gz |
Warn when encounter the same (non-list) option twice in the same place
It's okay to get (say) a SocksPort line in the torrc, and then a
SocksPort on the command line to override it, and then a SocksPort via
a controller to override *that*. But if there are two occurrences of
SocksPort in the torrc, or on the command line, or in a single SETCONF
command, then the user is likely confused. Our old code would not
help unconfuse the user, but would instead silently ignore all but
the last occurrence.
This patch changes the behavior so that if the some option is passed
more than once to any torrc, command line, or SETCONF (each of which
coincidentally corresponds to a call to config_assign()), and the
option is not a type that allows multiple occurrences (LINELIST or
LINELIST_X), then we can warn the user.
This closes trac entry 1384.
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug1384 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug1384 b/changes/bug1384 new file mode 100644 index 000000000..d3da65d45 --- /dev/null +++ b/changes/bug1384 @@ -0,0 +1,5 @@ + o Minor features: + - Warn when the same option is provided more then once in a torrc file, + on the command line, or in a single SETCONF statement, and option + is one that only accepts a single value. + |