aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2014-08-28 10:16:51 +0200
committerMartin Willi <martin@revosec.ch>2014-08-28 10:19:57 +0200
commite1c7e1bc1fab70e68b032f3a27c2a32d92696c63 (patch)
tree7154949d4093ca0ad4dcae09c706ffaf1ad48c40
parent6095714e64d500aabe08d578b3fabc8992134dc3 (diff)
downloadstrongswan-e1c7e1bc1fab70e68b032f3a27c2a32d92696c63.tar.bz2
strongswan-e1c7e1bc1fab70e68b032f3a27c2a32d92696c63.tar.xz
ha: Don't adopt IKEv1 children when building without IKEv1 support
The adopt_children_job_create() function is not available when IKEv1 support is disabled. Fixes uncommon builds using --enable-ha --disable-ikev1. Fixes #690.
-rw-r--r--src/libcharon/plugins/ha/ha_dispatcher.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c
index 6ff24c334..e20e872c1 100644
--- a/src/libcharon/plugins/ha/ha_dispatcher.c
+++ b/src/libcharon/plugins/ha/ha_dispatcher.c
@@ -437,11 +437,13 @@ static void process_ike_update(private_ha_dispatcher_t *this,
pools->destroy(pools);
}
}
+#ifdef USE_IKEV1
if (ike_sa->get_version(ike_sa) == IKEV1)
{
lib->processor->queue_job(lib->processor, (job_t*)
adopt_children_job_create(ike_sa->get_id(ike_sa)));
}
+#endif /* USE_IKEV1 */
this->cache->cache(this->cache, ike_sa, message);
charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
}