From: Martin Willi <martin@strongswan.org>
Date: Fri, 28 Nov 2008 16:40:16 +0000 (+0000)
Subject: apply peer config during rekeying
X-Git-Tag: 4.4.0~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c81f4fa29dd86076c860a4748c3ac40ebaad6db6;p=thirdparty%2Fstrongswan.git

apply peer config during rekeying
---

diff --git a/src/charon/plugins/ha_sync/ha_sync_dispatcher.c b/src/charon/plugins/ha_sync/ha_sync_dispatcher.c
index 78c62c0f1c..be6a785f19 100644
--- a/src/charon/plugins/ha_sync/ha_sync_dispatcher.c
+++ b/src/charon/plugins/ha_sync/ha_sync_dispatcher.c
@@ -139,7 +139,13 @@ static void process_ike_add(private_ha_sync_dispatcher_t *this,
 		{
 			if (old_sa)
 			{
-				ike_sa->inherit(ike_sa, old_sa);
+				peer_cfg_t *peer_cfg = old_sa->get_peer_cfg(old_sa);
+
+				if (peer_cfg)
+				{
+					ike_sa->set_peer_cfg(ike_sa, peer_cfg);
+					ike_sa->inherit(ike_sa, old_sa);
+				}
 				charon->ike_sa_manager->checkin_and_destroy(
 												charon->ike_sa_manager, old_sa);
 				old_sa = NULL;