[asterisk-commits] kpfleming: trunk r45126 - in /trunk: ./ main/acl.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Fri Oct 13 18:03:36 2006
New Revision: 45126

URL: http://svn.digium.com/view/asterisk?rev=45126&view=rev
Log:
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)

------------------------------------------------------------------------

........

Modified:
    trunk/   (props changed)
    trunk/main/acl.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/acl.c
URL: http://svn.digium.com/view/asterisk/trunk/main/acl.c?rev=45126&r1=45125&r2=45126&view=diff
==============================================================================
--- trunk/main/acl.c (original)
+++ trunk/main/acl.c Fri Oct 13 18:03:36 2006
@@ -173,12 +173,12 @@
 		} 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)) {