From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 18 Jun 2021 13:31:06 +0000 (+0200)
Subject: ha: Register the correct IKE_SA with the manager after a rekeying
X-Git-Tag: 5.9.3dr4~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79b526deba692155ca3b2761b59ad17f35728320;p=thirdparty%2Fstrongswan.git

ha: Register the correct IKE_SA with the manager after a rekeying

Fixes: 20dfbcad0875 ("ha: Register new IKE_SAs before calling inherit_post()")
Closes strongswan/strongswan#456.
---

diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c
index 3c608e614c..3f91183e46 100644
--- a/src/libcharon/plugins/ha/ha_dispatcher.c
+++ b/src/libcharon/plugins/ha/ha_dispatcher.c
@@ -262,7 +262,7 @@ static void process_ike_add(private_ha_dispatcher_t *this, ha_message_t *message
 			{	/* register IKE_SA before calling inherit_post() so no scheduled
 				 * jobs are lost */
 				charon->ike_sa_manager->checkout_new(charon->ike_sa_manager,
-													 old_sa);
+													 ike_sa);
 				ike_sa->inherit_pre(ike_sa, old_sa);
 				ike_sa->inherit_post(ike_sa, old_sa);
 				charon->ike_sa_manager->checkin_and_destroy(