> Date: Sun, 29 Mar 2015 11:55:17 +0100 > From: Stuart Henderson <[email protected]> > > On 2015/03/28 23:28, Fred wrote: > > On 03/24/15 07:51, Fred wrote: > > > > Synopsis: <Fix bug introduced by rev 1.29> > > > > Category: <system> > > > > Environment: > > > System : OpenBSD 5.7 > > > Details : OpenBSD 5.7-current (GENERIC.MP) #888: Sat Mar 14 > > >14:39:44 MDT 2015 > > > > > >[email protected]:/usr/src/sys/arch/amd64/compile/GENERIC.MP > > > > > > Architecture: OpenBSD.amd64 > > > Machine : amd64 > > > > Description: > > > <By removing the ~ICRNL from MODE_EDIT returns were being ignored > > >when entering a password on a Cisco CP-7940G Phone - preventing login.> > > > > How-To-Repeat: > > > <Loging into to a Cisco IP Phone - I believe the issue here: > > >http://marc.info/?l=openbsd-bugs&m=142654566814793 might be related.> > > > > Fix: > > > <The following patch fixes the issue for me, I have tested against > > >linux and the ^M issue is not reintroduced: > > > > > >Index: sys_bsd.c > > >=================================================================== > > >RCS file: /cvs/src/usr.bin/telnet/sys_bsd.c,v > > >retrieving revision 1.29 > > >diff -u -p -u -r1.29 sys_bsd.c > > >--- sys_bsd.c 12 Feb 2015 09:50:50 -0000 1.29 > > >+++ sys_bsd.c 23 Mar 2015 20:41:26 -0000 > > >@@ -283,6 +283,7 @@ TerminalNewMode(int f) > > > } else { > > > tmp_tc.c_lflag &= ~ECHO; > > > tmp_tc.c_oflag &= ~ONLCR; > > >+ tmp_tc.c_iflag &= ~ICRNL; > > > } > > > > > > if ((f&MODE_FLOW) == 0) { > > > > > > > > > > > > > > > > > ping? > > > > I think we should either take Fred's diff, or revert the previous > change. Any preferences? The ability to use telnet to connect to some of > the affected devices is more important now that ssh no longer supports > v1.
Revert the diff. It introduced regressions so it is wrong. We can consider a better diff afterwards.
