Small cleanup.

5 files changed, 8 insertions, 13 deletions

diff --git a/sbin/isakmpd/cookie.c b/sbin/isakmpd/cookie.c
index f13672e4be4..34190fc7907 100644
--- a/sbin/isakmpd/cookie.c
+++ b/sbin/isakmpd/cookie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cookie.c,v 1.10 2001/10/26 13:29:26 ho Exp $	*/
+/*	$OpenBSD: cookie.c,v 1.11 2002/08/23 18:01:33 ho Exp $	*/
 /*	$EOM: cookie.c,v 1.21 1999/08/05 15:00:04 niklas Exp $	*/
 
 /*
@@ -36,7 +36,6 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sha1.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/sbin/isakmpd/features/policy b/sbin/isakmpd/features/policy
index e0afaae3403..b4db0db2795 100644
--- a/sbin/isakmpd/features/policy
+++ b/sbin/isakmpd/features/policy
@@ -1,4 +1,4 @@
-#	$OpenBSD: policy,v 1.3 2000/02/20 16:42:20 niklas Exp $
+#	$OpenBSD: policy,v 1.4 2002/08/23 18:01:33 ho Exp $
 #	$EOM: policy,v 1.4 2000/02/20 16:38:15 niklas Exp $
 
 #
@@ -33,7 +33,7 @@
 
 POLICY=		policy.c
 
-.if !defined (USE_KEYNOTE) && !defined (HAVE_DLOPEN)
+.if !defined (USE_KEYNOTE)
 #Force a syntax error
 "KeyNote policy support wanted but no keynote library available"
 .endif
diff --git a/sbin/isakmpd/features/x509 b/sbin/isakmpd/features/x509
index 53e52e2fe5d..14d90396cd7 100644
--- a/sbin/isakmpd/features/x509
+++ b/sbin/isakmpd/features/x509
@@ -1,4 +1,4 @@
-#	$OpenBSD: x509,v 1.3 2000/02/20 16:42:20 niklas Exp $
+#	$OpenBSD: x509,v 1.4 2002/08/23 18:01:33 ho Exp $
 #	$EOM: x509,v 1.4 2000/02/20 16:38:15 niklas Exp $
 
 #
@@ -32,8 +32,3 @@
 #
 
 X509=		x509.c
-
-.if !defined (USE_LIBCRYPTO) && !defined (HAVE_DLOPEN)
-#Force a syntax error
-"X.509 certificate support wanted but no libcrypto library available"
-.endif
diff --git a/sbin/isakmpd/isakmp_cfg.c b/sbin/isakmpd/isakmp_cfg.c
index 3d2d414adb7..f72264f4435 100644
--- a/sbin/isakmpd/isakmp_cfg.c
+++ b/sbin/isakmpd/isakmp_cfg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isakmp_cfg.c,v 1.21 2002/07/16 11:15:53 markus Exp $	*/
+/*	$OpenBSD: isakmp_cfg.c,v 1.22 2002/08/23 18:01:33 ho Exp $	*/
 
 /*
  * Copyright (c) 2001 Niklas Hallqvist.  All rights reserved.
@@ -156,6 +156,7 @@ cfg_initiator_send_ATTR (struct message *msg)
 		attrlen += ISAKMP_ATTR_SZ + LEN6;			\
 		break;							\
 	      default:							\
+		break;							\
 	      }								\
           free (sa);							\
         } while (0)
diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c
index 1220f8060ea..d13d3328e2b 100644
--- a/sbin/isakmpd/pf_key_v2.c
+++ b/sbin/isakmpd/pf_key_v2.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pf_key_v2.c,v 1.114 2002/08/23 17:11:08 ho Exp $  */
+/*      $OpenBSD: pf_key_v2.c,v 1.115 2002/08/23 18:01:33 ho Exp $  */
 /*	$EOM: pf_key_v2.c,v 1.79 2000/12/12 00:33:19 niklas Exp $	*/
 
 /*
@@ -2040,7 +2040,7 @@ pf_key_v2_flow (struct sockaddr *laddr, struct sockaddr *lmask,
   policy_buf = (u_int8_t *)calloc (1, len);
   if (!policy_buf)
     {
-      log_error ("pf_key_v2_flow: calloc %d failed", len);
+      log_error ("pf_key_v2_flow: calloc %lu failed", len);
       goto cleanup;
     }