From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Thu, 27 Oct 2011 05:55:15 +0000 (+0200)
Subject: added pts_file_type_names
X-Git-Tag: 4.6.2~291
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b81a60c51c61614cc62a2b819eb04e68bb353c9;p=thirdparty%2Fstrongswan.git

added pts_file_type_names
---

diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation_process.c b/src/libimcv/plugins/imv_attestation/imv_attestation_process.c
index 1bdaabe826..aa2b0fe17f 100644
--- a/src/libimcv/plugins/imv_attestation/imv_attestation_process.c
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation_process.c
@@ -421,9 +421,9 @@ bool imv_attestation_process(pa_tnc_attr_t *attr, linked_list_t *attr_list,
 			while (e->enumerate(e, &entry))
 			{
 				DBG1(DBG_IMV, " '%s' (%"PRIu64" bytes)"
-							  " owner %"PRIu64", group %"PRIu64", type %d",
+							  " owner %"PRIu64", group %"PRIu64", type %N",
 					 entry->filename, entry->filesize, entry->owner,
-					 entry->group, entry->type);
+					 entry->group, pts_file_type_names, entry->type);
 
 				created = entry->created;
 				modified = entry->modified;
diff --git a/src/libpts/Makefile.am b/src/libpts/Makefile.am
index 33f7e01047..bf0cbf920d 100644
--- a/src/libpts/Makefile.am
+++ b/src/libpts/Makefile.am
@@ -9,13 +9,14 @@ libpts_la_SOURCES = \
 	libpts.h libpts.c \
 	pts/pts.h pts/pts.c \
 	pts/pts_error.h pts/pts_error.c \
-	pts/pts_proto_caps.h pts/pts_funct_comp_name.h pts/pts_file_type.h \
+	pts/pts_proto_caps.h pts/pts_funct_comp_name.h \
 	pts/pts_creds.h pts/pts_creds.c \
 	pts/pts_database.h pts/pts_database.c \
+	pts/pts_dh_group.h pts/pts_dh_group.c \
 	pts/pts_file_meas.h pts/pts_file_meas.c \
 	pts/pts_file_meta.h pts/pts_file_meta.c \
+	pts/pts_file_type.h pts/pts_file_type.c \
 	pts/pts_meas_algo.h pts/pts_meas_algo.c \
-	pts/pts_dh_group.h pts/pts_dh_group.c \
 	tcg/tcg_attr.h tcg/tcg_attr.c \
 	tcg/tcg_pts_attr_proto_caps.h tcg/tcg_pts_attr_proto_caps.c \
 	tcg/tcg_pts_attr_dh_nonce_params_req.h tcg/tcg_pts_attr_dh_nonce_params_req.c \
diff --git a/src/libpts/pts/pts_file_type.h b/src/libpts/pts/pts_file_type.h
index 805ec12fbe..c1d2368880 100644
--- a/src/libpts/pts/pts_file_type.h
+++ b/src/libpts/pts/pts_file_type.h
@@ -21,6 +21,8 @@
 #ifndef PTS_FILE_TYPE_H_
 #define PTS_FILE_TYPE_H_
 
+#include <library.h>
+
 typedef enum pts_file_type_t pts_file_type_t;
 
 /**
@@ -34,16 +36,28 @@ enum pts_file_type_t {
 	PTS_FILE_FIFO =					0x0001,
 	/** Character special file */
 	PTS_FILE_CHAR_SPEC =			0x0002,
+	/** Reserved */
+	PTS_FILE_RESERVED_3 =			0x0003,
 	/** Directory */
 	PTS_FILE_DIRECTORY =			0x0004,
+	/** Reserved */
+	PTS_FILE_RESERVED_5 =			0x0005,
 	/** Block special file */
 	PTS_FILE_BLOCK_SPEC =			0x0006,
+	/** Reserved */
+	PTS_FILE_RESERVED_7 =			0x0007,
 	/** Regular file */
 	PTS_FILE_REGULAR =		 		0x0008,
+	/** Reserved */
+	PTS_FILE_RESERVED_9 =			0x0009,
 	/** Symbolic link */
 	PTS_FILE_SYM_LINK =			 	0x000A,
+	/** Reserved */
+	PTS_FILE_RESERVED_11 =			0x000B,
 	/** Socket communication special file */
 	PTS_FILE_SOCKET =			 	0x000C,
 };
 
+extern enum_name_t *pts_file_type_names;
+
 #endif /** PTS_FILE_TYPE_H_ @}*/