From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 15 Jun 2016 15:43:55 +0000 (+0200)
Subject: quick-mode: Fix reporting lifebytes if lifetime is configured
X-Git-Tag: 5.5.0dr1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e01d7ca3283302e92613ac3a0621a62c00d4b2b;p=thirdparty%2Fstrongswan.git

quick-mode: Fix reporting lifebytes if lifetime is configured
---

diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
index da41a3f8c9..a6cc193905 100644
--- a/src/libcharon/sa/ikev1/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -146,7 +146,7 @@ struct private_quick_mode_t {
 	uint32_t lifetime;
 
 	/**
-	 * Negotaited lifebytes of new SA
+	 * Negotiated lifebytes of new SA
 	 */
 	uint64_t lifebytes;
 
@@ -727,7 +727,7 @@ static void get_lifetimes(private_quick_mode_t *this)
 	{
 		this->lifetime = lft->time.life;
 	}
-	else if (lft->bytes.life)
+	if (lft->bytes.life)
 	{
 		this->lifebytes = lft->bytes.life;
 	}