From c83921a2b566aa9d55d8ccc7258f04fca6292ee6 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Tue, 30 Apr 2013 17:51:33 +0200 Subject: Imported Upstream version 5.0.4 --- src/libpts/Makefile.in | 1 + src/libpts/plugins/imc_attestation/Makefile.in | 1 + src/libpts/plugins/imv_attestation/Makefile.in | 1 + src/libpts/plugins/imv_attestation/attest_db.c | 9 ++++++--- 4 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src/libpts') diff --git a/src/libpts/Makefile.in b/src/libpts/Makefile.in index 1420a95dc..f0b89c68f 100644 --- a/src/libpts/Makefile.in +++ b/src/libpts/Makefile.in @@ -303,6 +303,7 @@ dev_headers = @dev_headers@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +fips_mode = @fips_mode@ gtk_CFLAGS = @gtk_CFLAGS@ gtk_LIBS = @gtk_LIBS@ h_plugins = @h_plugins@ diff --git a/src/libpts/plugins/imc_attestation/Makefile.in b/src/libpts/plugins/imc_attestation/Makefile.in index 181dbc272..c30945b79 100644 --- a/src/libpts/plugins/imc_attestation/Makefile.in +++ b/src/libpts/plugins/imc_attestation/Makefile.in @@ -250,6 +250,7 @@ dev_headers = @dev_headers@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +fips_mode = @fips_mode@ gtk_CFLAGS = @gtk_CFLAGS@ gtk_LIBS = @gtk_LIBS@ h_plugins = @h_plugins@ diff --git a/src/libpts/plugins/imv_attestation/Makefile.in b/src/libpts/plugins/imv_attestation/Makefile.in index 2e75807b4..153865d30 100644 --- a/src/libpts/plugins/imv_attestation/Makefile.in +++ b/src/libpts/plugins/imv_attestation/Makefile.in @@ -260,6 +260,7 @@ dev_headers = @dev_headers@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +fips_mode = @fips_mode@ gtk_CFLAGS = @gtk_CFLAGS@ gtk_LIBS = @gtk_LIBS@ h_plugins = @h_plugins@ diff --git a/src/libpts/plugins/imv_attestation/attest_db.c b/src/libpts/plugins/imv_attestation/attest_db.c index 81445acbf..b2116c0ff 100644 --- a/src/libpts/plugins/imv_attestation/attest_db.c +++ b/src/libpts/plugins/imv_attestation/attest_db.c @@ -847,6 +847,7 @@ METHOD(attest_db_t, list_devices, void, if (e_ar) { e_ar->enumerate(e_ar, &ar_id_type, &ar_id_value); + ar_id_value = chunk_clone(ar_id_value); e_ar->destroy(e_ar); } } @@ -854,6 +855,7 @@ METHOD(attest_db_t, list_devices, void, { printf(" %.*s", (int)ar_id_value.len, ar_id_value.ptr); } + last_ar_id = ar_id; } printf("\n"); } @@ -973,8 +975,8 @@ METHOD(attest_db_t, list_packages, void, enumerator_t *e; char *package, *version; os_package_state_t security; - int gid, gid_old = 0, spaces, count = 0; - time_t t; + int gid, gid_old = 0, spaces, count = 0, t; + time_t timestamp; if (this->pid) { @@ -1000,7 +1002,8 @@ METHOD(attest_db_t, list_packages, void, printf(" "); } } - printf(" %T (%s)%N\n", &t, this->utc, version, + timestamp = t; + printf(" %T (%s)%N\n", ×tamp, this->utc, version, os_package_state_names, security); count++; } -- cgit v1.2.3