diff options
| -rw-r--r-- | src/charon-tkm/src/tkm/tkm.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/charon-tkm/src/tkm/tkm.c b/src/charon-tkm/src/tkm/tkm.c index 47e1eb963..9cf54b087 100644 --- a/src/charon-tkm/src/tkm/tkm.c +++ b/src/charon-tkm/src/tkm/tkm.c @@ -14,6 +14,8 @@ * for more details. */ +#include <daemon.h> + #include <tkm/client.h> #include <tkm/constants.h> @@ -61,16 +63,25 @@ bool tkm_init() /* initialize TKM client library */ tkmlib_init(); - ehandler_init(); - if (ike_init(IKE_SOCKET) != TKM_OK) + const char * const ikesock = lib->settings->get_str(lib->settings, + "%s.ike_socket", + IKE_SOCKET, + charon->name); + if (ike_init(ikesock) != TKM_OK) { tkmlib_final(); return FALSE; } - - ees_server_init(EES_SOCKET); + DBG1(DBG_DMN, "connected to TKM via socket '%s'", ikesock); + + const char * const eessock = lib->settings->get_str(lib->settings, + "%s.ees_socket", + EES_SOCKET, + charon->name); + ees_server_init(eessock); + DBG1(DBG_DMN, "serving EES requests on socket '%s'", eessock); if (ike_tkm_reset() != TKM_OK) { |