From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 26 Sep 2014 10:55:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'amarx/firewall-dnat' into next
X-Git-Tag: v2.15-core84~8^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df6649b0feb13d5a08bdcff7bb1eb65b538b23ca;p=ipfire-2.x.git

Merge remote-tracking branch 'amarx/firewall-dnat' into next

Conflicts:
	config/firewall/rules.pl
---

df6649b0feb13d5a08bdcff7bb1eb65b538b23ca
diff --cc config/firewall/rules.pl
index aa8870cdc4,887c052657..e0f69554e8
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@@ -291,22 -291,22 +291,24 @@@ sub buildrules 
  
  			foreach my $src (@sources) {
  				# Skip invalid source.
 -				next unless (@$src[0]);
 +				next unless (defined $src);
 +				next unless ($src);
  
  				# Sanitize source.
- 				my $source = $src;
+ 				my $source = @$src[0];
  				if ($source ~~ @ANY_ADDRESSES) {
  					$source = "";
  				}
  
+ 				my $source_intf = @$src[1];
+ 
  				foreach my $dst (@destinations) {
  					# Skip invalid rules.
 -					next if (!@$dst[0] || (@$dst[0] eq "none"));
 +					next unless (defined $dst);
 +					next if (!$dst || ($dst eq "none"));
  
  					# Sanitize destination.
- 					my $destination = $dst;
+ 					my $destination = @$dst[0];
  					if ($destination ~~ @ANY_ADDRESSES) {
  						$destination = "";
  					}