diff options
Diffstat (limited to 'src/libcharon/sa/connect_manager.c')
| -rw-r--r-- | src/libcharon/sa/connect_manager.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libcharon/sa/connect_manager.c b/src/libcharon/sa/connect_manager.c index 1fb286863..f481f2059 100644 --- a/src/libcharon/sa/connect_manager.c +++ b/src/libcharon/sa/connect_manager.c @@ -1194,7 +1194,14 @@ static job_requeue_t initiate_mediated(initiate_data_t *data) DBG1(DBG_IKE, "establishing mediated connection failed"); charon->ike_sa_manager->checkin_and_destroy(charon->ike_sa_manager, sa); } +<<<<<<< HEAD charon->ike_sa_manager->checkin(charon->ike_sa_manager, sa); +======= + else + { + charon->ike_sa_manager->checkin(charon->ike_sa_manager, sa); + } +>>>>>>> upstream/4.5.1 } iterator->destroy(iterator); } |