summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormoritz <moritz@openbsd.org>2005-07-20 16:50:43 +0000
committermoritz <moritz@openbsd.org>2005-07-20 16:50:43 +0000
commit5662f85d72697a70c1a7bda5f771722e5f3f410d (patch)
tree4ca43e85b57fe89119b376296cf07792efff7bd1
parentReintroduce the changes made by tedu in revision 1.50 of ffs_softdep.c, (diff)
downloadwireguard-openbsd-5662f85d72697a70c1a7bda5f771722e5f3f410d.tar.xz
wireguard-openbsd-5662f85d72697a70c1a7bda5f771722e5f3f410d.zip
revert one TAILQ_FOREACH conversion from r1.112 which was
wrong and broke some isakmpd setups. ok hshoexer@
-rw-r--r--sbin/isakmpd/message.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sbin/isakmpd/message.c b/sbin/isakmpd/message.c
index 36c5a6ffd94..d2d157267ea 100644
--- a/sbin/isakmpd/message.c
+++ b/sbin/isakmpd/message.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: message.c,v 1.113 2005/06/26 20:49:24 hshoexer Exp $ */
+/* $OpenBSD: message.c,v 1.114 2005/07/20 16:50:43 moritz Exp $ */
/* $EOM: message.c,v 1.156 2000/10/10 12:36:39 provos Exp $ */
/*
@@ -2118,7 +2118,8 @@ message_negotiate_sa(struct message *msg, int (*validate)(struct exchange *,
*/
sa = TAILQ_FIRST(&exchange->sa_list);
- TAILQ_FOREACH(tp, &msg->payload[ISAKMP_PAYLOAD_TRANSFORM], link) {
+ for (tp = payload_first(msg, ISAKMP_PAYLOAD_TRANSFORM); tp;
+ tp = next_tp) {
propp = tp->context;
sap = propp->context;
sap->flags |= PL_MARK;