From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 18 Jun 2014 09:31:49 +0000 (+0200)
Subject: starter: Add --conftest option to test ipsec.conf syntax
X-Git-Tag: 5.2.0rc1~28^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d88617e7dcf5884dd36fce1fa119721dab5d4d1;p=thirdparty%2Fstrongswan.git

starter: Add --conftest option to test ipsec.conf syntax
---

diff --git a/src/starter/starter.c b/src/starter/starter.c
index 33916c95c5..ef5780843a 100644
--- a/src/starter/starter.c
+++ b/src/starter/starter.c
@@ -418,6 +418,7 @@ int main (int argc, char **argv)
 	bool no_fork = FALSE;
 	bool attach_gdb = FALSE;
 	bool load_warning = FALSE;
+	bool conftest = FALSE;
 
 	library_init(NULL, "starter");
 	atexit(library_deinit);
@@ -467,6 +468,10 @@ int main (int argc, char **argv)
 		{
 			config_file = argv[++i];
 		}
+		else if (streq(argv[i], "--conftest"))
+		{
+			conftest = TRUE;
+		}
 		else
 		{
 			usage(argv[0]);
@@ -485,6 +490,28 @@ int main (int argc, char **argv)
 
 	init_log("ipsec_starter");
 
+	if (conftest)
+	{
+		int status = LSB_RC_SUCCESS;
+
+		cfg = confread_load(config_file);
+		if (cfg == NULL || cfg->err > 0)
+		{
+			DBG1(DBG_APP, "config invalid!");
+			status = LSB_RC_INVALID_ARGUMENT;
+		}
+		else
+		{
+			DBG1(DBG_APP, "config OK");
+		}
+		if (cfg)
+		{
+			confread_free(cfg);
+		}
+		cleanup();
+		exit(status);
+	}
+
 	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",