From: Martin Willi <martin@revosec.ch>
Date: Fri, 6 Jul 2012 12:05:49 +0000 (+0200)
Subject: Initialize conftest with the same plugins as charon
X-Git-Tag: 5.0.1~321
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71c41410fc0b3c9022f1fe59f7b988363b84abea;p=thirdparty%2Fstrongswan.git

Initialize conftest with the same plugins as charon
---

diff --git a/src/conftest/Makefile.am b/src/conftest/Makefile.am
index 7eab0df276..64a2cc6d3c 100644
--- a/src/conftest/Makefile.am
+++ b/src/conftest/Makefile.am
@@ -1,6 +1,7 @@
 ipsec_PROGRAMS = conftest
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = -rdynamic \
+	-DPLUGINS=\""${charon_plugins}\""
 
 conftest_SOURCES = conftest.c conftest.h config.c config.h actions.c actions.h \
 	hooks/hook.h hooks/ike_auth_fill.c hooks/unsort_message.c \
diff --git a/src/conftest/conftest.c b/src/conftest/conftest.c
index 612397237c..00decdd4bd 100644
--- a/src/conftest/conftest.c
+++ b/src/conftest/conftest.c
@@ -488,7 +488,7 @@ int main(int argc, char *argv[])
 	{
 		return 1;
 	}
-	if (!charon->initialize(charon))
+	if (!charon->initialize(charon, PLUGINS))
 	{
 		return 1;
 	}