summaryrefslogtreecommitdiff
path: root/src/starter/confread.c
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@debian.org>2015-06-01 14:46:30 +0200
committerYves-Alexis Perez <corsac@debian.org>2015-06-01 14:46:30 +0200
commitfc556ec2bc92a9d476c11406fad2c33db8bf7cb0 (patch)
tree7360889e50de867d72741213d534a756c73902c8 /src/starter/confread.c
parent83b8aebb19fe6e49e13a05d4e8f5ab9a06177642 (diff)
downloadvyos-strongswan-fc556ec2bc92a9d476c11406fad2c33db8bf7cb0.tar.gz
vyos-strongswan-fc556ec2bc92a9d476c11406fad2c33db8bf7cb0.zip
Imported Upstream version 5.3.1
Diffstat (limited to 'src/starter/confread.c')
-rw-r--r--src/starter/confread.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/src/starter/confread.c b/src/starter/confread.c
index de9099a1b..c3a0ac07f 100644
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -50,17 +50,6 @@ static const char firewall_defaults[] = IPSEC_SCRIPT " _updown iptables";
*/
extern kw_entry_t *in_word_set (char *str, unsigned int len);
-static bool daemon_exists(char *daemon, char *path)
-{
- struct stat st;
- if (stat(path, &st) != 0)
- {
- DBG1(DBG_APP, "Disabling %sstart option, '%s' not found", daemon, path);
- return FALSE;
- }
- return TRUE;
-}
-
/**
* Process deprecated keywords
*/
@@ -147,14 +136,6 @@ static void load_setup(starter_config_t *cfg, conf_parser_t *parser)
}
enumerator->destroy(enumerator);
dict->destroy(dict);
-
- /* verify the executables are actually available */
-#ifdef START_CHARON
- cfg->setup.charonstart = cfg->setup.charonstart &&
- daemon_exists(daemon_name, cmd);
-#else
- cfg->setup.charonstart = FALSE;
-#endif
}
/*
@@ -722,12 +703,8 @@ starter_config_t* confread_load(const char *file)
INIT(cfg,
.setup = {
.uniqueids = TRUE,
-
}
);
-#ifdef START_CHARON
- cfg->setup.charonstart = TRUE;
-#endif
/* load config setup section */
load_setup(cfg, parser);