diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2020-02-14 19:47:15 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2020-02-14 19:47:15 +0000 |
| commit | f02e39982452024dafcf0ea6e536ebff586ffce4 (patch) | |
| tree | 78cdaad953cc879dc7d97272436a4d84b228d94c /auth2-hostbased.c | |
| parent | dc9e8d9c8401178683a1f53bc816389a1160dc41 (diff) | |
Notes
Diffstat (limited to 'auth2-hostbased.c')
| -rw-r--r-- | auth2-hostbased.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/auth2-hostbased.c b/auth2-hostbased.c index 764ceff74ee6a..0c40fad4ed310 100644 --- a/auth2-hostbased.c +++ b/auth2-hostbased.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-hostbased.c,v 1.38 2018/09/20 03:28:06 djm Exp $ */ +/* $OpenBSD: auth2-hostbased.c,v 1.40 2019/01/19 21:43:56 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -147,7 +147,8 @@ userauth_hostbased(struct ssh *ssh) /* test for allowed key and correct signature */ authenticated = 0; - if (PRIVSEP(hostbased_key_allowed(authctxt->pw, cuser, chost, key)) && + if (PRIVSEP(hostbased_key_allowed(ssh, authctxt->pw, cuser, + chost, key)) && PRIVSEP(sshkey_verify(key, sig, slen, sshbuf_ptr(b), sshbuf_len(b), pkalg, ssh->compat)) == 0) authenticated = 1; @@ -167,10 +168,9 @@ done: /* return 1 if given hostkey is allowed */ int -hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost, - struct sshkey *key) +hostbased_key_allowed(struct ssh *ssh, struct passwd *pw, + const char *cuser, char *chost, struct sshkey *key) { - struct ssh *ssh = active_state; /* XXX */ const char *resolvedname, *ipaddr, *lookup, *reason; HostStatus host_status; int len; |