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

[SVN commits to the Asterisk project]

Author: bebuild
Date: Thu Nov 20 10:36:52 2014
New Revision: 428424

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

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

Propchange: tags/1.8.32.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 20 10:36:52 2014
@@ -1,2 +1,2 @@
-/branches/1.8:427380
+/branches/1.8:427380,428402
 /trunk:394552,394567

Modified: tags/1.8.32.1/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.32.1/ChangeLog?view=diff&rev=428424&r1=428423&r2=428424
==============================================================================
--- tags/1.8.32.1/ChangeLog (original)
+++ tags/1.8.32.1/ChangeLog Thu Nov 20 10:36:52 2014
@@ -1,3 +1,16 @@
+2014-11-20  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 1.8.32.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 1.8.32.0 Released.

Modified: tags/1.8.32.1/main/acl.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.32.1/main/acl.c?view=diff&rev=428424&r1=428423&r2=428424
==============================================================================
--- tags/1.8.32.1/main/acl.c (original)
+++ tags/1.8.32.1/main/acl.c Thu Nov 20 10:36:52 2014
@@ -533,7 +533,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 */