From 9c64f214f17bda979468ae5f5664c8dec5e49610 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Tue, 3 Jan 2012 11:58:40 +0100
Subject: [PATCH] Support initiation of childless IKEv1 ISAKMP SAs

---
 src/libcharon/sa/ike_sa.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index c7a8a97f3..73b4ba24b 100644
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1066,7 +1066,7 @@ METHOD(ike_sa_t, initiate, status_t,
 #endif /* ME */
 			)
 		{
-			child_cfg->destroy(child_cfg);
+			DESTROY_IF(child_cfg);
 			DBG1(DBG_IKE, "unable to initiate to %%any");
 			charon->bus->alert(charon->bus, ALERT_PEER_ADDR_FAILED);
 			return DESTROY_ME;
@@ -1090,6 +1090,7 @@ METHOD(ike_sa_t, initiate, status_t,
 	}
 	else
 #endif /* ME */
+	if (child_cfg)
 	{
 		/* normal IKE_SA with CHILD_SA */
 		this->task_manager->queue_child(this->task_manager, child_cfg, reqid,