From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 29 Jan 2018 10:44:36 +0000 (+0100)
Subject: ike-mobike: Don't reset address update flag if set previously
X-Git-Tag: 5.6.2rc1~15^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43bbe07036bada63ea629233c1c9249d987b9205;p=thirdparty%2Fstrongswan.git

ike-mobike: Don't reset address update flag if set previously

If we update a queued job we don't want to reset previously set task
properties.
---

diff --git a/src/libcharon/sa/ikev2/tasks/ike_mobike.c b/src/libcharon/sa/ikev2/tasks/ike_mobike.c
index dc0f24fb88..249f025a31 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_mobike.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_mobike.c
@@ -627,7 +627,7 @@ METHOD(ike_mobike_t, roam, void,
 	   private_ike_mobike_t *this, bool address)
 {
 	this->check = TRUE;
-	this->address = address;
+	this->address |= address;
 	if (!this->pending_update)
 	{
 		this->pending_update = TRUE;