make the alpha happy

4 files changed, 11 insertions, 10 deletions

diff --git a/sbin/isakmpd/connection.c b/sbin/isakmpd/connection.c
index bee8aa03a54..a574ac77ddf 100644
--- a/sbin/isakmpd/connection.c
+++ b/sbin/isakmpd/connection.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: connection.c,v 1.19 2001/07/01 19:48:43 niklas Exp $	*/
+/*	$OpenBSD: connection.c,v 1.20 2001/07/02 02:28:35 deraadt Exp $	*/
 /*	$EOM: connection.c,v 1.28 2000/11/23 12:21:18 niklas Exp $	*/
 
 /*
@@ -91,7 +91,7 @@ void
 connection_init ()
 {
   struct conf_list *conns, *attrs;
-  struct conf_list_node *conn, *attr;
+  struct conf_list_node *conn, *attr = NULL;
 
   /*
    * Passive connections normally include: all "active" connections that
diff --git a/sbin/isakmpd/key.c b/sbin/isakmpd/key.c
index 882df58df78..7f12595cd8d 100644
--- a/sbin/isakmpd/key.c
+++ b/sbin/isakmpd/key.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.c,v 1.3 2001/07/01 19:48:43 niklas Exp $	*/
+/*	$OpenBSD: key.c,v 1.4 2001/07/02 02:28:35 deraadt Exp $	*/
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
  *
@@ -50,7 +50,7 @@ key_free (int type, int private, void *key)
 
 /* Convert from internal form to serialized */
 void
-key_serialize (int type, int private, void *key, u_int8_t **data, int *datalen)
+key_serialize (int type, int private, void *key, u_int8_t **data, size_t *datalen)
 {
   u_int8_t *p;
 
diff --git a/sbin/isakmpd/key.h b/sbin/isakmpd/key.h
index b9a8f4e6ae1..8050b601d5c 100644
--- a/sbin/isakmpd/key.h
+++ b/sbin/isakmpd/key.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.h,v 1.2 2001/06/25 05:15:11 angelos Exp $	*/
+/*	$OpenBSD: key.h,v 1.3 2001/07/02 02:28:35 deraadt Exp $	*/
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
  *
@@ -32,7 +32,7 @@
 #define ISAKMP_KEYTYPE_PRIVATE  1
 
 void key_free (int, int, void *);
-void key_serialize (int, int, void *, u_int8_t **, int *);
+void key_serialize (int, int, void *, u_int8_t **, size_t *);
 char *key_printable (int, int, u_int8_t *, int);
 void key_from_printable (int, int, char *, u_int8_t **, int *);
 void *key_internalize (int, int, u_int8_t *, int);
diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c
index bfb5e0350dc..6633c2c405c 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.76 2001/07/01 19:48:44 niklas Exp $  */
+/*      $OpenBSD: pf_key_v2.c,v 1.77 2001/07/02 02:28:35 deraadt Exp $  */
 /*	$EOM: pf_key_v2.c,v 1.79 2000/12/12 00:33:19 niklas Exp $	*/
 
 /*
@@ -128,7 +128,7 @@ struct pf_key_v2_sa_seq {
 TAILQ_HEAD (, pf_key_v2_sa_seq) pf_key_v2_sa_seq_map;
 #endif
 
-static u_int8_t *pf_key_v2_convert_id (u_int8_t *, int, int *, int *);
+static u_int8_t *pf_key_v2_convert_id (u_int8_t *, int, size_t *, int *);
 static struct pf_key_v2_msg *pf_key_v2_call (struct pf_key_v2_msg *);
 static struct pf_key_v2_node *pf_key_v2_find_ext (struct pf_key_v2_msg *,
 						  u_int16_t);
@@ -1965,7 +1965,7 @@ pf_key_v2_flow (struct sockaddr *laddr, struct sockaddr *lmask,
 }
 
 static u_int8_t *
-pf_key_v2_convert_id (u_int8_t *id, int idlen, int *reslen, int *idtype)
+pf_key_v2_convert_id (u_int8_t *id, int idlen, size_t *reslen, int *idtype)
 {
   u_int8_t *res = 0;
   char addrbuf[ADDRESS_MAX + 5];
@@ -2072,7 +2072,8 @@ pf_key_v2_enable_sa (struct sa *sa, struct sa *isakmp_sa)
   struct sockaddr *dst, *src;
   int error;
   struct proto *proto = TAILQ_FIRST (&sa->protos);
-  int sidtype = 0, didtype = 0, sidlen = 0, didlen = 0;
+  int sidtype = 0, didtype = 0;
+  size_t sidlen = 0, didlen = 0;
   u_int8_t *sid = 0, *did = 0;
 #ifndef SADB_X_EXT_FLOW_TYPE
   struct sockaddr_storage hostmask_storage;