summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/serverloop.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2001-02-15 23:19:59 +0000
committermarkus <markus@openbsd.org>2001-02-15 23:19:59 +0000
commit5a588a898ab777be1642ba137d3b559ceebc0fc4 (patch)
tree67308bcce4d0b566da42ce813f61498f7a0240f8 /usr.bin/ssh/serverloop.c
parentfix change from previous commit that didn't get the ports correctly (diff)
downloadwireguard-openbsd-5a588a898ab777be1642ba137d3b559ceebc0fc4.tar.xz
wireguard-openbsd-5a588a898ab777be1642ba137d3b559ceebc0fc4.zip
genericize password padding function for SSH1 and SSH2.
add stylized echo to 2, too.
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
-rw-r--r--usr.bin/ssh/serverloop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c
index d45dd888a68..858cc282b62 100644
--- a/usr.bin/ssh/serverloop.c
+++ b/usr.bin/ssh/serverloop.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.48 2001/02/15 08:38:04 deraadt Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.49 2001/02/15 23:19:59 markus Exp $");
#include "xmalloc.h"
#include "packet.h"
@@ -339,7 +339,7 @@ process_output(fd_set * writeset)
} else {
/* Successful write. */
if (tcgetattr(fdin, &tio) == 0 &&
- !(tio.c_lflag & ECHO)) {
+ !(tio.c_lflag & ECHO) && (tio.c_lflag & ICANON)) {
/*
* Simulate echo to reduce the impact of
* traffic analysis