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 78c62c0f1cf4b68582a0f3f8987dbfbfa128bfa3..be6a785f199df22c28f57b8fc2dc01550c4a005f 100644 (file)
--- 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;