summaryrefslogtreecommitdiff
path: root/misc.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-12-11 13:39:50 +1100
committerDarren Tucker <dtucker@zip.com.au>2004-12-11 13:39:50 +1100
commitf0f90989fa7c22ab86ae7957b3af539584be375c (patch)
treed29637328f1c0458d5ffed5d284d8353ee7ed9ba /misc.c
parent596dcfa21fba253b25020be8578efb6a1a1e30d2 (diff)
- dtucker@cvs.openbsd.org 2004/12/11 01:48:56
[auth-rsa.c auth2-pubkey.c authfile.c misc.c misc.h] Fix debug call in error path of authorized_keys processing and fix related warnings; ok djm@
Diffstat (limited to 'misc.c')
-rw-r--r--misc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/misc.c b/misc.c
index d0cc53823..a90125505 100644
--- a/misc.c
+++ b/misc.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: misc.c,v 1.26 2004/12/06 11:41:03 dtucker Exp $"); 26RCSID("$OpenBSD: misc.c,v 1.27 2004/12/11 01:48:56 dtucker Exp $");
27 27
28#include "misc.h" 28#include "misc.h"
29#include "log.h" 29#include "log.h"
@@ -339,15 +339,15 @@ addargs(arglist *args, char *fmt, ...)
339 */ 339 */
340int 340int
341read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz, 341read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz,
342 int *lineno) 342 u_long *lineno)
343{ 343{
344 while (fgets(buf, bufsz, f) != NULL) { 344 while (fgets(buf, bufsz, f) != NULL) {
345 (*lineno)++; 345 (*lineno)++;
346 if (buf[strlen(buf) - 1] == '\n' || feof(f)) { 346 if (buf[strlen(buf) - 1] == '\n' || feof(f)) {
347 return 0; 347 return 0;
348 } else { 348 } else {
349 debug("%s: %s line %d exceeds size limit", __func__, 349 debug("%s: %s line %lu exceeds size limit", __func__,
350 filename, lineno); 350 filename, *lineno);
351 /* discard remainder of line */ 351 /* discard remainder of line */
352 while(fgetc(f) != '\n' && !feof(f)) 352 while(fgetc(f) != '\n' && !feof(f))
353 ; /* nothing */ 353 ; /* nothing */