diff options
| author | Damien Miller <djm@mindrot.org> | 2006-06-13 05:03:53 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2006-06-13 05:03:53 +0200 |
| commit | eb13e556e58a52a3ff0c734a8690ad41686cf92c (patch) | |
| tree | 280682806c42ca30138a968994ab141a0a409719 /sshd.c | |
| parent | - mk@cvs.openbsd.org 2006/05/30 11:46:38 (diff) | |
| download | openssh-eb13e556e58a52a3ff0c734a8690ad41686cf92c.tar.xz openssh-eb13e556e58a52a3ff0c734a8690ad41686cf92c.zip | |
- 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@
Diffstat (limited to '')
| -rw-r--r-- | sshd.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -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); |