summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sshd.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index aa4af2565..89b3dce48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
120010220 120010220
2 - (bal) Fix mixed up params to memmove() from Jan 5th in setenv.c and 2 - (bal) Fix mixed up params to memmove() from Jan 5th in setenv.c and
3 getcwd.c. 3 getcwd.c.
4 - (bal) OpenBSD CVS Sync:
5 - deraadt@cvs.openbsd.org 2001/02/19 23:09:05
6 [sshd.c]
7 clarify message to make it not mention "ident"
4 8
520010219 920010219
6 - (bal) Markus' blessing to rename login.[ch] -> sshlogin.[ch] and 10 - (bal) Markus' blessing to rename login.[ch] -> sshlogin.[ch] and
@@ -4074,4 +4078,4 @@
4074 - Wrote replacements for strlcpy and mkdtemp 4078 - Wrote replacements for strlcpy and mkdtemp
4075 - Released 1.0pre1 4079 - Released 1.0pre1
4076 4080
4077$Id: ChangeLog,v 1.804 2001/02/19 19:54:43 mouring Exp $ 4081$Id: ChangeLog,v 1.805 2001/02/20 01:20:47 mouring Exp $
diff --git a/sshd.c b/sshd.c
index 62e83d2df..bd90d0e56 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: sshd.c,v 1.167 2001/02/12 23:26:20 markus Exp $"); 43RCSID("$OpenBSD: sshd.c,v 1.168 2001/02/19 23:09:05 deraadt Exp $");
44 44
45#include <openssl/dh.h> 45#include <openssl/dh.h>
46#include <openssl/bn.h> 46#include <openssl/bn.h>
@@ -328,7 +328,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
328 memset(buf, 0, sizeof(buf)); 328 memset(buf, 0, sizeof(buf));
329 for (i = 0; i < sizeof(buf) - 1; i++) { 329 for (i = 0; i < sizeof(buf) - 1; i++) {
330 if (atomicio(read, sock_in, &buf[i], 1) != 1) { 330 if (atomicio(read, sock_in, &buf[i], 1) != 1) {
331 log("Did not receive ident string from %s.", get_remote_ipaddr()); 331 log("Did not receive identification string from %s.",
332 get_remote_ipaddr());
332 fatal_cleanup(); 333 fatal_cleanup();
333 } 334 }
334 if (buf[i] == '\r') { 335 if (buf[i] == '\r') {