- 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)

diff --git a/ChangeLog b/ChangeLog
index 69dd5f85944f7fbea9ec8e3d28c1863493da4821..788816c981cfcd467d16d7055a15d2064ef9258a 100644 (file)
--- 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 b6f03d5a5c560d0c7d3f2b3348ff9efc663f7f08..c9ead2e7f4e11d6805cd9cd1f52740ad6fb6fb56 100644 (file)
--- 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