Merge remote-tracking branch 'ummeegge/openvpn' into next

[people/teissler/ipfire-2.x.git] / config / firewall / convert-portfw

diff --git a/config/firewall/convert-portfw b/config/firewall/convert-portfw
index 447ef90a760784689fb142ed8835f1957f01450e..8660e7cfde6384b8d48ea1f76476780023316d3e 100755 (executable)
--- a/config/firewall/convert-portfw
+++ b/config/firewall/convert-portfw
@@ -36,6 +36,17 @@ my ($key,$flag,$prot,$ipfireport,$target,$targetport,$active,$alias,$source,$rem
 my ($key1,$flag1,$prot1,$ipfireport1,$target1,$targetport1,$active1,$alias1,$source1,$remark1);
 my $count=0;
 my $jump;
+
+if (! -e "$portfwconfig") {
+        print "Config file for portforward not found. Exiting!\n";
+        exit(1);
+}
+
+if (! -s "$portfwconfig") {
+        print "Empty portforward configuration file. Nothing to do. Exiting...\n";
+        exit(0);
+}
+
 if(! -d "/var/log/converters"){ mkdir("/var/log/converters");}
 open(FILE, $portfwconfig) or die 'Unable to open config file.';
 my @current = <FILE>;
@@ -94,7 +105,7 @@ sub build_rules
                }
                #get ipfire ip
                if($alias eq '0.0.0.0'){
-                       $alias='ALL';
+                       $alias='Default IP';
                }else{
                        foreach my $ali (@alias){
                                my ($alias_ip,$alias_active,$alias_name) = split (",",$ali);