denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make SWID directory where tags are stored configurable

Browse Source
This commit is contained in:
Andreas Steffen
2013-09-05 12:25:02 +02:00
parent 9b8137fdd3
commit ae32172619
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libpts/plugins/imc_swid/Makefile.am
+2 -1
View File
@@ -21,7 +21,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libtncif \
-I$(top_srcdir)/src/libimcv \
-I$(top_srcdir)/src/libpts
-I$(top_srcdir)/src/libpts \
-DSWID_DIRECTORY=\"${prefix}/share\"
AM_CFLAGS = \
-rdynamic
src/libpts/plugins/imc_swid/imc_swid.c
+5 -1
View File
@@ -155,6 +155,7 @@ static TNC_Result receive_message(imc_state_t *state, imc_msg_t *in_msg)
u_int8_t flags;
u_int32_t request_id, eid_epoch;
swid_inventory_t *swid_inventory;
char *swid_directory;
bool full_tags;
type = attr->get_type(attr);
@@ -178,8 +179,11 @@ static TNC_Result receive_message(imc_state_t *state, imc_msg_t *in_msg)
}
full_tags = (flags & TCG_SWID_ATTR_REQ_FLAG_R) == 0;
swid_directory = lib->settings->get_str(lib->settings,
"libimcv.plugins.imc-swid.swid_directory",
SWID_DIRECTORY);
swid_inventory = swid_inventory_create(full_tags);
if (!swid_inventory->collect(swid_inventory))
if (!swid_inventory->collect(swid_inventory, swid_directory))
{
swid_inventory->destroy(swid_inventory);
attr = swid_error_create(TCG_SWID_ERROR, request_id,