From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 5 May 2015 16:11:50 +0000 (+0200)
Subject: starter: Ensure the daemon executable exists when starting up
X-Git-Tag: 5.3.1rc1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95faeaa7edc6a03b1818a37fd0fb79b5d7420d68;p=thirdparty%2Fstrongswan.git

starter: Ensure the daemon executable exists when starting up

The only purpose of starter is to control the IKE daemon, so we
terminate it if the daemon executable is not found (e.g. because
DAEMON_NAME is incorrect).

This removes the charonstart setting (it was not actually configurable
anymore).
---

diff --git a/src/starter/confread.c b/src/starter/confread.c
index 3943f9abec..c3a0ac07fd 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,10 +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 */
-	cfg->setup.charonstart = cfg->setup.charonstart &&
-							 daemon_exists(daemon_name, cmd);
 }
 
 /*
@@ -718,7 +703,6 @@ starter_config_t* confread_load(const char *file)
 	INIT(cfg,
 		.setup = {
 			.uniqueids = TRUE,
-			.charonstart = TRUE,
 		}
 	);
 
diff --git a/src/starter/confread.h b/src/starter/confread.h
index 0eea988490..457327f185 100644
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -193,7 +193,6 @@ typedef struct starter_config starter_config_t;
 
 struct starter_config {
 		struct {
-				bool     charonstart;
 				char     *charondebug;
 				bool     uniqueids;
 				bool     cachecrls;
diff --git a/src/starter/starter.c b/src/starter/starter.c
index 74b5b52861..a192989230 100644
--- a/src/starter/starter.c
+++ b/src/starter/starter.c
@@ -517,6 +517,13 @@ int main (int argc, char **argv)
 		exit(status);
 	}
 
+	if (stat(cmd, &stb) != 0)
+	{
+		DBG1(DBG_APP, "IKE daemon '%s' not found", cmd);
+		cleanup();
+		exit(LSB_RC_FAILURE);
+	}
+
 	DBG1(DBG_APP, "Starting %sSwan "VERSION" IPsec [starter]...",
 		lib->settings->get_bool(lib->settings,
 			"charon.i_dont_care_about_security_and_use_aggressive_mode_psk",
@@ -836,7 +843,7 @@ int main (int argc, char **argv)
 		 */
 		if (_action_ & FLAG_ACTION_START_CHARON)
 		{
-			if (cfg->setup.charonstart && !starter_charon_pid())
+			if (!starter_charon_pid())
 			{
 				DBG2(DBG_APP, "Attempting to start %s...", daemon_name);
 				if (starter_start_charon(cfg, no_fork, attach_gdb))