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 @@
    - dtucker@cvs.openbsd.org 2013/10/23 05:40:58
      [servconf.c]
      fix comment
+   - 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)
 
 20131023
  - (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 @@
-/* $OpenBSD: sshd.c,v 1.408 2013/10/17 22:08:04 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.409 2013/10/23 23:35:32 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2040,7 +2040,9 @@ main(int ac, char **av)
 #endif /* LIBWRAP */
 
         /* Log the connection. */
-        verbose("Connection from %.500s port %d", remote_ip, remote_port);
+        verbose("Connection from %s port %d on %s port %d",
+            remote_ip, remote_port,
+            get_local_ipaddr(sock_in), get_local_port());
 
         /*
          * We don't want to listen forever unless the other side