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 3229f745e17f94ff7e739c6ec34e06d35ea786e0..b7af7c9c0e72655397a2534d3df7eb6ab95ef63b 100644 (file)
--- 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 c2888c39a7ec8d408ef339f23e7825acdc042e01..466a3cec7a95bda83f5b4a4fc823d1c6cb374c50 100644 (file)
--- 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;