[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc21b588df77bfc807720c1456f901614e98e382

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc21b588df77bfc807720c1456f901614e98e382

[git]

[-- Attachment #1: Type: text/plain, Size: 3016 bytes --]

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, next has been updated
       via  cc21b588df77bfc807720c1456f901614e98e382 (commit)
       via  bcf1a62476de2dc720426aafe1e893f06608b9d5 (commit)
       via  29201ca84b722e08aaaf6b6dee0b622bf393f143 (commit)
      from  317638e7534c995fd3866467fab17b057e28f76a (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 cc21b588df77bfc807720c1456f901614e98e382
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Feb 20 13:03:28 2014 +0100

    firewall: Remove rule that allows access to everything.

commit bcf1a62476de2dc720426aafe1e893f06608b9d5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Feb 20 13:01:48 2014 +0100

    firewall: Fix proper check for BLUE and ORANGE devices.

commit 29201ca84b722e08aaaf6b6dee0b622bf393f143
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Feb 20 13:01:36 2014 +0100

    firewall: Remove redundant rule.

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

Summary of changes:
 config/firewall/firewall-policy | 4 ++--
 config/firewall/rules.pl        | 1 -
 src/initscripts/init.d/firewall | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/firewall/firewall-policy b/config/firewall/firewall-policy
index 773e5ce..bd1e40d 100755
--- a/config/firewall/firewall-policy
+++ b/config/firewall/firewall-policy
@@ -41,10 +41,10 @@ HAVE_ORANGE="false"
 
 case "${CONFIG_TYPE}" in
 	2)
-		HAVE_BLUE="true"
+		HAVE_ORANGE="true"
 		;;
 	3)
-		HAVE_ORANGE="true"
+		HAVE_BLUE="true"
 		;;
 	4)
 		HAVE_BLUE="true"
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index 09e8ae6..377483e 100755
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -111,7 +111,6 @@ if($param eq 'flush'){
 			system ("/usr/sbin/firewall-policy");
 		}elsif($fwdfwsettings{'POLICY'} eq 'MODE2'){
 			&p2pblock;
-			system ("iptables --wait -A $CHAIN -m conntrack --ctstate NEW -j ACCEPT");
 			system ("/usr/sbin/firewall-policy");
 			system ("/etc/sysconfig/firewall.local reload");
 		}
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 4c9d875..2b3b91c 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -238,7 +238,6 @@ iptables_init() {
 	if [ "$DROPFORWARD" == "on" ]; then
 		iptables -A FORWARD -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD"
 	fi
-	iptables -A FORWARD -j DROP -m comment --comment "DROP_FORWARD"
 }
 
 iptables_red() {


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