X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fforwardfw%2Fconvert-dmz;fp=config%2Fforwardfw%2Fconvert-dmz;h=81d77bab735f71df5afd5e74a12a8e1b6cc2ca7e;hp=639cef374dcb1504a3761bb684526d128ee45ad0;hb=f7e649ddfbd915136ae5acdad388d0b517e5ea85;hpb=a60dbb4b6aef3c4753f3206812ff80d34235e066

diff --git a/config/forwardfw/convert-dmz b/config/forwardfw/convert-dmz
index 639cef374..81d77bab7 100755
--- a/config/forwardfw/convert-dmz
+++ b/config/forwardfw/convert-dmz
@@ -49,8 +49,8 @@ sub process_rules{
 		my $now=localtime;
 		#get values from old configfile
 		my ($a,$b,$c,$d,$e,$f,$g,$h) = split (",",$line);
-		$h =~ s/\s//gi;
-		print LOG "$Now Processing A: $a   B: $b   C: $c   D: $d   E: $e   F: $f   G: $g   H: $h\n";
+		$h =~ s/\s*\n//gi;
+		print LOG "$now Processing A: $a   B: $b   C: $c   D: $d   E: $e   F: $f   G: $g   H: $h\n";
 		#Now convert values and check ip addresses
 		$a=uc($a);
 		$e=uc($e);
@@ -99,11 +99,11 @@ sub process_rules{
 				$field5='tgt_addr';
 				$field6=$c;
 			}else{
-				print LOG "$Now ->NOT Converted, invalid Source IP $b\n\n";
+				print LOG "$now ->NOT Converted, target ip $c not part of target network $g \n\n";
 				next;
 			}
 		}else{
-			print LOG "$now -> SOURCE IP INVALID. \n\n";
+			print LOG "$now -> TARGET IP INVALID. \n\n";
 			next;
 		}
 		$field12=$a;