[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 087e3023812fec5dc4d4d85724166e64c24ab4cc

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 087e3023812fec5dc4d4d85724166e64c24ab4cc

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1830 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, next has been updated
       via  087e3023812fec5dc4d4d85724166e64c24ab4cc (commit)
      from  9a62b6daac483a8769f6760a627121550a6cc0f3 (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 087e3023812fec5dc4d4d85724166e64c24ab4cc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Aug 20 17:56:03 2020 +0000

    general-functions.pl: Do not check IPsec subnets for VTI/GRE connections
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/cfgroot/general-functions.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Difference in files:
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 8ee5eaa5d..5de4fb84b 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -529,7 +529,7 @@ sub checksubnets
 	if($ownnet ne 'ipsec'){
 		&General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf);
 		foreach my $key (keys %ipsecconf){
-			if ($ipsecconf{$key}[11] ne ''){
+			if ($ipsecconf{$key}[11] ne '' && $ipsecconf{$key}[36] eq ""){
 				foreach my $ipsecsubitem (split(/\|/, $ipsecconf{$key}[11])) {
 					my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]);
 					$ipsecsub=&iporsubtodec($ipsecsub);


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