Merge remote-tracking branch 'origin/next'

[ipfire-2.x.git] / config / cfgroot / general-functions.pl

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 8ed87fc80e58d5b40f3a5cc108d2d3e36fb767c8..35ae7c0930e8fd91cae3d60e0558d6a5e06299cd 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -286,7 +286,7 @@ sub validip
 sub validmask {
        my $mask = shift;
 
-       return &Network::check_netmask($mask) or &Network::check_prefix($mask);
+       return &Network::check_netmask($mask) || &Network::check_prefix($mask);
 }
 
 sub validipormask
@@ -388,7 +388,9 @@ sub iporsubtocidr
 }
 
 sub getnetworkip {
-       return &Network::get_netaddress(shift);
+       my $arg = join("/", @_);
+
+       return &Network::get_netaddress($arg);
 }
 
 sub getccdbc