diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | auth-rsa.c | 3 | ||||
| -rw-r--r-- | auth2-pubkey.c | 3 | ||||
| -rw-r--r-- | authfile.c | 5 | ||||
| -rw-r--r-- | misc.c | 8 | ||||
| -rw-r--r-- | misc.h | 4 |
6 files changed, 18 insertions, 11 deletions
@@ -12,6 +12,10 @@ ignore). - don't do extra do_lstat() if we only have one matching file. djm@ ok + - 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@ 20041208 - (tim) [configure.ac] Comment some non obvious platforms in the @@ -1942,4 +1946,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3602 2004/12/11 02:37:22 dtucker Exp $ +$Id: ChangeLog,v 1.3603 2004/12/11 02:39:50 dtucker Exp $ @@ -14,7 +14,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-rsa.c,v 1.61 2004/12/06 11:41:03 dtucker Exp $"); +RCSID("$OpenBSD: auth-rsa.c,v 1.62 2004/12/11 01:48:56 dtucker Exp $"); #include <openssl/rsa.h> #include <openssl/md5.h> @@ -33,6 +33,7 @@ RCSID("$OpenBSD: auth-rsa.c,v 1.61 2004/12/06 11:41:03 dtucker Exp $"); #include "hostfile.h" #include "monitor_wrap.h" #include "ssh.h" +#include "misc.h" /* import */ extern ServerOptions options; diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 41e23beb..a97d0f43 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2-pubkey.c,v 1.8 2004/12/06 11:41:03 dtucker Exp $"); +RCSID("$OpenBSD: auth2-pubkey.c,v 1.9 2004/12/11 01:48:56 dtucker Exp $"); #include "ssh.h" #include "ssh2.h" @@ -41,6 +41,7 @@ RCSID("$OpenBSD: auth2-pubkey.c,v 1.8 2004/12/06 11:41:03 dtucker Exp $"); #include "auth-options.h" #include "canohost.h" #include "monitor_wrap.h" +#include "misc.h" /* import */ extern ServerOptions options; @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: authfile.c,v 1.59 2004/12/06 11:41:03 dtucker Exp $"); +RCSID("$OpenBSD: authfile.c,v 1.60 2004/12/11 01:48:56 dtucker Exp $"); #include <openssl/err.h> #include <openssl/evp.h> @@ -51,6 +51,7 @@ RCSID("$OpenBSD: authfile.c,v 1.59 2004/12/06 11:41:03 dtucker Exp $"); #include "log.h" #include "authfile.h" #include "rsa.h" +#include "misc.h" /* Version identification string for SSH v1 identity files. */ static const char authfile_id_string[] = @@ -603,7 +604,7 @@ key_try_load_public(Key *k, const char *filename, char **commentp) FILE *f; char line[SSH_MAX_PUBKEY_BYTES]; char *cp; - int linenum = 0; + u_long linenum = 0; f = fopen(filename, "r"); if (f != NULL) { @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: misc.c,v 1.26 2004/12/06 11:41:03 dtucker Exp $"); +RCSID("$OpenBSD: misc.c,v 1.27 2004/12/11 01:48:56 dtucker Exp $"); #include "misc.h" #include "log.h" @@ -339,15 +339,15 @@ addargs(arglist *args, char *fmt, ...) */ int read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz, - int *lineno) + u_long *lineno) { while (fgets(buf, bufsz, f) != NULL) { (*lineno)++; if (buf[strlen(buf) - 1] == '\n' || feof(f)) { return 0; } else { - debug("%s: %s line %d exceeds size limit", __func__, - filename, lineno); + debug("%s: %s line %lu exceeds size limit", __func__, + filename, *lineno); /* discard remainder of line */ while(fgetc(f) != '\n' && !feof(f)) ; /* nothing */ @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.19 2004/12/06 11:41:03 dtucker Exp $ */ +/* $OpenBSD: misc.h,v 1.20 2004/12/11 01:48:56 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -47,4 +47,4 @@ char *tilde_expand_filename(const char *, uid_t); char *read_passphrase(const char *, int); int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); -int read_keyfile_line(FILE *, const char *, char *, size_t, int *); +int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *); |