2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f0f0f5da..a9f564ee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
    - jmc@cvs.openbsd.org 2013/10/17 07:35:48
      [sftp.1 sftp.c]
      tweak previous;
+   - djm@cvs.openbsd.org 2013/10/17 22:08:04
+     [sshd.c]
+     include remote port in bad banner message; bz#2162
 
 20131017
  - (djm) OpenBSD CVS Sync
diff --git a/sshd.c b/sshd.c
index 287706d47..b6f03d5a5 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.407 2013/10/10 01:43:03 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.408 2013/10/17 22:08:04 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -483,8 +483,9 @@ sshd_exchange_identification(int sock_in, int sock_out)
                 (void) atomicio(vwrite, sock_out, s, strlen(s));
                 close(sock_in);
                 close(sock_out);
-                logit("Bad protocol version identification '%.100s' from %s",
-                    client_version_string, get_remote_ipaddr());
+                logit("Bad protocol version identification '%.100s' "
+                    "from %s port %d", client_version_string,
+                    get_remote_ipaddr(), get_remote_port());
                 cleanup_exit(255);
         }
         debug("Client protocol version %d.%d; client software version %.100s",