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

diff --git a/main/acl.c b/main/acl.c
index 5d467c6..7e50d1f 100644 (file)
--- 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)) {