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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 3820 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  c9cd26f2000a0f2218defca31faf6652740f9617 (commit)
       via  55a5bcae74bfd12cd5610508e4cd77d08970399e (commit)
       via  a8d1d049c6b152b5dc8aa3184abfcaa46203ee8f (commit)
      from  906d293b05874db62532b35b10e3fe2b8784c361 (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 c9cd26f2000a0f2218defca31faf6652740f9617
Merge: 55a5bca 906d293
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Feb 27 13:14:02 2014 +0100

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

commit 55a5bcae74bfd12cd5610508e4cd77d08970399e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Feb 26 20:03:32 2014 +0100

    firewall: Call firewallctrl with full path.

commit a8d1d049c6b152b5dc8aa3184abfcaa46203ee8f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Feb 26 20:02:24 2014 +0100

    Revert "Firewall: Fix errormessages on rulecreation when red has no IP"
    
    This reverts commit f942937c29ca76a7f153fc16ea13157eb4cf05cc.
    
    This completely destroys external access rules and is therefore
    reverted.

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

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

Difference in files:
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index 2589ac6..d8adb15 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 2c280f2..06a714a 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.


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