diff options
| author |   hshoexer <hshoexer@openbsd.org> | 2005-06-02 19:49:23 +0000 |
|---|---|---|
| committer | hshoexer <hshoexer@openbsd.org> | 2005-06-02 19:49:23 +0000 |
| commit | b14af00816997344dcec25b07c49ed5e6e52714e (patch) | |
| tree | 751cb0512f83852ff1181c0d971f6a26a172849a | |
| parent | add -O to getopt (ok otto) and sync usage (diff) | |
| download | wireguard-openbsd-b14af00816997344dcec25b07c49ed5e6e52714e.tar.xz wireguard-openbsd-b14af00816997344dcec25b07c49ed5e6e52714e.zip | |
unbreak port floating, noticed by sean at obstacle9 dot com
ok cloder
| -rw-r--r-- | sbin/isakmpd/nat_traversal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/isakmpd/nat_traversal.c b/sbin/isakmpd/nat_traversal.c index a94c1b8e6d6..583e9d890c5 100644 --- a/sbin/isakmpd/nat_traversal.c +++ b/sbin/isakmpd/nat_traversal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nat_traversal.c,v 1.14 2005/05/18 20:04:51 hshoexer Exp $ */ +/* $OpenBSD: nat_traversal.c,v 1.15 2005/06/02 19:49:23 hshoexer Exp $ */ /* * Copyright (c) 2004 Håkan Olsson. All rights reserved. @@ -327,8 +327,8 @@ nat_t_match_nat_d_payload(struct message *msg, struct sockaddr *sa) * If there are no NAT-D payloads in the message, return "found" * as this will avoid NAT-T (see nat_t_exchange_check_nat_d()). */ - p = payload_first(msg, ISAKMP_PAYLOAD_NAT_D_DRAFT); - if (!p) + if ((p = payload_first(msg, ISAKMP_PAYLOAD_NAT_D_DRAFT)) == NULL && + (p = payload_first(msg, ISAKMP_PAYLOAD_NAT_D)) == NULL) return 1; hbuf = nat_t_generate_nat_d_hash(msg, sa, &hbuflen); |