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, master has been updated via e4e42008adb48a1c97fa4ec829fcb01c242b8c8f (commit) from d846fee0378b8c7e56229d69d47ec0008c45309c (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 e4e42008adb48a1c97fa4ec829fcb01c242b8c8f Author: Christian Schmidt maniacikarus@ipfire.org Date: Thu Jan 20 21:01:42 2011 +0100

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

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

Summary of changes: config/outgoingfw/outgoingfw.pl | 11 +++++++++-- config/rootfiles/core/45/filelists/files | 1 + config/rootfiles/core/45/update.sh | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index 6709ee6..53462db 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 f6d15ca..814baf3 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 1197905..03c6cfb 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

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