diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-30 08:52:19 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-31 10:47:31 +1000 |
commit | 54d90ace1d3535b44d92a8611952dc109a74a031 (patch) | |
tree | 1b5ff69321b88b32fba058fe2c966bf177c95b28 /auth2-hostbased.c | |
parent | c221219b1fbee47028dcaf66613f4f8d6b7640e9 (diff) |
upstream commit
switch from Key typedef with struct sshkey; ok djm@
Upstream-ID: 3067d33e04efbe5131ce8f70668c47a58e5b7a1f
Diffstat (limited to 'auth2-hostbased.c')
-rw-r--r-- | auth2-hostbased.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/auth2-hostbased.c b/auth2-hostbased.c index 1b3c3b202..92ac20d90 100644 --- a/auth2-hostbased.c +++ b/auth2-hostbased.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-hostbased.c,v 1.26 2016/03/07 19:02:43 djm Exp $ */ | 1 | /* $OpenBSD: auth2-hostbased.c,v 1.27 2017/05/30 08:52:19 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -59,7 +59,7 @@ static int | |||
59 | userauth_hostbased(Authctxt *authctxt) | 59 | userauth_hostbased(Authctxt *authctxt) |
60 | { | 60 | { |
61 | Buffer b; | 61 | Buffer b; |
62 | Key *key = NULL; | 62 | struct sshkey *key = NULL; |
63 | char *pkalg, *cuser, *chost, *service; | 63 | char *pkalg, *cuser, *chost, *service; |
64 | u_char *pkblob, *sig; | 64 | u_char *pkblob, *sig; |
65 | u_int alen, blen, slen; | 65 | u_int alen, blen, slen; |
@@ -158,7 +158,7 @@ done: | |||
158 | /* return 1 if given hostkey is allowed */ | 158 | /* return 1 if given hostkey is allowed */ |
159 | int | 159 | int |
160 | hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost, | 160 | hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost, |
161 | Key *key) | 161 | struct sshkey *key) |
162 | { | 162 | { |
163 | struct ssh *ssh = active_state; /* XXX */ | 163 | struct ssh *ssh = active_state; /* XXX */ |
164 | const char *resolvedname, *ipaddr, *lookup, *reason; | 164 | const char *resolvedname, *ipaddr, *lookup, *reason; |