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, 8 insertions, 5 deletions

diff --git a/auth-options.c b/auth-options.c
index edbaf80bb..b399b91e3 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.70 2015/12/10 17:08:40 mmcc Exp $ */
+/* $OpenBSD: auth-options.c,v 1.71 2016/03/07 19:02:43 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -29,6 +29,7 @@
 #include "ssherr.h"
 #include "log.h"
 #include "canohost.h"
+#include "packet.h"
 #include "sshbuf.h"
 #include "misc.h"
 #include "channels.h"
@@ -120,6 +121,7 @@ match_flag(const char *opt, int allow_negate, char **optsp, const char *msg)
 int
 auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
 {
+        struct ssh *ssh = active_state;         /* XXX */
         const char *cp;
         int i, r;
 
@@ -273,9 +275,9 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                 }
                 cp = "from=\"";
                 if (strncasecmp(opts, cp, strlen(cp)) == 0) {
-                        const char *remote_ip = get_remote_ipaddr();
-                        const char *remote_host = get_canonical_hostname(
-                            options.use_dns);
+                        const char *remote_ip = ssh_remote_ipaddr(ssh);
+                        const char *remote_host = auth_get_canonical_hostname(
+                            ssh, options.use_dns);
                         char *patterns = xmalloc(strlen(opts) + 1);
 
                         opts += strlen(cp);
@@ -457,6 +459,7 @@ parse_option_list(struct sshbuf *oblob, struct passwd *pw,
     char **cert_forced_command,
     int *cert_source_address_done)
 {
+        struct ssh *ssh = active_state;         /* XXX */
         char *command, *allowed;
         const char *remote_ip;
         char *name = NULL;
@@ -530,7 +533,7 @@ parse_option_list(struct sshbuf *oblob, struct passwd *pw,
                                         free(allowed);
                                         goto out;
                                 }
-                                remote_ip = get_remote_ipaddr();
+                                remote_ip = ssh_remote_ipaddr(ssh);
                                 result = addr_match_cidr_list(remote_ip,
                                     allowed);
                                 free(allowed);