upstream: remove last references to active_state

with & ok markus@

OpenBSD-Commit-ID: 78619a50ea7e4ca2f3b54d4658b3227277490ba2

1 files changed, 5 insertions, 7 deletions

diff --git a/auth2-hostbased.c b/auth2-hostbased.c
index e28a48fb3..0c40fad4e 100644
--- a/auth2-hostbased.c
+++ b/auth2-hostbased.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-hostbased.c,v 1.39 2019/01/19 21:31:32 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.
  *
@@ -51,8 +51,6 @@
 #include "ssherr.h"
 #include "match.h"
 
-extern struct ssh *active_state; /* XXX */
-
 /* import */
 extern ServerOptions options;
 extern u_char *session_id2;
@@ -149,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;
@@ -169,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;