diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-25 22:42:19 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-25 22:42:19 +0000 |
| commit | ae1e5ae83a3a0a654e89b62032373d550ff5e4da (patch) | |
| tree | d43a496956ad84527aee8375af805ec4f5b88393 | |
| parent | a73d0af7304079be4992873407d58b1684801fc4 (diff) | |
Merged revisions 248946 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r248946 | mmichelson | 2010-02-25 16:41:48 -0600 (Thu, 25 Feb 2010) | 5 lines
Fix incorrect ACL behavior when CIDR notation of "/0" is used.
AST-2010-003
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@248947 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/acl.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/main/acl.c b/main/acl.c index e70b122af..bfb944488 100644 --- a/main/acl.c +++ b/main/acl.c @@ -292,7 +292,14 @@ struct ast_ha *ast_append_ha(const char *sense, const char *stuff, struct ast_ha if (!strchr(nm, '.')) { if ((sscanf(nm, "%30d", &x) == 1) && (x >= 0) && (x <= 32)) - ha->netmask.s_addr = htonl(0xFFFFFFFF << (32 - x)); + if (x == 0) { + /* This is special-cased to prevent unpredictable + * behavior of shifting left 32 bits + */ + ha->netmask.s_addr = 0; + } else { + ha->netmask.s_addr = htonl(0xFFFFFFFF << (32 - x)); + } else { ast_log(LOG_WARNING, "Invalid CIDR in %s\n", stuff); ast_free(ha); |