diff options
author | Damien Miller <djm@mindrot.org> | 2006-06-13 13:03:53 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-06-13 13:03:53 +1000 |
commit | eb13e556e58a52a3ff0c734a8690ad41686cf92c (patch) | |
tree | 280682806c42ca30138a968994ab141a0a409719 | |
parent | 7b1e757b28a19eafd5f834307ea7c4493210095d (diff) |
- 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@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sshd.c | 10 |
2 files changed, 13 insertions, 3 deletions
@@ -34,6 +34,10 @@ | |||
34 | [ssh-add.c] | 34 | [ssh-add.c] |
35 | Sync usage() with man page and reality. | 35 | Sync usage() with man page and reality. |
36 | ok deraadt dtucker | 36 | ok deraadt dtucker |
37 | - markus@cvs.openbsd.org 2006/06/01 09:21:48 | ||
38 | [sshd.c] | ||
39 | call get_remote_ipaddr() early; fixes logging after client disconnects; | ||
40 | report mpf@; ok dtucker@ | ||
37 | 41 | ||
38 | 20060521 | 42 | 20060521 |
39 | - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor | 43 | - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor |
@@ -4667,4 +4671,4 @@ | |||
4667 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4671 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4668 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4672 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4669 | 4673 | ||
4670 | $Id: ChangeLog,v 1.4339 2006/06/13 03:03:34 djm Exp $ | 4674 | $Id: ChangeLog,v 1.4340 2006/06/13 03:03:53 djm Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.330 2006/03/25 13:17:02 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.331 2006/06/01 09:21:48 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1671,7 +1671,13 @@ main(int ac, char **av) | |||
1671 | * We use get_canonical_hostname with usedns = 0 instead of | 1671 | * We use get_canonical_hostname with usedns = 0 instead of |
1672 | * get_remote_ipaddr here so IP options will be checked. | 1672 | * get_remote_ipaddr here so IP options will be checked. |
1673 | */ | 1673 | */ |
1674 | remote_ip = get_canonical_hostname(0); | 1674 | (void) get_canonical_hostname(0); |
1675 | /* | ||
1676 | * The rest of the code depends on the fact that | ||
1677 | * get_remote_ipaddr() caches the remote ip, even if | ||
1678 | * the socket goes away. | ||
1679 | */ | ||
1680 | remote_ip = get_remote_ipaddr(); | ||
1675 | 1681 | ||
1676 | #ifdef SSH_AUDIT_EVENTS | 1682 | #ifdef SSH_AUDIT_EVENTS |
1677 | audit_connection_from(remote_ip, remote_port); | 1683 | audit_connection_from(remote_ip, remote_port); |