*** src/include/tcsd.h.old	Fri Dec  5 07:47:11 2008
--- src/include/tcsd.h	Fri Dec  5 07:48:44 2008
***************
*** 48,61 ****
--- 48,70 ----
  							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_FILE	"/var/tpm/system/system.data"
+ #define TCSD_DEFAULT_SYSTEM_PS_DIR	"/var/tpm/system"
+ #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