Index: main/acl.c
===================================================================
--- main/acl.c	(revision 428416)
+++ main/acl.c	(revision 428417)
@@ -776,7 +776,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 */
Index: .
===================================================================
--- .	(revision 428416)
+++ .	(revision 428417)

Property changes on: .
___________________________________________________________________
Modified: branch-1.8-merged
## -1 +1 ##
-/branches/1.8:1-378147,378164,378356,378375,378427,378455-378456,378486,378514,378554,378591,378733,378776,378933,378967,379001,379145,379178,379226,379276,379310,379342,379392,379547,379608,379718,379825,379885,379963,380210,380254,380297,380347,380364,380451,380458,380520,380572,380611,380696,380853,380973,381216,381281,381364,381466,381668,381770,381847,381916,381939,381975,382021,382087,382107,382110,382171,382227,382233,382409,382513,382847,382939,382942,383061,383120,383124,383165,383340,383460,383667,383796,383835,383839,383863,384048,384118,384162,384325,384410,384544,384640,384685,385047,385170,385190,385402,385429,385551,385593,385633,385636,385683,385745,385916,386049,386109,386256,386483,386641,386672,386792,386877,386929,387036,387213,387294,387297,387312,387344,387421,387688,387875,388111,388376,388423,388425,388477,388529,388532,388596,388838,389244,389676,389895,390044,391062,391065,391107,391143,391215,391333,391489,391778,393627,393928,394106,394302,394640,394886,394896,394899,394940,394980,395032,396196,396240,396279,396427,396579,396582,396619,396656,396745,396958,396994,397033,397064,397106,397112,397156,397204,397256,397308,397377,397525,398018,398021,398060,398102,398167,398235,398301,398379,398416,398456,398523,398576,398648,398703,398748,398752,398757,398835,398880,398884,398937,398977,399033,399098,399158,399304,399351,399402,399456,399697,399794,399818,399939,400013,400073,400089,400137,401959,402000,402150,402224,402287,402468,402604,402645,402708,403014,403449,403634,403853,403862,403913,404081,404135,404212,404456,404603,404674,404742,404784,404857,404861,405033,405088,405090,405160,405433,405486,405581,405656,405791,405926,406037,406079,406170,406241,406359-406360,406417,406514,406566,406643,406721,406801,406860,406933,407041,407100,407205,407272,407337,407455,407511,407622,407678,407764,407817,407873,408020,408083,408142,408200,408328,408387,408447,408536,408589,408642,408646,408747,408785,408876,409001,409052,409077,409156,409207,409308,409361,409472,409521,409566,409623,409705,409777,409833,409916,410043,410105,410224,410308,410380,410710,410748,411021,411088,411189,411243,411313,411372,411399,411457,411462,411584,411715,411807,411960,411964,412114,412225,412328,412655,412744-412745,412764,412821,412922,413224,413241,413304,413396,413485,413586,413592,413714,413787,413832,413894,413991,414067,414152,414214,414269,414345,414401,414564,414620,414693,414813,414880,414997,415060,415132,415225,415359,415463,415521,415833,415841,415908,415998,416066,416150,416251,416336,416439,416500,416732,416929,417016,417248,417318,417480,417500,417587,417797,417956,418261,418504,418641,419129,419374,419440,419630,419684,419942,420146,420434,420654,420680,421059,421227,421232,421327,421442,421600,421717,421799,421976,422112,422293,422371,422376,422439,422584,422789,422900,423006,423066,423276,423349,423657,423720,423800,423915,423979,424176,424181,424786,424875,425068,425152,425286,425291,425296,425405,425547,425818,426140,426594,426599,426691,426830,426858,426926,426929,427023,427380,428331
\ No newline at end of property
+/branches/1.8:1-378147,378164,378356,378375,378427,378455-378456,378486,378514,378554,378591,378733,378776,378933,378967,379001,379145,379178,379226,379276,379310,379342,379392,379547,379608,379718,379825,379885,379963,380210,380254,380297,380347,380364,380451,380458,380520,380572,380611,380696,380853,380973,381216,381281,381364,381466,381668,381770,381847,381916,381939,381975,382021,382087,382107,382110,382171,382227,382233,382409,382513,382847,382939,382942,383061,383120,383124,383165,383340,383460,383667,383796,383835,383839,383863,384048,384118,384162,384325,384410,384544,384640,384685,385047,385170,385190,385402,385429,385551,385593,385633,385636,385683,385745,385916,386049,386109,386256,386483,386641,386672,386792,386877,386929,387036,387213,387294,387297,387312,387344,387421,387688,387875,388111,388376,388423,388425,388477,388529,388532,388596,388838,389244,389676,389895,390044,391062,391065,391107,391143,391215,391333,391489,391778,393627,393928,394106,394302,394640,394886,394896,394899,394940,394980,395032,396196,396240,396279,396427,396579,396582,396619,396656,396745,396958,396994,397033,397064,397106,397112,397156,397204,397256,397308,397377,397525,398018,398021,398060,398102,398167,398235,398301,398379,398416,398456,398523,398576,398648,398703,398748,398752,398757,398835,398880,398884,398937,398977,399033,399098,399158,399304,399351,399402,399456,399697,399794,399818,399939,400013,400073,400089,400137,401959,402000,402150,402224,402287,402468,402604,402645,402708,403014,403449,403634,403853,403862,403913,404081,404135,404212,404456,404603,404674,404742,404784,404857,404861,405033,405088,405090,405160,405433,405486,405581,405656,405791,405926,406037,406079,406170,406241,406359-406360,406417,406514,406566,406643,406721,406801,406860,406933,407041,407100,407205,407272,407337,407455,407511,407622,407678,407764,407817,407873,408020,408083,408142,408200,408328,408387,408447,408536,408589,408642,408646,408747,408785,408876,409001,409052,409077,409156,409207,409308,409361,409472,409521,409566,409623,409705,409777,409833,409916,410043,410105,410224,410308,410380,410710,410748,411021,411088,411189,411243,411313,411372,411399,411457,411462,411584,411715,411807,411960,411964,412114,412225,412328,412655,412744-412745,412764,412821,412922,413224,413241,413304,413396,413485,413586,413592,413714,413787,413832,413894,413991,414067,414152,414214,414269,414345,414401,414564,414620,414693,414813,414880,414997,415060,415132,415225,415359,415463,415521,415833,415841,415908,415998,416066,416150,416251,416336,416439,416500,416732,416929,417016,417248,417318,417480,417500,417587,417797,417956,418261,418504,418641,419129,419374,419440,419630,419684,419942,420146,420434,420654,420680,421059,421227,421232,421327,421442,421600,421717,421799,421976,422112,422293,422371,422376,422439,422584,422789,422900,423006,423066,423276,423349,423657,423720,423800,423915,423979,424176,424181,424786,424875,425068,425152,425286,425291,425296,425405,425547,425818,426140,426594,426599,426691,426830,426858,426926,426929,427023,427380,428331,428402
\ No newline at end of property