From: Mirko Parthey <mirko.parthey@informatik.tu-chemnitz.de>
Date: Mon, 24 Oct 2011 23:25:15 +0000 (+0200)
Subject: Fix DNS error handling for keyexchange=ike.
X-Git-Tag: 4.6.0~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3da58aaa926e633e01c3a8abcc65d0b76939dea;p=thirdparty%2Fstrongswan.git

Fix DNS error handling for keyexchange=ike.

starter fails to load a connection when a peer's DNS name is temporarily
unresolvable and keyexchange=ike was specified, which defaults to IKEv2.
The connection loads just fine in case of keyexchange=ikev2.
---

diff --git a/src/starter/confread.c b/src/starter/confread.c
index 5f96fb1bc4..089be1aa51 100644
--- a/src/starter/confread.c
+++ b/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_IKEV2)
+		else if (!end->host || conn->keyexchange == KEY_EXCHANGE_IKEV1)
 		{
 			/* declare an error */
 			cfg->err++;