From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 26 Jan 2011 16:43:18 +0000 (+0100)
Subject: Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.9-core45~1^2~5
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=0cb985d8fc753e7875695f8ac66f9c9db1462636;hp=93dc8835c399eba647112e6d85daf545d8181782

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
---

diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh
index 3229f745e1..b7af7c9c0e 100644
--- a/config/rootfiles/core/45/update.sh
+++ b/config/rootfiles/core/45/update.sh
@@ -54,7 +54,7 @@ echo Starting Proxy
 /etc/init.d/squid start 2>/dev/null
 echo Rewriting Outgoing FW Rules
 /var/ipfire/outgoing/bin/outgoingfw.pl
-if [ `grep "ENABLED=on" /var/ipfire/vpn/setting` ]; then
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
 	echo Starting vpn-watch
 	/usr/local/bin/vpn-watch &
 fi
diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat
index c2888c39a7..466a3cec7a 100644
--- a/html/cgi-bin/logs.cgi/firewalllog.dat
+++ b/html/cgi-bin/logs.cgi/firewalllog.dat
@@ -333,7 +333,7 @@ foreach $_ (@log)
         my $comment = $3; 
         my $packet = $4;
 
-        $packet =~ /IN=(\w+)/;       my $iface=$1; if ( $1 $1 =~ /2./ ){ $iface="";}
+        $packet =~ /IN=(\w+)/;       my $iface=$1; if ( $1 =~ /2./ ){ $iface="";}
         $packet =~ /SRC=([\d\.]+)/;  my $srcaddr=$1;
         $packet =~ /DST=([\d\.]+)/;  my $dstaddr=$1;
         $packet =~ /MAC=([\w+\:]+)/; my $macaddr=$1;