From aa8647835d948bf7261fb49ba26054b8789b61d8 Mon Sep 17 00:00:00 2001
From: Alexander Marx <amarx@ipfire.org>
Date: Mon, 18 Feb 2013 10:41:19 +0100
Subject: [PATCH] Forward Firewall: Finalize integration of OUTGOING into
 firewall

---
 config/forwardfw/firewall-policy | 2 +-
 html/cgi-bin/forwardfw.cgi       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/forwardfw/firewall-policy b/config/forwardfw/firewall-policy
index e96278a16..90d8065aa 100755
--- a/config/forwardfw/firewall-policy
+++ b/config/forwardfw/firewall-policy
@@ -22,7 +22,7 @@ if [ "$POLICY" == "MODE1" ]; then
 		fi
 fi
 if [ "$POLICY1" == "MODE1" ]; then
-	/sbin/iptables -A OUTGOINGFW -m state --state ESTABLISHED,RELATED -j ACCEPT
+	/sbin/iptables -I OUTGOINGFW 1 -m state --state ESTABLISHED,RELATED -j ACCEPT
 		if [ "$FWPOLICY1" == "REJECT" ]; then
 			if [ "$DROPOUTGOING" == "on" ]; then
 				/sbin/iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "REJECT_OUTPUT"
diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index 460a08c4c..86fed83b9 100755
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -198,7 +198,7 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
 		#print"ALT: $fwdfwsettings{'oldgrp2a'} $fwdfwsettings{'oldgrp2b'}	NEU:	$fwdfwsettings{'grp2'} $fwdfwsettings{$fwdfwsettings{'grp2'}}<br>";
 		#print"ALT: $fwdfwsettings{'oldgrp3a'} $fwdfwsettings{'oldgrp3b'}	NEU:	$fwdfwsettings{'grp3'} $fwdfwsettings{$fwdfwsettings{'grp3'}}<br>";
 		#print"DIENSTE Checkalt:$fwdfwsettings{'oldusesrv'}  DIENSTE Checkneu:$fwdfwsettings{'USESRV'}    DIENST ALT:$fwdfwsettings{'oldgrp3a'},$fwdfwsettings{'oldgrp3b'}   DIENST NEU:$fwdfwsettings{'grp3'},$fwdfwsettings{$fwdfwsettings{'grp3'}}<br>";
-	}elsif($fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'IPFire'){
+	}elsif($fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'IPFire' ){
 		# OUTGOING PART
 		$fwdfwsettings{'config'}=$configoutgoing;
 		$fwdfwsettings{'chain'} = 'OUTGOINGFW';
-- 
2.39.2