diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-01-19 21:37:48 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-01-20 09:02:44 +1100 |
| commit | 172a592a53ebe8649c4ac0d7946e6c08eb151af6 (patch) | |
| tree | f7279c9f91927cc1c8517ebc61cccba00a29e4bb /servconf.c | |
| parent | 8cc7a679d29cf6ecccfa08191e688c7f81ef95c2 (diff) | |
upstream: convert servconf.c to new packet API
with & ok markus@
OpenBSD-Commit-ID: 126553aecca302c9e02fd77e333b9cb217e623b4
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.345 2019/01/19 21:31:32 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.346 2019/01/19 21:37:48 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -65,9 +65,6 @@ #include "myproposal.h" #include "digest.h" -#include "opacket.h" /* XXX */ -extern struct ssh *active_state; /* XXX */ - static void add_listen_addr(ServerOptions *, const char *, const char *, int); static void add_one_listen_addr(ServerOptions *, const char *, @@ -926,12 +923,11 @@ process_permitopen(struct ssh *ssh, ServerOptions *options) } struct connection_info * -get_connection_info(int populate, int use_dns) +get_connection_info(struct ssh *ssh, int populate, int use_dns) { - struct ssh *ssh = active_state; /* XXX */ static struct connection_info ci; - if (!populate) + if (ssh == NULL || !populate) return &ci; ci.host = auth_get_canonical_hostname(ssh, use_dns); ci.address = ssh_remote_ipaddr(ssh); |