diff options
Diffstat (limited to 'auth2-pubkey.c')
-rw-r--r-- | auth2-pubkey.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 7c5692750..f78b046b8 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-pubkey.c,v 1.39 2013/12/30 23:52:27 djm Exp $ */ | 1 | /* $OpenBSD: auth2-pubkey.c,v 1.41 2014/07/15 15:54:14 millert Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -48,6 +48,7 @@ | |||
48 | #include "packet.h" | 48 | #include "packet.h" |
49 | #include "buffer.h" | 49 | #include "buffer.h" |
50 | #include "log.h" | 50 | #include "log.h" |
51 | #include "misc.h" | ||
51 | #include "servconf.h" | 52 | #include "servconf.h" |
52 | #include "compat.h" | 53 | #include "compat.h" |
53 | #include "key.h" | 54 | #include "key.h" |
@@ -61,7 +62,6 @@ | |||
61 | #include "ssh-gss.h" | 62 | #include "ssh-gss.h" |
62 | #endif | 63 | #endif |
63 | #include "monitor_wrap.h" | 64 | #include "monitor_wrap.h" |
64 | #include "misc.h" | ||
65 | #include "authfile.h" | 65 | #include "authfile.h" |
66 | #include "match.h" | 66 | #include "match.h" |
67 | 67 | ||
@@ -230,7 +230,7 @@ pubkey_auth_info(Authctxt *authctxt, const Key *key, const char *fmt, ...) | |||
230 | } | 230 | } |
231 | 231 | ||
232 | static int | 232 | static int |
233 | match_principals_option(const char *principal_list, struct KeyCert *cert) | 233 | match_principals_option(const char *principal_list, struct sshkey_cert *cert) |
234 | { | 234 | { |
235 | char *result; | 235 | char *result; |
236 | u_int i; | 236 | u_int i; |
@@ -250,7 +250,7 @@ match_principals_option(const char *principal_list, struct KeyCert *cert) | |||
250 | } | 250 | } |
251 | 251 | ||
252 | static int | 252 | static int |
253 | match_principals_file(char *file, struct passwd *pw, struct KeyCert *cert) | 253 | match_principals_file(char *file, struct passwd *pw, struct sshkey_cert *cert) |
254 | { | 254 | { |
255 | FILE *f; | 255 | FILE *f; |
256 | char line[SSH_MAX_PUBKEY_BYTES], *cp, *ep, *line_opts; | 256 | char line[SSH_MAX_PUBKEY_BYTES], *cp, *ep, *line_opts; |