From: jsg <jsg@openbsd.org>
Date: Wed, 28 Jul 2010 15:45:04 +0000 (+0000)
Subject: Change back to the pre rev 1.11 behaviour of not treating unexpected
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1dc68808c65143159ac7ff26c9c8f27287bedadd;p=openbsd

Change back to the pre rev 1.11 behaviour of not treating unexpected
id payloads as errors.  Lets interop with strongSwan which sends
both IDi and IDr work again.
---

diff --git a/sbin/iked/ikev2_pld.c b/sbin/iked/ikev2_pld.c
index 4f6d45d8ffa..cf14e2c78a0 100644
--- a/sbin/iked/ikev2_pld.c
+++ b/sbin/iked/ikev2_pld.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ikev2_pld.c,v 1.13 2010/07/03 16:59:35 reyk Exp $	*/
+/*	$OpenBSD: ikev2_pld.c,v 1.14 2010/07/28 15:45:04 jsg Exp $	*/
 /*	$vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $	*/
 
 /*
@@ -460,7 +460,7 @@ ikev2_pld_id(struct iked *env, struct ikev2_payload *pld,
 	if (!((sa->sa_hdr.sh_initiator && payload == IKEV2_PAYLOAD_IDr) ||
 	    (!sa->sa_hdr.sh_initiator && payload == IKEV2_PAYLOAD_IDi))) {
 		log_debug("%s: unexpected id payload", __func__);
-		return (-1);
+		return (0);
 	}
 
 	idp = &msg->msg_parent->msg_id;