From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Thu, 20 Jan 2011 20:01:42 +0000 (+0100)
Subject: Fixed outgoing fw log messages in mode 1 and found a bug logging only
X-Git-Tag: v2.9-core45~1^2~27
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=e4e42008adb48a1c97fa4ec829fcb01c242b8c8f

Fixed outgoing fw log messages in mode 1 and found a bug logging only
active when using german language.
---

diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 6709ee603f..53462db483 100644
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-2010  IPFire Team                                        #
+# Copyright (C) 2007-2011  IPFire Team                                        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -25,6 +25,7 @@ use strict;
 #use warnings;
 
 require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
 
 my %outfwsettings = ();
 my %checked = ();
@@ -218,7 +219,13 @@ foreach $configentry (sort @configs)
 
 				$CMD = "$CMD -o $netsettings{'RED_DEV'}";
 
-				if ($configline[9] eq "aktiv") {
+				if ( $configline[9] eq $Lang::tr{'aktiv'} && $outfwsettings{'POLICY'} eq 'MODE1' ) {
+					if ($DEBUG) {
+						print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '\n";
+					} else {
+						system("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '");
+					}
+				} elsif ( $configline[9] eq $Lang::tr{'aktiv'} && $outfwsettings{'POLICY'} eq 'MODE2' ) {
 					if ($DEBUG) {
 						print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '\n";
 					} else {
diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files
index f6d15ca787..814baf3e4a 100644
--- a/config/rootfiles/core/45/filelists/files
+++ b/config/rootfiles/core/45/filelists/files
@@ -6,3 +6,4 @@ srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/sbin/updxlrator
+var/ipfire/outgoing/bin/outgoingfw.pl
diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh
index 1197905cd3..03c6cfbba9 100644
--- a/config/rootfiles/core/45/update.sh
+++ b/config/rootfiles/core/45/update.sh
@@ -37,6 +37,8 @@ extract_files
 #Start services
 echo Starting Proxy
 /etc/init.d/squid start 2>/dev/null
+echo Rewriting Outgoing FW Rules
+/var/ipfire/outgoing/bin/outgoingfw.pl
 
 #
 #Update Language cache