diff options
| -rw-r--r-- | tools/vtpm/Makefile | 6 | ||||
| -rw-r--r-- | tools/vtpm_manager/Makefile | 2 | ||||
| -rw-r--r-- | tools/vtpm_manager/manager/Makefile | 2 | ||||
| -rw-r--r-- | tools/vtpm_manager/manager/vtpmd.c | 18 | ||||
| -rw-r--r-- | tools/vtpm_manager/util/log.c | 2 |
5 files changed, 13 insertions, 17 deletions
diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile index 8224a9d304..59efb7936c 100644 --- a/tools/vtpm/Makefile +++ b/tools/vtpm/Makefile @@ -22,10 +22,10 @@ install: build $(MAKE) -C $(VTPM_DIR) $@ clean: - if [ -d $(TPM_EMULATOR_DIR) ]; \ + @if [ -d $(TPM_EMULATOR_DIR) ]; \ then $(MAKE) -C $(TPM_EMULATOR_DIR) clean; \ fi - if [ -d $(VTPM_DIR) ]; \ + @if [ -d $(VTPM_DIR) ]; \ then $(MAKE) -C $(VTPM_DIR) clean; \ fi @@ -57,7 +57,7 @@ $(VTPM_DIR): $(TPM_EMULATOR_TARFILE) patch -p1 <../vtpm.patch build_sub: - if [ -e $(GMP_HEADER) ]; then \ + @if [ -e $(GMP_HEADER) ]; then \ $(MAKE) -C $(VTPM_DIR); \ if [ "$(BUILD_EMULATOR)" = "y" ]; then \ $(MAKE) -C $(TPM_EMULATOR_DIR); \ diff --git a/tools/vtpm_manager/Makefile b/tools/vtpm_manager/Makefile index 16825a2279..f57b82facb 100644 --- a/tools/vtpm_manager/Makefile +++ b/tools/vtpm_manager/Makefile @@ -9,7 +9,7 @@ OPENSSL_HEADER = /usr/include/openssl/crypto.h all: build build: - if [ -e $(OPENSSL_HEADER) ]; then \ + @if [ -e $(OPENSSL_HEADER) ]; then \ @set -e; for subdir in $(SUBDIRS); do \ $(MAKE) -C $$subdir $@; \ done; \ diff --git a/tools/vtpm_manager/manager/Makefile b/tools/vtpm_manager/manager/Makefile index 6bf28e6066..e6f20f5a5e 100644 --- a/tools/vtpm_manager/manager/Makefile +++ b/tools/vtpm_manager/manager/Makefile @@ -24,4 +24,4 @@ $(BIN): $(OBJS) # libraries LIBS += ../tcs/libTCS.a ../util/libTCGUtils.a ../crypto/libtcpaCrypto.a -LIBS += -lcrypto -lpthread -lrt -lm +LIBS += -lcrypto -lpthread -lm diff --git a/tools/vtpm_manager/manager/vtpmd.c b/tools/vtpm_manager/manager/vtpmd.c index 8e07ac3587..a9fb9fedff 100644 --- a/tools/vtpm_manager/manager/vtpmd.c +++ b/tools/vtpm_manager/manager/vtpmd.c @@ -54,21 +54,15 @@ void signal_handler(int reason) { #ifndef VTPM_MULTI_VM if (pthread_equal(pthread_self(), vtpm_globals->master_pid)) { - if (reason >= 0) { // Reason is a signal - vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager shutting down for signal %d.\n", reason); - } else {// Reason is a TPM_RESULT * -1 - vtpmloginfo(VTPM_LOG_VTPM,"VTPM Manager shuting down for: %s\n", tpm_get_error_name(-1 * reason) ); - } - - return; + vtpmloginfo(VTPM_LOG_VTPM, "VTPM Manager shutting down for signal %d.\n", reason); } else { + // For old Linux Thread machines, signals are delivered to each thread. Deal with them. vtpmloginfo(VTPM_LOG_VTPM, "Child shutting down\n"); pthread_exit(NULL); } -#else +#endif VTPM_Stop_Service(); exit(-1); -#endif } struct sigaction ctl_c_handler; @@ -127,8 +121,10 @@ int main(int argc, char **argv) { //Join the other threads until exit time. pthread_join(be_thread, NULL); pthread_join(dmi_thread, NULL); - +#endif + + vtpmlogerror(VTPM_LOG_VTPM, "VTPM Manager shut down unexpectedly.\n"); + VTPM_Stop_Service(); return 0; -#endif } diff --git a/tools/vtpm_manager/util/log.c b/tools/vtpm_manager/util/log.c index 38382d7625..75fe91a12a 100644 --- a/tools/vtpm_manager/util/log.c +++ b/tools/vtpm_manager/util/log.c @@ -138,5 +138,5 @@ const char* tpm_get_error_name (TPM_RESULT code) { if (code == error_msgs[i].code) return error_msgs[i].code_name; - return "Failed to find code name for given code"; + return("Unknown Error Code"); } |