summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--serverloop.c7
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ccf30971c..e0fcf33a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,10 @@
38 ok markus@ 38 ok markus@
39 - (bal) replaced PATH_MAX in sftp-int.c w/ MAXPATHLEN. 39 - (bal) replaced PATH_MAX in sftp-int.c w/ MAXPATHLEN.
40 - (djm) Move to Jim's 1.2.0 X11 askpass program 40 - (djm) Move to Jim's 1.2.0 X11 askpass program
41 - (stevesk) OpenBSD sync:
42 - deraadt@cvs.openbsd.org 2001/02/15 01:38:04
43 [serverloop.c]
44 indent
41 45
4220010214 4620010214
43 - (djm) Don't try to close PAM session or delete credentials if the 47 - (djm) Don't try to close PAM session or delete credentials if the
@@ -3966,4 +3970,4 @@
3966 - Wrote replacements for strlcpy and mkdtemp 3970 - Wrote replacements for strlcpy and mkdtemp
3967 - Released 1.0pre1 3971 - Released 1.0pre1
3968 3972
3969$Id: ChangeLog,v 1.771 2001/02/15 04:33:17 djm Exp $ 3973$Id: ChangeLog,v 1.772 2001/02/15 17:27:15 stevesk Exp $
diff --git a/serverloop.c b/serverloop.c
index 8fc94db45..d59de8622 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: serverloop.c,v 1.47 2001/02/08 23:11:42 dugsong Exp $"); 38RCSID("$OpenBSD: serverloop.c,v 1.48 2001/02/15 08:38:04 deraadt Exp $");
39 39
40#include "xmalloc.h" 40#include "xmalloc.h"
41#include "packet.h" 41#include "packet.h"
@@ -340,7 +340,10 @@ process_output(fd_set * writeset)
340 /* Successful write. */ 340 /* Successful write. */
341 if (tcgetattr(fdin, &tio) == 0 && 341 if (tcgetattr(fdin, &tio) == 0 &&
342 !(tio.c_lflag & ECHO)) { 342 !(tio.c_lflag & ECHO)) {
343 /* Simulate echo to reduce the impact of traffic analysis. */ 343 /*
344 * Simulate echo to reduce the impact of
345 * traffic analysis
346 */
344 packet_start(SSH_MSG_IGNORE); 347 packet_start(SSH_MSG_IGNORE);
345 memset(buffer_ptr(&stdin_buffer), 0, len); 348 memset(buffer_ptr(&stdin_buffer), 0, len);
346 packet_put_string(buffer_ptr(&stdin_buffer), len); 349 packet_put_string(buffer_ptr(&stdin_buffer), len);