From: Martin Willi <martin@revosec.ch>
Date: Mon, 2 Jan 2012 14:49:20 +0000 (+0100)
Subject: Reply quick mode with the same SA lifetime that we received
X-Git-Tag: 5.0.0~338^2~9^2~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31bd5c8c0e3a913fec42b775acd250147cd5fca8;p=thirdparty%2Fstrongswan.git

Reply quick mode with the same SA lifetime that we received
---

diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
index dc0a010998..ff52204a91 100644
--- a/src/libcharon/sa/ikev1/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -510,15 +510,15 @@ static void apply_lifetimes(private_quick_mode_t *this, sa_payload_t *sa_payload
 	lifebytes = sa_payload->get_lifebytes(sa_payload);
 	if (this->lifetime != lifetime)
 	{
-		DBG1(DBG_IKE, "received %us lifetime, configured %us, using lower",
+		DBG1(DBG_IKE, "received %us lifetime, configured %us",
 			 lifetime, this->lifetime);
-		this->lifetime = min(this->lifetime, lifetime);
+		this->lifetime = lifetime;
 	}
 	if (this->lifebytes != lifebytes)
 	{
-		DBG1(DBG_IKE, "received %llu lifebytes, configured %llu, using lower",
+		DBG1(DBG_IKE, "received %llu lifebytes, configured %llu",
 			 lifebytes, this->lifebytes);
-		this->lifebytes = min(this->lifebytes, lifebytes);
+		this->lifebytes = lifebytes;
 	}
 }