diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-12-28 15:15:09 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-12-28 15:15:09 +0000 |
| commit | 260b573507ad20dfdc326b20eb31234250fa9115 (patch) | |
| tree | bc726223d3ebc95e0d6ea3b696a4b2404a3a33ce /sbin/isakmpd | |
| parent | 3b7f66b8b24a1bfc38af6f7ca3bcc46b75317cbd (diff) | |
proper portable C; ok hshoexer
Diffstat (limited to 'sbin/isakmpd')
| -rw-r--r-- | sbin/isakmpd/dpd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sbin/isakmpd/dpd.c b/sbin/isakmpd/dpd.c index 241aab1d38b..ebcbf642b8a 100644 --- a/sbin/isakmpd/dpd.c +++ b/sbin/isakmpd/dpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dpd.c,v 1.6 2004/12/13 11:41:28 markus Exp $ */ +/* $OpenBSD: dpd.c,v 1.7 2004/12/28 15:15:08 deraadt Exp $ */ /* * Copyright (c) 2004 Håkan Olsson. All rights reserved. @@ -26,6 +26,7 @@ #include <sys/types.h> #include <stdlib.h> +#include <string.h> #include "sysdep.h" @@ -109,8 +110,8 @@ dpd_check_vendor_payload(struct message *msg, struct payload *p) vlen = GET_ISAKMP_GEN_LENGTH(pbuf) - ISAKMP_GEN_SZ; if (vlen != sizeof dpd_vendor_id) { LOG_DBG((LOG_EXCHANGE, 90, - "dpd_check_vendor_payload: bad size %d != %d", vlen, - sizeof dpd_vendor_id)); + "dpd_check_vendor_payload: bad size %lu != %lu", + (unsigned long)vlen, (unsigned long)sizeof dpd_vendor_id)); return; } @@ -179,6 +180,7 @@ dpd_handle_notify(struct message *msg, struct payload *p) } break; default: + break; } /* Mark handled. */ @@ -229,6 +231,7 @@ dpd_timer_reset(struct sa *sa, u_int32_t time_passed, enum dpd_tstate mode) dpd_check_event, sa, &tv); break; default: + break; } if (!sa->dpd_event) log_print("dpd_timer_reset: timer_add_event failed"); |