aboutsummaryrefslogtreecommitdiff
path: root/src/or/policies.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2012-01-16 21:20:46 -0500
committerRoger Dingledine <arma@torproject.org>2012-01-16 21:20:46 -0500
commit1e923dd2fbdc0834b8fb3ba97b658f15a6d5f6b4 (patch)
treed66295a529c4cd6ad398329cd2e9ae59f36ce4ae /src/or/policies.c
parent47aa491f9fbae38f71f96f50c4aec3f871c8419d (diff)
downloadtor-1e923dd2fbdc0834b8fb3ba97b658f15a6d5f6b4.tar
tor-1e923dd2fbdc0834b8fb3ba97b658f15a6d5f6b4.tar.gz
fix crash bug in original feature4207 branch
PLURAL() assumes that the plural is the canonical name for the option, so now it is.
Diffstat (limited to 'src/or/policies.c')
-rw-r--r--src/or/policies.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/policies.c b/src/or/policies.c
index 53cdf4840..6ae5171d8 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -336,7 +336,7 @@ authdir_policy_permits_address(uint32_t addr, uint16_t port)
{
if (! addr_policy_permits_address(addr, port, authdir_reject_policy))
return 0;
- return !addr_is_in_cc_list(addr, get_options()->AuthDirRejectCC);
+ return !addr_is_in_cc_list(addr, get_options()->AuthDirRejectCCs);
}
/** Return 1 if <b>addr</b>:<b>port</b> is considered valid in our
@@ -347,7 +347,7 @@ authdir_policy_valid_address(uint32_t addr, uint16_t port)
{
if (! addr_policy_permits_address(addr, port, authdir_invalid_policy))
return 0;
- return !addr_is_in_cc_list(addr, get_options()->AuthDirInvalidCC);
+ return !addr_is_in_cc_list(addr, get_options()->AuthDirInvalidCCs);
}
/** Return 1 if <b>addr</b>:<b>port</b> should be marked as a bad dir,
@@ -358,7 +358,7 @@ authdir_policy_baddir_address(uint32_t addr, uint16_t port)
{
if (! addr_policy_permits_address(addr, port, authdir_baddir_policy))
return 1;
- return addr_is_in_cc_list(addr, get_options()->AuthDirBadDirCC);
+ return addr_is_in_cc_list(addr, get_options()->AuthDirBadDirCCs);
}
/** Return 1 if <b>addr</b>:<b>port</b> should be marked as a bad exit,
@@ -369,7 +369,7 @@ authdir_policy_badexit_address(uint32_t addr, uint16_t port)
{
if (! addr_policy_permits_address(addr, port, authdir_badexit_policy))
return 1;
- return addr_is_in_cc_list(addr, get_options()->AuthDirBadExitCC);
+ return addr_is_in_cc_list(addr, get_options()->AuthDirBadExitCCs);
}
#define REJECT(arg) \