[asterisk-commits] bebuild: tag 12.7.1 r428428 - in /tags/12.7.1: ./ ChangeLog main/acl.c

[SVN commits to the Asterisk project]

Author: bebuild
Date: Thu Nov 20 10:41:19 2014
New Revision: 428428

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=428428
Log:
Merge r428422 for AST-2014-012

Modified:
    tags/12.7.1/   (props changed)
    tags/12.7.1/ChangeLog
    tags/12.7.1/main/acl.c

Propchange: tags/12.7.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 20 10:41:19 2014
@@ -1,1 +1,1 @@
-/branches/12:427382
+/branches/12:427382,428422

Modified: tags/12.7.1/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/12.7.1/ChangeLog?view=diff&rev=428428&r1=428427&r2=428428
==============================================================================
--- tags/12.7.1/ChangeLog (original)
+++ tags/12.7.1/ChangeLog Thu Nov 20 10:41:19 2014
@@ -1,3 +1,16 @@
+2014-11-20  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 12.7.1 Released.
+
+	* AST-2014-012: Fix error with mixed address family ACLs.
+
+	  Prior to this commit, the address family of the first item in an ACL
+	  was used to compare all incoming traffic. This could lead to traffic
+	  of other IP address families bypassing ACLs.
+
+	  ASTERISK-24469 #close
+	  Reported by Matt Jordan
+
 2014-11-10  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 12.7.0 Released.

Modified: tags/12.7.1/main/acl.c
URL: http://svnview.digium.com/svn/asterisk/tags/12.7.1/main/acl.c?view=diff&rev=428428&r1=428427&r2=428428
==============================================================================
--- tags/12.7.1/main/acl.c (original)
+++ tags/12.7.1/main/acl.c Thu Nov 20 10:41:19 2014
@@ -743,7 +743,7 @@
 		ast_copy_string(iabuf2, ast_inet_ntoa(ha->netaddr), sizeof(iabuf2));
 		ast_debug(1, "##### Testing %s with %s\n", iabuf, iabuf2);
 #endif
-		if (ast_sockaddr_is_ipv4(&ha->addr)) {
+		if (ast_sockaddr_is_ipv4(&current_ha->addr)) {
 			if (ast_sockaddr_is_ipv6(addr)) {
 				if (ast_sockaddr_is_ipv4_mapped(addr)) {
 					/* IPv4 ACLs apply to IPv4-mapped addresses */