From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 27 Feb 2014 12:14:02 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=c9cd26f2000a0f2218defca31faf6652740f9617;hp=906d293b05874db62532b35b10e3fe2b8784c361

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
---

diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index 2589ac62b..d8adb156b 100755
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -258,10 +258,6 @@ sub buildrules
 					$PROT="-p $PROT" if ($PROT ne '' && $PROT ne ' ');
 					foreach my $a (sort keys %sourcehash){
 						foreach my $b (sort keys %targethash){
-							if(! $sourcehash{$a}[0] || ! $targethash{$b}[0] || ($natip eq '-d ' && $$hash{$key}[28] eq 'ON') || (!$natip && $$hash{$key}[28] eq 'ON')){
-								#Skip rules when no RED IP is set (DHCP,DSL)
-								next;
-							}
 							next if ($targethash{$b}[0] eq 'none');
 							$STAG='';
 							if ($sourcehash{$a}[0] ne $targethash{$b}[0] && $targethash{$b}[0] ne 'none' || $sourcehash{$a}[0] eq '0.0.0.0/0.0.0.0'){
@@ -346,10 +342,6 @@ sub buildrules
 					}
 					foreach my $a (sort keys %sourcehash){
 						foreach my $b (sort keys %targethash){
-							if(! $sourcehash{$a}[0] || ! $targethash{$b}[0] || $natip eq '-d ' || !$natip){
-								#Skip rules when no RED IP is set (DHCP,DSL)
-								next;
-							}
 							next if ($targethash{$b}[0] eq 'none');
 							$STAG='';
 							if ($sourcehash{$a}[0] ne $targethash{$b}[0] && $targethash{$b}[0] ne 'none' || $sourcehash{$a}[0] eq '0.0.0.0/0.0.0.0'){
@@ -565,7 +557,7 @@ sub get_address
 			$$hash{$key}[0]='0.0.0.0/0';
 		}
 		if($base2 eq 'RED' || $base2 eq 'RED1'){
-			open(FILE, "/var/ipfire/red/local-ipaddress");
+			open(FILE, "/var/ipfire/red/local-ipaddress")or die "Couldn't open local-ipaddress";
 			$$hash{$key}[0]= <FILE>;
 			close(FILE);
 		}else{
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 2c280f2ba..06a714a32 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -283,7 +283,7 @@ iptables_red() {
 	fi
 
 	# Reload all rules.
-	firewallctrl
+	/usr/local/bin/firewallctrl
 }
 
 # See how we were called.