From 56a98ebf1a14b74cb4e90f208c17583ef482fa65 Mon Sep 17 00:00:00 2001
From: Niklas Hallqvist <niklas@cvs.openbsd.org>
Date: Wed, 26 Jan 2000 15:20:57 +0000
Subject: Merge with EOM 1.137

author: ho
Log a reason for dropping the message.

author: niklas
Some systems need to cast iov_base
---
 sbin/isakmpd/message.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'sbin/isakmpd')

diff --git a/sbin/isakmpd/message.c b/sbin/isakmpd/message.c
index a1482c2ac5a..b7e23e950fe 100644
--- a/sbin/isakmpd/message.c
+++ b/sbin/isakmpd/message.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: message.c,v 1.22 1999/08/26 22:27:51 niklas Exp $	*/
-/*	$EOM: message.c,v 1.135 1999/08/18 00:44:56 angelos Exp $	*/
+/*	$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 $	*/
 
 /*
  * Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
@@ -184,7 +184,7 @@ message_free (struct message *msg)
   log_debug (LOG_MESSAGE, 20, "message_free: freeing %p", msg);
   if (!msg)
     return;
-  if (msg->orig && msg->orig != msg->iov[0].iov_base)
+  if (msg->orig && msg->orig != (u_int8_t *)msg->iov[0].iov_base)
     free (msg->orig);
   if (msg->iov)
     {
@@ -1700,6 +1700,7 @@ message_negotiate_sa (struct message *msg,
 	       * down one of the offers, can we?  I suggest renaming
 	       * message_drop to something else.
 	       */
+	      log_print ("message_negotiate_sa: no compatible proposal found");
 	      message_drop (msg, ISAKMP_NOTIFY_NO_PROPOSAL_CHOSEN, 0, 1, 0);
 	    }
 	  sa = TAILQ_NEXT (sa, next);
-- 
cgit v1.2.3