From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 12 Jun 2012 09:42:00 +0000 (+0200)
Subject: Revert "starter: Don't treat unsupported keywords as fatal errors just report them."
X-Git-Tag: 5.0.0~118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c7a219804fa57635651899f80cc58d9c536eb79;p=thirdparty%2Fstrongswan.git

Revert "starter: Don't treat unsupported keywords as fatal errors just report them."

This reverts commit e55876a657ae9d4bbf14320e5a14f86cc5c31c7f.
---

diff --git a/src/starter/confread.c b/src/starter/confread.c
index 0496047e9a..f4c697d233 100644
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -125,7 +125,7 @@ static void load_setup(starter_config_t *cfg, config_parsed_t *cfgp)
 		{
 			DBG1(DBG_APP, "# unsupported keyword '%s' in config setup",
 				 kw->entry->name);
-			cfg->non_fatal_err++;
+			cfg->err++;
 			continue;
 		}
 
@@ -442,7 +442,7 @@ static void load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg
 		{
 			DBG1(DBG_APP, "# unsupported keyword '%s' in conn '%s'",
 				 kw->entry->name, conn_name);
-			cfg->non_fatal_err++;
+			cfg->err++;
 			continue;
 		}
 
@@ -627,7 +627,7 @@ static void load_ca(starter_ca_t *ca, kw_list_t *kw, starter_config_t *cfg)
 		{
 			DBG1(DBG_APP, "# unsupported keyword '%s' in ca '%s'",
 				 kw->entry->name, ca_name);
-			cfg->non_fatal_err++;
+			cfg->err++;
 			continue;
 		}