From 1b19469c6707a4cc9446a1c4dc4d2de3eeb44a2f Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 2 Apr 2019 16:24:01 +0200
Subject: [PATCH] unit-tests: Make childless initiation configurable

---
 src/libcharon/tests/utils/exchange_test_helper.c | 5 ++++-
 src/libcharon/tests/utils/exchange_test_helper.h | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/libcharon/tests/utils/exchange_test_helper.c b/src/libcharon/tests/utils/exchange_test_helper.c
index a267468fd..97fa6fecd 100644
--- a/src/libcharon/tests/utils/exchange_test_helper.c
+++ b/src/libcharon/tests/utils/exchange_test_helper.c
@@ -100,11 +100,14 @@ static ike_cfg_t *create_ike_cfg(bool initiator, exchange_test_sa_conf_t *conf)
 	ike_cfg_t *ike_cfg;
 	char *proposal = NULL;
 
-	ike_cfg = ike_cfg_create(&ike);
 	if (conf)
 	{
+		ike.childless = initiator ? conf->initiator.childless
+								  : conf->responder.childless;
 		proposal = initiator ? conf->initiator.ike : conf->responder.ike;
 	}
+
+	ike_cfg = ike_cfg_create(&ike);
 	if (proposal)
 	{
 		ike_cfg->add_proposal(ike_cfg,
diff --git a/src/libcharon/tests/utils/exchange_test_helper.h b/src/libcharon/tests/utils/exchange_test_helper.h
index 8f43c0927..1541e88da 100644
--- a/src/libcharon/tests/utils/exchange_test_helper.h
+++ b/src/libcharon/tests/utils/exchange_test_helper.h
@@ -109,6 +109,8 @@ struct exchange_test_sa_conf_t {
 		char *ike;
 		/** ESP proposal */
 		char *esp;
+		/** Support for childless IKE_SAs */
+		childless_t childless;
 	} initiator, responder;
 };