Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next

This commit is contained in:
Christian Schmidt
2011-07-06 19:30:11 +02:00
7 changed files with 9 additions and 7 deletions

View File

@@ -370,7 +370,7 @@ END
} else {
foreach my $line (@status) {
if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
($line =~/ $confighash{$key}[1]\{.*INSTALLED/ ))
($line =~/$confighash{$key}[1]\{.*INSTALLED/ ))
{
$active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
}

View File

@@ -1038,7 +1038,7 @@ sub disallowreserved
{
# port 67 and 68 same for tcp and udp, don't bother putting in an array
my $msg = "";
my @tcp_reserved = (81,222,444);
my @tcp_reserved = ();
my $prt = $_[0]; # the port or range
my $ryn = $_[1]; # tells us whether or not it is a port range
my $prot = $_[2]; # protocol

View File

@@ -2540,7 +2540,7 @@ END
my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
foreach my $line (@status) {
if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
($line =~ / $confighash{$key}[1]\{.*INSTALLED/))
($line =~ /$confighash{$key}[1]\{.*INSTALLED/))
{
$active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
}