diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-30 09:47:56 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-30 09:47:56 +0000 |
commit | 79a07e8c3db4997f6adaf940a08446f2eef36079 (patch) | |
tree | 94adcdbb346b3facb6aefb15388e6873fed7cdc8 /sbin/isakmpd | |
parent | bbabecf5caa99eca0c614a51500e2bc09dcdcda0 (diff) |
Merge with EOM 1.139
author: niklas
Oops in last commit
author: niklas
Only upgrade exchanges that are still without a responder cookie
Diffstat (limited to 'sbin/isakmpd')
-rw-r--r-- | sbin/isakmpd/message.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sbin/isakmpd/message.c b/sbin/isakmpd/message.c index b7e23e950fe..9f6f0c14cad 100644 --- a/sbin/isakmpd/message.c +++ b/sbin/isakmpd/message.c @@ -1,5 +1,5 @@ -/* $OpenBSD: message.c,v 1.23 2000/01/26 15:20:56 niklas Exp $ */ -/* $EOM: message.c,v 1.137 1999/12/17 17:10:23 ho Exp $ */ +/* $OpenBSD: message.c,v 1.24 2000/01/30 09:47:55 niklas Exp $ */ +/* $EOM: message.c,v 1.139 2000/01/30 09:52:00 niklas Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -868,7 +868,9 @@ message_recv (struct message *msg) { msg->exchange = exchange_lookup_from_icookie (buf + ISAKMP_HDR_ICOOKIE_OFF); - if (msg->exchange) + if (msg->exchange + && zero_test (msg->exchange->cookies + ISAKMP_HDR_RCOOKIE_OFF, + ISAKMP_HDR_RCOOKIE_LEN)) exchange_upgrade_p1 (msg); else { |