components/trousers/patches/include_tcsd.h.patch
author Dan Anderson <dan.anderson@oracle.com>
Wed, 18 Apr 2012 16:24:54 -0700
changeset 780 dda31545a88b
parent 777 e2e604cdbd6a
child 5941 db8aa9865e9f
permissions -rw-r--r--
7123028 Problem with crypto/tss (fix patch) 7041927 tcsd and libtspi should not use TCP/IP sockets (fix patch) 7002966 libtspi can segv in .fini section 7160939 trousers should depend on iconv/utf-8 instead of iconv/unicode-core

--- src/include/tcsd.h	2010-05-02 19:54:15.000000000 -0700
+++ src/include/tcsd.h	2012-04-11 12:43:21.508009000 -0700
@@ -48,14 +48,24 @@
 							of this TCS System */
 };
 
+#ifdef SOLARIS
+#define	TCSD_CONFIG_FILE	"/etc/security/tcsd.conf"
+#else
 #define TCSD_CONFIG_FILE	ETC_PREFIX "/tcsd.conf"
+#endif
 
 #define TSS_USER_NAME		"tss"
 #define TSS_GROUP_NAME		"tss"
 
 #define TCSD_DEFAULT_MAX_THREADS	10
+#ifdef SOLARIS
+#define	TCSD_DEFAULT_SYSTEM_PS_DIR	"/var/tpm/system"
+#define	TCSD_DEFAULT_SYSTEM_PS_FILE	"/var/tpm/system/system.data"
+#define	TCSD_DEFAULT_SOCKET		"/var/tpm/tcsd-socket"
+#else
 #define TCSD_DEFAULT_SYSTEM_PS_FILE	VAR_PREFIX "/lib/tpm/system.data"
 #define TCSD_DEFAULT_SYSTEM_PS_DIR	VAR_PREFIX "/lib/tpm"
+#endif /* SOLARIS */
 #define TCSD_DEFAULT_FIRMWARE_LOG_FILE	"/sys/kernel/security/tpm0/binary_bios_measurements"
 #define TCSD_DEFAULT_KERNEL_LOG_FILE	"/sys/kernel/security/ima/binary_runtime_measurements"
 #define TCSD_DEFAULT_FIRMWARE_PCRS	0x00000000