aboutsummaryrefslogtreecommitdiffstats
path: root/src/starter/confread.c
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2013-03-19 15:25:38 +0100
committerTobias Brunner <tobias@strongswan.org>2013-03-19 15:25:38 +0100
commit7f0f185bedf6b67ef5dac3d74e7e4f875d95fce2 (patch)
tree3dc37f41df2b66b0c50c602b3f677cae9861b446 /src/starter/confread.c
parentdeafaf51f1c768ce1dbdc7ff7ac91f7fb4ea5e21 (diff)
parent7cc6fa1a983a668bd884e08f0e453637d4702cbe (diff)
downloadstrongswan-7f0f185bedf6b67ef5dac3d74e7e4f875d95fce2.tar.bz2
strongswan-7f0f185bedf6b67ef5dac3d74e7e4f875d95fce2.tar.xz
Merge branch 'tkm'
This adds charon-tkm a special build of the charon IKEv2 daemon that delegates security critical operations to a separate process (TKM = Trusted Key Manager).
Diffstat (limited to 'src/starter/confread.c')
-rw-r--r--src/starter/confread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/starter/confread.c b/src/starter/confread.c
index 883534aad..f0f05b036 100644
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -190,7 +190,7 @@ static void load_setup(starter_config_t *cfg, config_parsed_t *cfgp)
/* verify the executables are actually available */
#ifdef START_CHARON
cfg->setup.charonstart = cfg->setup.charonstart &&
- daemon_exists("charon", CHARON_CMD);
+ daemon_exists(daemon_name, cmd);
#else
cfg->setup.charonstart = FALSE;
#endif