From f7e649ddfbd915136ae5acdad388d0b517e5ea85 Mon Sep 17 00:00:00 2001
From: Alexander Marx <amarx@ipfire.org>
Date: Tue, 2 Apr 2013 08:43:18 +0200
Subject: [PATCH] Forward Firewall: some typos in dmz-converter

---
 config/backup/backup.pl      | 8 ++++----
 config/forwardfw/convert-dmz | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 4ad7363fbb..4662a8a1d3 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -66,9 +66,9 @@ elsif ($ARGV[0] eq 'restore') {
   system("/usr/sbin/ovpn-ccd-convert");
   #OUTGOINGFW CONVERTER
   if( -d "${General::swroot}/outgoing"){
-	  if( -f "${General::swroot}/forward/config" ){ 
+	  if( -f "${General::swroot}/forward/config" ){
 		  unlink("${General::swroot}/forward/config");
-		  system("touch ${General::swroot}/forward/config"); 
+		  system("touch ${General::swroot}/forward/config");
 		  chown 99,99,"${General::swroot}/forward/config";
 	  }
 	  if( -f "${General::swroot}/forward/outgoing" ){
@@ -99,7 +99,7 @@ elsif ($ARGV[0] eq 'restore') {
 	  rmtree("${General::swroot}/xtaccess");
   }
   #DMZ-HOLES CONVERTER
-  if( -d "${General::swroot}/dmz-holes"){
+  if( -d "${General::swroot}/dmzholes"){
 	  if( -f "${General::swroot}/forward/dmz" ){
 		  unlink("${General::swroot}/forward/dmz");
 		  system("touch ${General::swroot}/forward/dmz");
@@ -107,7 +107,7 @@ elsif ($ARGV[0] eq 'restore') {
 	  }
 	  #START CONVERTER "DMZ-HOLES"
 	  system("/usr/sbin/convert-dmz");
-	  rmtree("${General::swroot}/xtaccess");
+	  rmtree("${General::swroot}/dmzholes");
   }
   #PORTFORWARD CONVERTER
   if( -d "${General::swroot}/portfw"){
diff --git a/config/forwardfw/convert-dmz b/config/forwardfw/convert-dmz
index 639cef374d..81d77bab73 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;
-- 
2.39.5