automatically construct attest plugin list

diff --git a/configure.in b/configure.in
index 8723c1966c0b6c2199bcd36fd4abb7a438cbc181..72d79a02affdf71bacbf38ff1c561c09c46f1c75 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -758,6 +758,7 @@ libcharon_plugins=
 pluto_plugins=
 starter_plugins=
 pool_plugins=
+attest_plugins=
 openac_plugins=
 scepclient_plugins=
 pki_plugins=
@@ -776,8 +777,8 @@ ADD_PLUGIN([test-vectors],         [s libcharon pluto openac scepclient pki])
 ADD_PLUGIN([curl],                 [s libcharon pluto scepclient scripts])
 ADD_PLUGIN([soup],                 [s libcharon pluto scripts])
 ADD_PLUGIN([ldap],                 [s libcharon pluto scepclient scripts])
-ADD_PLUGIN([mysql],                [s libcharon pluto pool manager medsrv])
-ADD_PLUGIN([sqlite],               [s libcharon pluto pool manager medsrv])
+ADD_PLUGIN([mysql],                [s libcharon pluto pool manager medsrv attest])
+ADD_PLUGIN([sqlite],               [s libcharon pluto pool manager medsrv attest])
 ADD_PLUGIN([pkcs11],               [s libcharon pki])
 ADD_PLUGIN([aes],                  [s libcharon pluto openac scepclient pki scripts])
 ADD_PLUGIN([des],                  [s libcharon pluto openac scepclient pki scripts])
@@ -868,6 +869,7 @@ AC_SUBST(libcharon_plugins)
 AC_SUBST(pluto_plugins)
 AC_SUBST(starter_plugins)
 AC_SUBST(pool_plugins)
+AC_SUBST(attest_plugins)
 AC_SUBST(openac_plugins)
 AC_SUBST(scepclient_plugins)
 AC_SUBST(pki_plugins)

diff --git a/src/libimcv/plugins/imv_attestation/Makefile.am b/src/libimcv/plugins/imv_attestation/Makefile.am
index ee045dd0ee46a21be8a1f6a99b93c7b2ce4f5a20..f90fe2ab0423dbcb88afe1e59f3f2f4518d0c0d9 100644 (file)
--- a/src/libimcv/plugins/imv_attestation/Makefile.am
+++ b/src/libimcv/plugins/imv_attestation/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
        -I$(top_srcdir)/src/libimcv \
        -I$(top_srcdir)/src/libpts
 
-AM_CFLAGS = -rdynamic
+AM_CFLAGS = -rdynamic -DPLUGINS=\""${attest_plugins}\""
 
 imcv_LTLIBRARIES = imv-attestation.la
 

diff --git a/src/libimcv/plugins/imv_attestation/attest.c b/src/libimcv/plugins/imv_attestation/attest.c
index 360a63f8ba201f3bdb7a8bd6c307b8eca44d8171..30563364ca12c33baec4b18bf193e4902212c06a 100644 (file)
--- a/src/libimcv/plugins/imv_attestation/attest.c
+++ b/src/libimcv/plugins/imv_attestation/attest.c
@@ -213,7 +213,7 @@ int main(int argc, char *argv[])
                exit(SS_RC_LIBSTRONGSWAN_INTEGRITY);
        }
        if (!lib->plugins->load(lib->plugins, NULL,
-                       lib->settings->get_str(lib->settings, "attest.load", "sqlite")))
+                       lib->settings->get_str(lib->settings, "attest.load", PLUGINS)))
        {
                exit(SS_RC_INITIALIZATION_FAILED);
        }