Do not ignore configs for IKEv1 in charon anymore

src/starter/confread.c

@@ -466,7 +466,7 @@ static void handle_dns_failure(const char *label, starter_end_t *end,
 			plog("# fallback to %s=%%any due to '%%' prefix or %sallowany=yes",
 				label, label);
 		}
-		else if (!end->host || conn->keyexchange == KEY_EXCHANGE_IKEV1)
+		else if (!end->host)
 		{
 			/* declare an error */
 			cfg->err++;

src/starter/starter.c

@@ -764,14 +764,11 @@ int main (int argc, char **argv)
 
 					if (conn->startup == STARTUP_START)
 					{
-						if (conn->keyexchange != KEY_EXCHANGE_IKEV1)
+						if (starter_charon_pid())
 						{
-							if (starter_charon_pid())
-							{
-								starter_stroke_initiate_conn(conn);
-							}
+							starter_stroke_initiate_conn(conn);
 						}
-						else
+						if (conn->keyexchange == KEY_EXCHANGE_IKEV1)
 						{
 							if (starter_pluto_pid())
 							{
@@ -781,14 +778,11 @@ int main (int argc, char **argv)
 					}
 					else if (conn->startup == STARTUP_ROUTE)
 					{
-						if (conn->keyexchange != KEY_EXCHANGE_IKEV1)
+						if (starter_charon_pid())
 						{
-							if (starter_charon_pid())
-							{
-								starter_stroke_route_conn(conn);
-							}
+							starter_stroke_route_conn(conn);
 						}
-						else
+						if (conn->keyexchange == KEY_EXCHANGE_IKEV1)
 						{
 							if (starter_pluto_pid())
 							{