[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0ba66e9293e106469894d84268b997a67f71e105

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0ba66e9293e106469894d84268b997a67f71e105

[git]

[-- Attachment #1: Type: text/plain, Size: 1528 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, next has been updated
       via  0ba66e9293e106469894d84268b997a67f71e105 (commit)
      from  fa8229546b11ac356ff1df733a0b17eb045559ee (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 0ba66e9293e106469894d84268b997a67f71e105
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Mar 4 14:26:55 2014 +0100

    firewall: Don't colourise MAC addresses.
    
    Fixes #10491.

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

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

Difference in files:
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 7b75765..9f960b4 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1286,6 +1286,12 @@ sub getcolor
 	my $val=shift;
 	my $hash=shift;
 	if($optionsfw{'SHOWCOLORS'} eq 'on'){
+		# Don't colourise MAC addresses
+		if (&General::validmac($val)) {
+			$tdcolor = "";
+			return;
+		}
+
 		#custom Hosts
 		if ($nettype eq 'cust_host_src' || $nettype eq 'cust_host_tgt'){
 			foreach my $key (sort keys %$hash){


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