diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-10-13 23:03:36 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-10-13 23:03:36 +0000 |
| commit | dc3ddc165b69f245b7d5bbb477e03d97b1619017 (patch) | |
| tree | c31ea98adad8bb620b3be839b042fdb6486dba31 | |
| parent | 1e3c5bc5baef2ad9c59fffb2b94a409064b215f5 (diff) | |
Merged revisions 45125 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r45125 | kpfleming | 2006-10-13 18:02:48 -0500 (Fri, 13 Oct 2006) | 7 lines
------------------------------------------------------------------------
r45119 | kpfleming | 2006-10-13 17:57:42 -0500 (Fri, 13 Oct 2006) | 2 lines
don't drop the entire permit/deny list when an attempt is made to add an invalid entry (BE-92)
------------------------------------------------------------------------
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | main/acl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/acl.c b/main/acl.c index 5d467c6e2..7e50d1f9d 100644 --- a/main/acl.c +++ b/main/acl.c @@ -173,12 +173,12 @@ struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path) } else if (!inet_aton(nm, &ha->netmask)) { ast_log(LOG_WARNING, "%s is not a valid netmask\n", nm); free(ha); - return path; + return ret; } if (!inet_aton(tmp, &ha->netaddr)) { ast_log(LOG_WARNING, "%s is not a valid IP\n", tmp); free(ha); - return path; + return ret; } ha->netaddr.s_addr &= ha->netmask.s_addr; if (!strncasecmp(sense, "p", 1)) { |