summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2000-10-26 22:28:17 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2000-10-26 22:28:17 +0000
commit5b2f74ce3263cbc382af86660075dddff184e106 (patch)
treebfbee57590c38b2ff5df706707d9b601e8748b36
parente5b31580cd17e77157c68d58523e64ee091ccf48 (diff)
Merge with EOM 1.45
author: niklas fgetc returns int not char; Boris Prochazka <boris@stargate.ipunplugged.com>
-rw-r--r--sbin/isakmpd/conf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c
index 92b2bf12680..8d8988f96c7 100644
--- a/sbin/isakmpd/conf.c
+++ b/sbin/isakmpd/conf.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: conf.c,v 1.22 2000/10/16 23:28:56 niklas Exp $ */
-/* $EOM: conf.c,v 1.44 2000/10/14 08:45:18 angelos Exp $ */
+/* $OpenBSD: conf.c,v 1.23 2000/10/26 22:28:16 niklas Exp $ */
+/* $EOM: conf.c,v 1.45 2000/10/24 13:29:15 niklas Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved.
@@ -783,7 +783,7 @@ conf_decode_base64 (u_int8_t *out, u_int32_t *len, u_char *buf)
int
conf_get_line (FILE *stream, char *buf, u_int32_t len)
{
- char c;
+ int c;
while (len-- > 1)
{