summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-04-02 22:06:46 +0000
committerNick Mathewson <nickm@torproject.org>2004-04-02 22:06:46 +0000
commit4cb21bab4811090ca7f39bd422eed5184c58e5bf (patch)
tree53497d28270b19db7cabf1c9388de85397f50602 /src/or/config.c
parenta981c4099af25e8e38ca1fbe4870d09c54d0d20b (diff)
downloadtor-4cb21bab4811090ca7f39bd422eed5184c58e5bf.tar.gz
tor-4cb21bab4811090ca7f39bd422eed5184c58e5bf.zip
Make preferred/excluded intro points configurable
svn:r1440
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index e5e5fc9c8e..ad121d3ccc 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -215,8 +215,10 @@ static int config_assign(or_options_t *options, struct config_line_t *list) {
config_compare(list, "User", CONFIG_TYPE_STRING, &options->User) ||
config_compare(list, "RunTesting", CONFIG_TYPE_BOOL, &options->RunTesting) ||
- config_compare(list, "HiddenServiceDir", CONFIG_TYPE_LINELIST, &options->RendConfigLines) ||
- config_compare(list, "HiddenServicePort", CONFIG_TYPE_LINELIST, &options->RendConfigLines)
+ config_compare(list, "HiddenServiceDir", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
+ config_compare(list, "HiddenServicePort", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
+ config_compare(list, "HiddenServiceNodes", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
+ config_compare(list, "HiddenServiceExcludeNodes", CONFIG_TYPE_LINELIST, &options->RendConfigLines)
) {
/* then we're ok. it matched something. */
} else {