diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sshd.c | 10 |
2 files changed, 13 insertions, 3 deletions
@@ -34,6 +34,10 @@ [ssh-add.c] Sync usage() with man page and reality. ok deraadt dtucker + - markus@cvs.openbsd.org 2006/06/01 09:21:48 + [sshd.c] + call get_remote_ipaddr() early; fixes logging after client disconnects; + report mpf@; ok dtucker@ 20060521 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor @@ -4667,4 +4671,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4339 2006/06/13 03:03:34 djm Exp $ +$Id: ChangeLog,v 1.4340 2006/06/13 03:03:53 djm Exp $ @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.330 2006/03/25 13:17:02 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.331 2006/06/01 09:21:48 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1671,7 +1671,13 @@ main(int ac, char **av) * We use get_canonical_hostname with usedns = 0 instead of * get_remote_ipaddr here so IP options will be checked. */ - remote_ip = get_canonical_hostname(0); + (void) get_canonical_hostname(0); + /* + * The rest of the code depends on the fact that + * get_remote_ipaddr() caches the remote ip, even if + * the socket goes away. + */ + remote_ip = get_remote_ipaddr(); #ifdef SSH_AUDIT_EVENTS audit_connection_from(remote_ip, remote_port); |