diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2017-08-20 11:00:00 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-08-20 11:00:00 +0200 |
| commit | afe8b6f496dd4e0e3aaaa5dec0d6fb32253a49f7 (patch) | |
| tree | bbc576afefa6d1f0c6708fd9894ef69e3a67eeb4 /src/ipcpd | |
| parent | eefae235dd7af96eef3dc4f82f706170c379d260 (diff) | |
| parent | 45c77a507ed275830633849f368c4ed5b4831328 (diff) | |
| download | ouroboros-afe8b6f496dd4e0e3aaaa5dec0d6fb32253a49f7.tar.gz ouroboros-afe8b6f496dd4e0e3aaaa5dec0d6fb32253a49f7.zip | |
Merge branch 'testing' into be
Diffstat (limited to 'src/ipcpd')
| -rw-r--r-- | src/ipcpd/ipcp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c index 7066fb04..368c6eb8 100644 --- a/src/ipcpd/ipcp.c +++ b/src/ipcpd/ipcp.c @@ -58,8 +58,6 @@ void ipcp_sig_handler(int sig, if (ipcp_get_state() == IPCP_OPERATIONAL) ipcp_set_state(IPCP_SHUTDOWN); } - - tpm_stop(); default: return; } @@ -689,8 +687,9 @@ int ipcp_boot() void ipcp_shutdown() { - tpm_fini(); pthread_join(ipcpi.acceptor, NULL); + tpm_stop(); + tpm_fini(); log_info("IPCP %d shutting down.", getpid()); } |