Firewall: when DNAT external port is given and dest port is empty, theres now an...

diff --git a/doc/language_issues.es b/doc/language_issues.es
index f735730a8e75afbee6d1ff7013d7ed199ed57a22..356dc0ec56cc9fc2979ca5daf78459d40e55d3f7 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -643,6 +643,7 @@ WARNING: untranslated string: fwdfw delete
 WARNING: untranslated string: fwdfw dnat
 WARNING: untranslated string: fwdfw dnat error
 WARNING: untranslated string: fwdfw dnat porterr
+WARNING: untranslated string: fwdfw dnat porterr2
 WARNING: untranslated string: fwdfw edit
 WARNING: untranslated string: fwdfw err nosrc
 WARNING: untranslated string: fwdfw err nosrcip

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index e33e653dc744294f5795f7a5b75ff89bcd8d1473..6e1c15bc2e4a52717202b6e6669038d608da3c21 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -646,6 +646,7 @@ WARNING: untranslated string: fwdfw delete
 WARNING: untranslated string: fwdfw dnat
 WARNING: untranslated string: fwdfw dnat error
 WARNING: untranslated string: fwdfw dnat porterr
+WARNING: untranslated string: fwdfw dnat porterr2
 WARNING: untranslated string: fwdfw edit
 WARNING: untranslated string: fwdfw err nosrc
 WARNING: untranslated string: fwdfw err nosrcip

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 92ef57e38fdcaa5e532d3f59cc2ca7cbe9757634..902b6e5c1e4587c40d6e8bd72fb7e06ecba89d3e 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -592,6 +592,7 @@ WARNING: untranslated string: fwdfw delete
 WARNING: untranslated string: fwdfw dnat
 WARNING: untranslated string: fwdfw dnat error
 WARNING: untranslated string: fwdfw dnat porterr
+WARNING: untranslated string: fwdfw dnat porterr2
 WARNING: untranslated string: fwdfw edit
 WARNING: untranslated string: fwdfw err nosrc
 WARNING: untranslated string: fwdfw err nosrcip

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index f735730a8e75afbee6d1ff7013d7ed199ed57a22..356dc0ec56cc9fc2979ca5daf78459d40e55d3f7 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -643,6 +643,7 @@ WARNING: untranslated string: fwdfw delete
 WARNING: untranslated string: fwdfw dnat
 WARNING: untranslated string: fwdfw dnat error
 WARNING: untranslated string: fwdfw dnat porterr
+WARNING: untranslated string: fwdfw dnat porterr2
 WARNING: untranslated string: fwdfw edit
 WARNING: untranslated string: fwdfw err nosrc
 WARNING: untranslated string: fwdfw err nosrcip

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 7e1a86dc33ca2a38ba6ca6522db1c67af71b5bb0..a5e6638458c1dbf0d3fed2c9faf4b551d40c5a21 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -629,6 +629,7 @@ WARNING: untranslated string: fwdfw delete
 WARNING: untranslated string: fwdfw dnat
 WARNING: untranslated string: fwdfw dnat error
 WARNING: untranslated string: fwdfw dnat porterr
+WARNING: untranslated string: fwdfw dnat porterr2
 WARNING: untranslated string: fwdfw edit
 WARNING: untranslated string: fwdfw err nosrc
 WARNING: untranslated string: fwdfw err nosrcip

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index fe1aed6b0ec656f534a8d83784a6943fecd48a1b..810b3d6592b810bc704e2cbbbd51ab57dd78086e 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -588,6 +588,7 @@ WARNING: untranslated string: fwdfw delete
 WARNING: untranslated string: fwdfw dnat
 WARNING: untranslated string: fwdfw dnat error
 WARNING: untranslated string: fwdfw dnat porterr
+WARNING: untranslated string: fwdfw dnat porterr2
 WARNING: untranslated string: fwdfw edit
 WARNING: untranslated string: fwdfw err nosrc
 WARNING: untranslated string: fwdfw err nosrcip

