diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2015-03-29 13:42:54 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2015-03-29 13:42:54 +0000 |
| commit | a9398a91b94fd0a8a80fdede7e3655cbfa44befb (patch) | |
| tree | ca0f09fd39bacdd45601781bccb3c25573889b08 /usr.bin | |
| parent | 377ace3f45434c53c4e4a3502772d9dc789d625e (diff) | |
Revert r1.29 "Don't clear ICRNL when editing mode is off, so that character
local echo mode don't echo ^M locally" as this causes problems sending CR to
some Cisco equipment reported by Ryan Freeman and Fred Crowson.
kettenis@ agrees with reverting to fix the regression; we can consider a
better diff afterwards but clearly this is a sensitive area.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/telnet/sys_bsd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/telnet/sys_bsd.c b/usr.bin/telnet/sys_bsd.c index d88e226fdf1..16249f13e66 100644 --- a/usr.bin/telnet/sys_bsd.c +++ b/usr.bin/telnet/sys_bsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_bsd.c,v 1.29 2015/02/12 09:50:50 guenther Exp $ */ +/* $OpenBSD: sys_bsd.c,v 1.30 2015/03/29 13:42:53 sthen Exp $ */ /* $NetBSD: sys_bsd.c,v 1.11 1996/02/28 21:04:10 thorpej Exp $ */ /* @@ -310,6 +310,7 @@ TerminalNewMode(int f) tmp_tc.c_lflag |= ICANON; } else { tmp_tc.c_lflag &= ~ICANON; + tmp_tc.c_iflag &= ~ICRNL; tmp_tc.c_cc[VMIN] = 1; tmp_tc.c_cc[VTIME] = 0; } |