summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/authfile.c
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2004-12-11 01:48:56 +0000
committerdtucker <dtucker@openbsd.org>2004-12-11 01:48:56 +0000
commit0b67a9db2d62fc9214f33b54b6a8d58010b4133b (patch)
treeb5282363e51641bf1d451150bff64ab343e480cf /usr.bin/ssh/authfile.c
parentInvert the polarity of two tests in the recovery code that could cause (diff)
downloadwireguard-openbsd-0b67a9db2d62fc9214f33b54b6a8d58010b4133b.tar.xz
wireguard-openbsd-0b67a9db2d62fc9214f33b54b6a8d58010b4133b.zip
Fix debug call in error path of authorized_keys processing and fix related
warnings; ok djm@
Diffstat (limited to 'usr.bin/ssh/authfile.c')
-rw-r--r--usr.bin/ssh/authfile.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c
index 7b9d7ca8c2b..fb0fb0dc8fa 100644
--- a/usr.bin/ssh/authfile.c
+++ b/usr.bin/ssh/authfile.c
@@ -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[] =
@@ -600,7 +601,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) {