[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7490b22e9d46045d779bfc2e6d186e81ae15b5d1

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7490b22e9d46045d779bfc2e6d186e81ae15b5d1

[git]

[-- Attachment #1: Type: text/plain, Size: 3344 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  7490b22e9d46045d779bfc2e6d186e81ae15b5d1 (commit)
      from  bb8895e259b40bf53276e5cc413287535b03353f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7490b22e9d46045d779bfc2e6d186e81ae15b5d1
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Wed Apr 23 14:19:34 2014 +0200

    Firewall: BUG 10528 - allow subnets greater than /8

-----------------------------------------------------------------------

Summary of changes:
 config/cfgroot/general-functions.pl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index adfba54..271dc41 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -353,7 +353,7 @@ sub iporsubtodec
 	}
 	#Subnet already in decimal and valid?
 	if ($mask=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255  && $2<=$1 && $3<=$2  && $4<=$3 )))	{
-		for (my $i=8;$i<=32;$i++){
+		for (my $i=0;$i<=32;$i++){
 			if (&General::cidrtosub($i) eq $mask){
 				if ($full == 0){return $mask;}else{
 							 return $net."/".$mask;
@@ -362,7 +362,7 @@ sub iporsubtodec
 		}	
 	}
 	#Subnet in binary format?
-	if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){
+	if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=0))){
 			if($full == 0){ return &General::cidrtosub($mask);}else{
 						 return $net."/".&General::cidrtosub($mask);
 			}
@@ -389,7 +389,7 @@ sub iporsubtocidr
 	}
 	#Subnet in decimal and valid?
 	if ($mask=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255  && $2<=$1 && $3<=$2  && $4<=$3 )))	{
-		for (my $i=8;$i<=32;$i++){
+		for (my $i=0;$i<=32;$i++){
 			if (&General::cidrtosub($i) eq $mask){
 				if ($full == 0){return &General::subtocidr($mask);}else{
 							 return $net."/".&General::subtocidr($mask);
@@ -398,7 +398,7 @@ sub iporsubtocidr
 		}	
 	}
 	#Subnet already in binary format?
-	if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){
+	if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=0))){
 			if($full == 0){ return $mask;}else{
 						 return $net."/".$mask;
 			}
@@ -488,13 +488,13 @@ sub validipandmask
 	if ($ccdip=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1>0 && $1<=255 && $2>=0 && $2<=255 && $3>=0 && $3<=255 && $4<=255 ))) {
 		#Subnet in decimal and valid?
 		if ($ccdsubnet=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255  && $2<=$1 && $3<=$2  && $4<=$3 )))	{
-			for (my $i=8;$i<=32;$i++){
+			for (my $i=0;$i<=32;$i++){
 				if (&General::cidrtosub($i) eq $ccdsubnet){
 					return 1;
 				}
-			}	
+			}
 		#Subnet already in binary format?
-		}elsif ($ccdsubnet=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){
+		}elsif ($ccdsubnet=~/^(\d{1,2})$/ && (($1<=32 && $1>=0))){
 			return 1;
 		}else{
 			return 0;


hooks/post-receive
--
IPFire 2.x development tree