upstream commit

refactor canohost.c: move functions that cache results closer
 to the places that use them (authn and session code). After this, no state is
 cached in canohost.c

feedback and ok markus@

Upstream-ID: 5f2e4df88d4803fc8ec59ec53629105e23ce625e

1 files changed, 4 insertions, 3 deletions

diff --git a/auth2-hostbased.c b/auth2-hostbased.c
index e2327cf77..1b3c3b202 100644
--- a/auth2-hostbased.c
+++ b/auth2-hostbased.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-hostbased.c,v 1.25 2015/05/04 06:10:48 djm Exp $ */
+/* $OpenBSD: auth2-hostbased.c,v 1.26 2016/03/07 19:02:43 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -160,6 +160,7 @@ int
 hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost,
     Key *key)
 {
+        struct ssh *ssh = active_state; /* XXX */
         const char *resolvedname, *ipaddr, *lookup, *reason;
         HostStatus host_status;
         int len;
@@ -168,8 +169,8 @@ hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost,
         if (auth_key_is_revoked(key))
                 return 0;
 
-        resolvedname = get_canonical_hostname(options.use_dns);
-        ipaddr = get_remote_ipaddr();
+        resolvedname = auth_get_canonical_hostname(ssh, options.use_dns);
+        ipaddr = ssh_remote_ipaddr(ssh);
 
         debug2("%s: chost %s resolvedname %s ipaddr %s", __func__,
             chost, resolvedname, ipaddr);