charon-tkm: Make piddir configurable

diff --git a/src/charon-tkm/src/charon-tkm.c b/src/charon-tkm/src/charon-tkm.c
index 7c60f0ca80bacb68e9f6c098dbccda0d33dd89fd..2db5a08eaafcdd3a481baab19863fbaf28c87a23 100644 (file)
--- a/src/charon-tkm/src/charon-tkm.c
+++ b/src/charon-tkm/src/charon-tkm.c
@@ -230,7 +230,8 @@ static void unlink_pidfile()
  */
 int main(int argc, char *argv[])
 {
-       char *dmn_name;
+       char *dmn_name, *piddir;
+
        if (argc > 0 && strlen(argv[0]) > 0)
        {
                dmn_name = basename(argv[0]);
@@ -320,11 +321,13 @@ int main(int argc, char *argv[])
        lib->plugins->status(lib->plugins, LEVEL_CTRL);
 
        /* set global pidfile name depending on daemon name */
-       if (asprintf(&pidfile_name, IPSEC_PIDDIR"/%s.pid", dmn_name) < 0)
+       piddir = lib->settings->get_str(lib->settings, "%s.piddir", IPSEC_PIDDIR,
+                                                                       dmn_name);
+       if (asprintf(&pidfile_name, "%s/%s.pid", piddir, dmn_name) < 0)
        {
                DBG1(DBG_DMN, "unable to set pidfile name - aborting %s", dmn_name);
                goto deinit;
-       };
+       }
 
        if (check_pidfile())
        {
@@ -386,6 +389,7 @@ int main(int argc, char *argv[])
        lib->encoding->remove_encoder(lib->encoding, tkm_encoder_encode);
 
 deinit:
+       free(pidfile_name);
        destroy_dh_mapping();
        libcharon_deinit();
        libhydra_deinit();