Trivial bugfix in RFC2407 4.6.2 conformance, from Matthew Grooms

This commit is contained in:
manu 2006-09-16 04:31:38 +00:00
parent 7af1255b2a
commit 5a85c00571
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2006-08-16 Emmanuel Dreyfus <manu@netbsd.org>
From Matthew Grooms:
* src/racoon/ipsec_doi.c: Trivial bugfix in RFC2407 4.6.2 conformance
2006-08-15 Emmanuel Dreyfus <manu@netbsd.org>
* src/racoon/ipsec_doi.c: fix build on Linux

View File

@ -1,4 +1,4 @@
/* $NetBSD: ipsec_doi.c,v 1.14 2006/09/15 09:40:45 manu Exp $ */
/* $NetBSD: ipsec_doi.c,v 1.15 2006/09/16 04:31:38 manu Exp $ */
/* Id: ipsec_doi.c,v 1.55 2006/08/17 09:20:41 vanhu Exp */
@ -3335,7 +3335,7 @@ ipsecdoi_checkid1(iph1)
}
/* if phase 1 ID payload conformed RFC2407 4.6.2. */
if (id_b->type == IPSECDOI_ID_IPV4_ADDR &&
if (id_b->type == IPSECDOI_ID_IPV4_ADDR ||
id_b->type == IPSECDOI_ID_IPV6_ADDR) {
if (id_b->proto_id == 0 && ntohs(id_b->port) != 0) {