[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 95e9415ada2cd29399eec02c2748ca22792ec0a4

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 95e9415ada2cd29399eec02c2748ca22792ec0a4

[git]

[-- Attachment #1: Type: text/plain, Size: 1522 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, fifteen has been updated
       via  95e9415ada2cd29399eec02c2748ca22792ec0a4 (commit)
      from  73cb6627fc3d44ecade787f3fd80cc91d53a42f8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 95e9415ada2cd29399eec02c2748ca22792ec0a4
Author: Alexander Marx <amarx(a)ipfire.org>
Date:   Mon Jan 6 13:23:48 2014 +0100

    firewall: Fix colouring when IPsec VPN subnets are denoted in CIDR.

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

Summary of changes:
 html/cgi-bin/firewall.cgi | 1 +
 1 file changed, 1 insertion(+)

Difference in files:
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index b313d4b..e7884ca 100755
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1351,6 +1351,7 @@ sub getcolor
 			#Check if IP is part of a IPsec N2N network
 			foreach my $key (sort keys %ipsecconf){
 				my ($a,$b) = split("/",$ipsecconf{$key}[11]);
+				$b=&General::iporsubtodec($b);
 				if (&General::IpInSubnet($c,$a,$b)){
 					$tdcolor="style='background-color: $Header::colourvpn;color:white;'";
 					return;


hooks/post-receive
--
IPFire 2.x development tree