diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-07-28 15:45:05 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-07-28 15:45:05 +0000 |
| commit | 6116d2a9cd44cfad4c8bd2e4c9b706ac5d1c8a80 (patch) | |
| tree | 21868593ec7aead127339f27aee7b3aa74bcc4b0 /sbin | |
| parent | e4c9e562f90d1de6043ec5299637df2d50d66289 (diff) | |
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.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/iked/ikev2_pld.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |