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

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 1608 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  a24062d12bf6e8623f2316d6fbb0551ce553f0b5 (commit)
      from  cbdee67e068441c10284e1ab290ca4db226dd37f (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 a24062d12bf6e8623f2316d6fbb0551ce553f0b5
Author: Jochen Kauz <jochen.kauz(a)gmail.com>
Date:   Tue Apr 28 11:30:05 2015 +0200

    vpnmain.cgi: dpd_delay/dpd_timeout wrong entry in ipsec.conf
    
    Fixes #10636

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

Summary of changes:
 html/cgi-bin/vpnmain.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 0d23d0d..3819749 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -363,12 +363,12 @@ sub writeipsecfiles {
 			print CONF "\tdpddelay=0\n";
 		}
 	} else {
-		my $dpddelay = $lconfighash{$key}[30];
+		my $dpddelay = $lconfighash{$key}[31];
 		if (!$dpddelay) {
 			$dpddelay = 30;
 		}
 		print CONF "\tdpddelay=$dpddelay\n";
-		my $dpdtimeout = $lconfighash{$key}[31];
+		my $dpdtimeout = $lconfighash{$key}[30];
 		if (!$dpdtimeout) {
 			$dpdtimeout = 120;
 		}


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