routing.cgi: Fix error in regex that validates "0.0.0.0".

[people/teissler/ipfire-2.x.git] / html / cgi-bin / routing.cgi

diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi
index 86e04293a406ada5098ee950a8e72818b02944fb..488705fb528e89685e0b3476bb4498fad9212fec 100644 (file)
--- a/html/cgi-bin/routing.cgi
+++ b/html/cgi-bin/routing.cgi
@@ -118,13 +118,15 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) {
 }
 
 if ($settings{'ACTION'} eq $Lang::tr{'add'}) {
+       # Convert subnet masks to CIDR notation.
+       $settings{'IP'} = &General::iporsubtocidr($settings{'IP'});
 
 # Validate inputs
        if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){
        $errormessage = $Lang::tr{'invalid ip'}." / ".$Lang::tr{'invalid netmask'};
        }
 
-       if ($settings{'IP'} =~ /0.0.0.0/){
+       if ($settings{'IP'} =~ /^0\.0\.0\.0/){
        $errormessage = $Lang::tr{'invalid ip'}." - 0.0.0.0";
        }
 
@@ -443,4 +445,4 @@ sub SortDataFile
 #
 sub BuildConfiguration {
     system '/usr/local/bin/rebuildroutes';
-}
\ No newline at end of file
+}