From fa0a1411026bcbf173fbe6d573dfc260ee883102 Mon Sep 17 00:00:00 2001
From: Matt Smith <mgsmith@netgate.com>
Date: Wed, 30 Jul 2014 10:57:15 -0500
Subject: [PATCH] Fix for #3785 - 'strongswan config being generated with ike
 SA lifetime set to value of ipsec SA lifetime'

---
 etc/inc/vpn.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 92da262e46..cb84dc41d0 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -581,9 +581,9 @@ EOD;
 					if (!empty($ph1ent['authentication_method']) && (strpos($ph1ent['authentication_method'], "xauth") || strpos($ph1ent['authentication_method'], "hybrid")))
 						$xauth = "xauth = server";
 
-					$lifeline = '';
+					$ikelifeline = '';
 					if ($ph1ent['lifetime'])
-						$lifeline = "ikelifetime = {$ph1ent['lifetime']}s";
+						$ikelifeline = "ikelifetime = {$ph1ent['lifetime']}s";
 
 					$remoteid_spec = '';
 					if (($ph2ent['mode'] == 'tunnel') or ($ph2ent['mode'] == 'tunnel6')) {
@@ -721,8 +721,9 @@ EOD;
 					}
 
 
+					$ipseclifetime = '';
 					if ($ph2ent['lifetime'])
-						$lifeline = "ikelifetime = {$ph2ent['lifetime']}s";
+						$ipseclifeline = "lifetime = {$ph2ent['lifetime']}s";
 
 					$ipsecconf .=<<<EOD
 
@@ -734,7 +735,8 @@ conn con{$ph2_index}-{$ph1ent['ikeid']}
 	reauth = yes
 	reqid = {$ikeid}
 	installpolicy = yes
-	{$lifeline}
+	{$ikelifeline}
+	{$ipseclifeline}
 	{$tunneltype}
 	{$dpdline}
 	auto = {$passive}