diff options
| author | itojun <itojun@NetBSD.org> | 2001-02-16 15:48:34 +0000 |
|---|---|---|
| committer | itojun <itojun@NetBSD.org> | 2001-02-16 15:48:34 +0000 |
| commit | c83dc32a4cf975e35008dd9db964418d04f7a6ff (patch) | |
| tree | b2ee0c78101e7516b2618cabe7f236316240a50e /crypto/dist/ssh/serverloop.c | |
| parent | f02c06e0476d684235833e3a607a1f326066dcc1 (diff) | |
sync up with 2.5.0. simulate echobacks, X11 display name check, sftp upgrdes.
Diffstat (limited to 'crypto/dist/ssh/serverloop.c')
| -rw-r--r-- | crypto/dist/ssh/serverloop.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crypto/dist/ssh/serverloop.c b/crypto/dist/ssh/serverloop.c index 280db2ff222..73b765e9a7b 100644 --- a/crypto/dist/ssh/serverloop.c +++ b/crypto/dist/ssh/serverloop.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: serverloop.c,v 1.47 2001/02/08 23:11:42 dugsong Exp $"); +RCSID("$OpenBSD: serverloop.c,v 1.49 2001/02/15 23:19:59 markus Exp $"); #include "xmalloc.h" #include "packet.h" @@ -339,8 +339,11 @@ process_output(fd_set * writeset) } else { /* Successful write. */ if (tcgetattr(fdin, &tio) == 0 && - !(tio.c_lflag & ECHO)) { - /* Simulate echo to reduce the impact of traffic analysis. */ + !(tio.c_lflag & ECHO) && (tio.c_lflag & ICANON)) { + /* + * Simulate echo to reduce the impact of + * traffic analysis + */ packet_start(SSH_MSG_IGNORE); memset(buffer_ptr(&stdin_buffer), 0, len); packet_put_string(buffer_ptr(&stdin_buffer), len); |
