From: Alexander Marx <amarx@ipfire.org>
Date: Wed, 17 Apr 2013 10:02:13 +0000 (+0200)
Subject: Forward Firewall: 0.9.9.4a - Bugfix typo in firewallscript, DMZ Link on startpage... 
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=dc82656bf97fef330f5f34ee237426fb53d86708

Forward Firewall: 0.9.9.4a - Bugfix typo in firewallscript, DMZ Link on startpage now leads to firewall instead of dmzpinholes
---

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index 7bd3fa52f..ef9264cb1 100755
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -77,7 +77,7 @@ my %aliases=();
 my %optionsfw=();
 my %ifaces=();
 
-my $VERSION='0.9.9.4';
+my $VERSION='0.9.9.4a';
 my $color;
 my $confignet		= "${General::swroot}/fwhosts/customnetworks";
 my $confighost		= "${General::swroot}/fwhosts/customhosts";
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index ea19e26f5..03ef36746 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -341,7 +341,7 @@ END
 		}	else { print $Lang::tr{'advproxy off'};  }
 	}
 	if ( $netsettings{'ORANGE_DEV'} ) { print <<END;
-		<tr><td align='center' bgcolor='$Header::colourorange' width='25%'><a href="/cgi-bin/dmzholes.cgi"><font size='2' color='white'><b>$Lang::tr{'dmz'}</b></font></a><br>
+		<tr><td align='center' bgcolor='$Header::colourorange' width='25%'><a href="/cgi-bin/forwardfw.cgi"><font size='2' color='white'><b>$Lang::tr{'dmz'}</b></font></a><br>
 	  	<td width='30%' align='center'>$netsettings{'ORANGE_ADDRESS'}
   		<td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
 END
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 0888145e2..df8405b52 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -120,8 +120,8 @@ iptables_red() {
 		fi
 
 		# Outgoing masquerading (don't masqerade IPSEC (mark 50))
-		#/sbin/iptables -t nat -A REDNAT -m mark --mark 50 -o $IFACE -j RETURN
-		#/sbin/iptables -t nat -A REDNAT -o $IFACE -j MASQUERADE
+		/sbin/iptables -t nat -A REDNAT -m mark --mark 50 -o $IFACE -j RETURN
+		/sbin/iptables -t nat -A REDNAT -o $IFACE -j MASQUERADE
 
 	fi
 }