diff --git a/doc/language_missings b/doc/language_missings
index 8a751f05cabf6cd62c4dcb88b4beb013071fbe1d..0b6e3f093875522c422d4926360062877279ab76 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -106,6 +106,7 @@
 < fwdfw dnat
 < fwdfw dnat error
 < fwdfw dnat porterr
+< fwdfw dnat porterr2
 < fwdfw DROP
 < fwdfw edit
 < fwdfw err nosrc
@@ -518,6 +519,7 @@
 < fwdfw dnat
 < fwdfw dnat error
 < fwdfw dnat porterr
+< fwdfw dnat porterr2
 < fwdfw DROP
 < fwdfw edit
 < fwdfw err nosrc
@@ -914,6 +916,7 @@
 < fwdfw dnat
 < fwdfw dnat error
 < fwdfw dnat porterr
+< fwdfw dnat porterr2
 < fwdfw DROP
 < fwdfw edit
 < fwdfw err nosrc
@@ -1299,6 +1302,7 @@
 < fwdfw dnat
 < fwdfw dnat error
 < fwdfw dnat porterr
+< fwdfw dnat porterr2
 < fwdfw DROP
 < fwdfw edit
 < fwdfw err nosrc

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 741fada01f689dc797ffc79022e837c974e042c2..71ca752574f56f8448ea33c5c94df6c38781d816 100755 (executable)
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -729,8 +729,11 @@ sub checkrule
 {
        #check valid port for NAT
        if($fwdfwsettings{'USE_NAT'} eq 'ON'){
-               #if no port is given in nat area, take target host port
+               #if no dest port is given in nat area, take target host port
                if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'grp3'} eq 'TGT_PORT' && $fwdfwsettings{'dnatport'} eq ''){$fwdfwsettings{'dnatport'}=$fwdfwsettings{'TGT_PORT'};}
+               if($fwdfwsettings{'TGT_PORT'} eq ''){
+                       $errormessage=$Lang::tr{'fwdfw dnat porterr2'};
+               }
                #check if port given in nat area is a single valid port or portrange
                if($fwdfwsettings{'nat'} eq 'dnat' && $fwdfwsettings{'TGT_PORT'} ne '' && !&check_natport($fwdfwsettings{'dnatport'})){
                        $errormessage=$Lang::tr{'fwdfw target'}.": ".$Lang::tr{'fwdfw dnat porterr'}."<br>";

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index b0b072407319a5474ffaccc0b7a005cfde924f01..e8fb995995207d18d00288ab2a4003af61c72f83 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -930,6 +930,7 @@
 'fwdfw dnat' => 'Destination-NAT (Port-Weiterleitung)',
 'fwdfw dnat error' => 'Für Destination-NAT muss ein einzelner Host als Ziel ausgewählt werden. Gruppen oder Netzwerke sind nicht erlaubt',
 'fwdfw dnat porterr' => 'Für NAT-Regeln muss ein einzelner Port oder Portbereich angegeben werden',
+'fwdfw dnat porterr2' => 'Externer Port (NAT) darf nur angegeben werden, wenn ein Ziel-Port definiert ist.',
 'fwdfw edit' => 'Bearbeiten',
 'fwdfw err nosrc' => 'Keine Quelle ausgewählt',
 'fwdfw err nosrcip' => 'Bitte Quell-IP-Adresse angeben',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 0909226da2db03a3347a5f059887afa0217d6e0f..8bbfff39f61bcf59be680d05dc462032b4d20e3a 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -955,6 +955,7 @@
 'fwdfw dnat' => 'Destination NAT (Port forwarding)',
 'fwdfw dnat error' => 'You have to select a single host for DNAT. Groups or networks are not allowed.',
 'fwdfw dnat porterr' => 'You have to select a single port or portrange (tcp/udp) for NAT',
+'fwdfw dnat porterr2' => 'Cannot use external port (NAT) when no destination port is defined.',
 'fwdfw edit' => 'Edit',
 'fwdfw err nosrc' => 'No source selected.',
 'fwdfw err nosrcip' => 'Please provide a source IP address.',