X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config%2Ffirewall%2Fconvert-dmz;h=7b7704548cbddd078d72f6f306e5cc606d516400;hb=fc466a563f2a5694213077680407d1f60a735421;hp=0f7c68e29a6d0dcd37dbcf62405f98b38d94a3da;hpb=6d8eb5dec7bf36f9b1bd53c9354d980aea315d89;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/config/firewall/convert-dmz b/config/firewall/convert-dmz
index 0f7c68e29..7b7704548 100755
--- a/config/firewall/convert-dmz
+++ b/config/firewall/convert-dmz
@@ -55,6 +55,15 @@ my $field29 = 'ALL';
 my $field30 = '';
 my $field31 = 'dnat';
 
+if (! -e "$dmzconfig") {
+	print "DMZ config file not found. Exiting!\n";
+	exit(1);
+}
+
+if (! -s "$dmzconfig") {
+	print "Empty DMZ configuration file. Nothing to do. Exiting...\n";
+	exit(0);
+}
 
 open(FILE, $dmzconfig) or die 'Unable to open config file.';
 my @current = <FILE>;
@@ -141,12 +150,12 @@ sub process_rules{
 		$configfwdfw{$key}[5] = $field5;
 		$configfwdfw{$key}[6] = $field6;
 		$configfwdfw{$key}[7] = '';
-		$configfwdfw{$key}[8] = '';
+		$configfwdfw{$key}[8] = $field12;
 		$configfwdfw{$key}[9] = '';
 		$configfwdfw{$key}[10] = '';
 		$configfwdfw{$key}[11] = $field11;
-		$configfwdfw{$key}[12] = $field12;
-		$configfwdfw{$key}[13] = $field13;
+		$configfwdfw{$key}[12] = '';
+		$configfwdfw{$key}[13] = '';
 		$configfwdfw{$key}[14] = $field14;
 		$configfwdfw{$key}[15] = $field15;
 		$configfwdfw{$key}[16] = $field16;
@@ -165,7 +174,7 @@ sub process_rules{
 		$configfwdfw{$key}[29] = $field29;
 		$configfwdfw{$key}[30] = $field30;
 		$configfwdfw{$key}[31] = $field31;
-		print LOG "$Now -> Converted to $field0,$field1,$field2,$field3,$field4,$field5,$field6,,,,,$field11,$field12,$field13,$field14,$field15,$field16,,,,,,,,,,$field26,$field27\n";
+		print LOG "$Now -> Converted to $field0,$field1,$field2,$field3,$field4,$field5,$field6,,$field12,,,$field11,,,$field14,$field15,$field16,,,,,,,,,,$field26,$field27,$field28,$field29,$field30,$field31\n";
 	}
 	&General::writehasharray($fwdfwconfig,\%configfwdfw);
 close (LOG);