diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-12-11 13:39:50 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-12-11 13:39:50 +1100 |
commit | f0f90989fa7c22ab86ae7957b3af539584be375c (patch) | |
tree | d29637328f1c0458d5ffed5d284d8353ee7ed9ba /authfile.c | |
parent | 596dcfa21fba253b25020be8578efb6a1a1e30d2 (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 'authfile.c')
-rw-r--r-- | authfile.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/authfile.c b/authfile.c index 4038ab692..6a04cd7a9 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: authfile.c,v 1.59 2004/12/06 11:41:03 dtucker Exp $"); | 39 | RCSID("$OpenBSD: authfile.c,v 1.60 2004/12/11 01:48:56 dtucker Exp $"); |
40 | 40 | ||
41 | #include <openssl/err.h> | 41 | #include <openssl/err.h> |
42 | #include <openssl/evp.h> | 42 | #include <openssl/evp.h> |
@@ -51,6 +51,7 @@ RCSID("$OpenBSD: authfile.c,v 1.59 2004/12/06 11:41:03 dtucker Exp $"); | |||
51 | #include "log.h" | 51 | #include "log.h" |
52 | #include "authfile.h" | 52 | #include "authfile.h" |
53 | #include "rsa.h" | 53 | #include "rsa.h" |
54 | #include "misc.h" | ||
54 | 55 | ||
55 | /* Version identification string for SSH v1 identity files. */ | 56 | /* Version identification string for SSH v1 identity files. */ |
56 | static const char authfile_id_string[] = | 57 | static const char authfile_id_string[] = |
@@ -603,7 +604,7 @@ key_try_load_public(Key *k, const char *filename, char **commentp) | |||
603 | FILE *f; | 604 | FILE *f; |
604 | char line[SSH_MAX_PUBKEY_BYTES]; | 605 | char line[SSH_MAX_PUBKEY_BYTES]; |
605 | char *cp; | 606 | char *cp; |
606 | int linenum = 0; | 607 | u_long linenum = 0; |
607 | 608 | ||
608 | f = fopen(filename, "r"); | 609 | f = fopen(filename, "r"); |
609 | if (f != NULL) { | 610 | if (f != NULL) { |