summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sshd.c7
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 @@
6 - jmc@cvs.openbsd.org 2013/10/17 07:35:48 6 - jmc@cvs.openbsd.org 2013/10/17 07:35:48
7 [sftp.1 sftp.c] 7 [sftp.1 sftp.c]
8 tweak previous; 8 tweak previous;
9 - djm@cvs.openbsd.org 2013/10/17 22:08:04
10 [sshd.c]
11 include remote port in bad banner message; bz#2162
9 12
1020131017 1320131017
11 - (djm) OpenBSD CVS Sync 14 - (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 @@
1/* $OpenBSD: sshd.c,v 1.407 2013/10/10 01:43:03 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.408 2013/10/17 22:08:04 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
@@ -483,8 +483,9 @@ sshd_exchange_identification(int sock_in, int sock_out)
483 (void) atomicio(vwrite, sock_out, s, strlen(s)); 483 (void) atomicio(vwrite, sock_out, s, strlen(s));
484 close(sock_in); 484 close(sock_in);
485 close(sock_out); 485 close(sock_out);
486 logit("Bad protocol version identification '%.100s' from %s", 486 logit("Bad protocol version identification '%.100s' "
487 client_version_string, get_remote_ipaddr()); 487 "from %s port %d", client_version_string,
488 get_remote_ipaddr(), get_remote_port());
488 cleanup_exit(255); 489 cleanup_exit(255);
489 } 490 }
490 debug("Client protocol version %d.%d; client software version %.100s", 491 debug("Client protocol version %d.%d; client software version %.100s",