Merge with EOM 1.74

refcount the exchange when delayed processing is scheduled for QM

1999 copyrights

1 files changed, 6 insertions, 3 deletions

diff --git a/sbin/isakmpd/ike_quick_mode.c b/sbin/isakmpd/ike_quick_mode.c
index 5504e996a8b..ed3d79d56f1 100644
--- a/sbin/isakmpd/ike_quick_mode.c
+++ b/sbin/isakmpd/ike_quick_mode.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: ike_quick_mode.c,v 1.9 1999/03/31 20:29:57 niklas Exp $	*/
-/*	$EOM: ike_quick_mode.c,v 1.72 1999/03/31 20:22:16 niklas Exp $	*/
+/*	$OpenBSD: ike_quick_mode.c,v 1.10 1999/04/03 09:14:52 niklas Exp $	*/
+/*	$EOM: ike_quick_mode.c,v 1.74 1999/04/03 09:13:55 niklas Exp $	*/
 
 /*
- * Copyright (c) 1998 Niklas Hallqvist.  All rights reserved.
+ * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -729,6 +729,7 @@ initiator_send_HASH (struct message *msg)
   if (ie->group)
     message_register_post_send (msg, gen_g_xy);
   sa_reference (msg->isakmp_sa);
+  exchange_reference (exchange);
   message_register_post_send (msg, post_quick_mode);
 
   return 0;
@@ -836,6 +837,7 @@ post_quick_mode (struct message *msg)
 	}
     }
   sa_release (isakmp_sa);
+  exchange_release (exchange);
 }
 
 /*
@@ -1212,6 +1214,7 @@ responder_recv_HASH (struct message *msg)
     }
 
   sa_reference (msg->isakmp_sa);
+  exchange_reference (exchange);
   post_quick_mode (msg);
 
   return 0;