summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2000-10-26 22:28:08 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2000-10-26 22:28:08 +0000
commite5b31580cd17e77157c68d58523e64ee091ccf48 (patch)
treeb3d2b0666d6f238eaf322cc741172184a44330d7 /sbin
parent29d025155704d54e147d04fa329c9f5d6108e94b (diff)
Merge with EOM 1.10
author: niklas getopt returns int not char; Boris Prochazka <boris@stargate.ipunplugged.com>
Diffstat (limited to 'sbin')
-rw-r--r--sbin/isakmpd/apps/certpatch/certpatch.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sbin/isakmpd/apps/certpatch/certpatch.c b/sbin/isakmpd/apps/certpatch/certpatch.c
index 0d2c9041812..3295bc3d637 100644
--- a/sbin/isakmpd/apps/certpatch/certpatch.c
+++ b/sbin/isakmpd/apps/certpatch/certpatch.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: certpatch.c,v 1.9 2000/10/07 06:58:55 niklas Exp $ */
-/* $EOM: certpatch.c,v 1.9 2000/09/28 12:53:37 niklas Exp $ */
+/* $OpenBSD: certpatch.c,v 1.10 2000/10/26 22:28:07 niklas Exp $ */
+/* $EOM: certpatch.c,v 1.10 2000/10/24 13:34:24 niklas Exp $ */
/*
* Copyright (c) 1999 Niels Provos. All rights reserved.
@@ -98,8 +98,7 @@ main (int argc, char **argv)
char ipaddr[6], *new_id;
char *type = IDTYPE_IP, *keyfile = NULL, *id = NULL;
char *certin, *certout;
- char ch;
- int err;
+ int ch, err;
#if SSLEAY_VERSION_NUMBER >= 0x00904100L
unsigned char *p;