summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-10-24 21:02:02 +1100
committerDamien Miller <djm@mindrot.org>2013-10-24 21:02:02 +1100
commit5ecb41629860687b145be63b8877fabb6bae5eda (patch)
treef340c995d97dc39134596cbe946c63c985e69783
parent03bf2e61ad6ac59a362a1f11b105586cb755c147 (diff)
- djm@cvs.openbsd.org 2013/10/23 23:35:32
[sshd.c] include local address and port in "Connection from ..." message (only shown at loglevel>=verbose)
-rw-r--r--ChangeLog4
-rw-r--r--sshd.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 69dd5f859..788816c98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
6 - dtucker@cvs.openbsd.org 2013/10/23 05:40:58 6 - dtucker@cvs.openbsd.org 2013/10/23 05:40:58
7 [servconf.c] 7 [servconf.c]
8 fix comment 8 fix comment
9 - djm@cvs.openbsd.org 2013/10/23 23:35:32
10 [sshd.c]
11 include local address and port in "Connection from ..." message (only
12 shown at loglevel>=verbose)
9 13
1020131023 1420131023
11 - (djm) OpenBSD CVS Sync 15 - (djm) OpenBSD CVS Sync
diff --git a/sshd.c b/sshd.c
index b6f03d5a5..c9ead2e7f 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.408 2013/10/17 22:08:04 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.409 2013/10/23 23:35:32 djm 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
@@ -2040,7 +2040,9 @@ main(int ac, char **av)
2040#endif /* LIBWRAP */ 2040#endif /* LIBWRAP */
2041 2041
2042 /* Log the connection. */ 2042 /* Log the connection. */
2043 verbose("Connection from %.500s port %d", remote_ip, remote_port); 2043 verbose("Connection from %s port %d on %s port %d",
2044 remote_ip, remote_port,
2045 get_local_ipaddr(sock_in), get_local_port());
2044 2046
2045 /* 2047 /*
2046 * We don't want to listen forever unless the other side 2048 * We don't want to listen forever unless the other side