From: Alexander Marx <amarx@ipfire.org>
Date: Thu, 21 Mar 2013 06:34:05 +0000 (+0100)
Subject: Forward Firewall: fixed converter bug: Remark is "0" and Alias ip is taken as ip... 
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=54d6863787ca89d11e59efc1e9d345fd5b9a5eb9

Forward Firewall: fixed converter bug: Remark is "0" and Alias ip is taken as ip instead of name
---

diff --git a/config/forwardfw/convert-portfw b/config/forwardfw/convert-portfw
index 682199f00..8ec3c3438 100755
--- a/config/forwardfw/convert-portfw
+++ b/config/forwardfw/convert-portfw
@@ -85,14 +85,15 @@ sub build_rules
 		}else{
 			foreach my $ali (@alias){
 				my ($alias_ip,$alias_active,$alias_name) = split (",",$ali);
-				if($alias eq $alias_name){
+				if($alias eq $alias_ip){
+					chomp($alias_name);
 					$alias=$alias_name;
 				}
 			}
 		}
 		$active = uc $active;
 		$prot   = uc $prot;
-		$remark = chomp($remark);
+		chomp($remark);
 		push (@built_rules,"ACCEPT,NAT_DESTINATION,$active,$src,$src1,tgt_addr,$target/32,ON,$prot,,TGT_PORT,$targetport,$remark,00:00,00:00,ON,$alias,$ipfireport,dnat");
 		my $now=localtime;
 		print LOG "$now    Converted-> KEY: $count ACCEPT,NAT_DESTINATION,$active,$src,$src1,tgt_addr,$target/32,ON,$prot,,TGT_PORT,$targetport,$remark,00:00,00:00,ON,$alias,$ipfireport,dnat\n";