- improved patch to #274991

This commit is contained in:
Adam Tkac 2007-09-20 09:19:07 +00:00
parent c6dbd75113
commit 1b61987e9d
2 changed files with 18 additions and 5 deletions

View File

@ -1,11 +1,21 @@
--- netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd 2007-08-01 11:37:27.000000000 +0200 diff -up netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd netkit-telnet-0.17/telnet/sys_bsd.c
+++ netkit-telnet-0.17/telnet/sys_bsd.c 2007-08-01 11:39:23.000000000 +0200 --- netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd 2007-09-20 10:57:58.000000000 +0200
@@ -407,6 +407,11 @@ +++ netkit-telnet-0.17/telnet/sys_bsd.c 2007-09-20 11:10:08.000000000 +0200
@@ -375,6 +375,7 @@ TerminalNewMode(int f)
int onoff;
int old;
cc_t esc;
+ int err;
globalmode = f&~MODE_FORCE;
if (prevmode == f)
@@ -407,6 +408,12 @@ TerminalNewMode(int f)
tcsetattr(tin, TCSADRAIN, &tmp_tc); tcsetattr(tin, TCSADRAIN, &tmp_tc);
#endif /* USE_TERMIO */ #endif /* USE_TERMIO */
old = ttyflush(SYNCHing|flushout); old = ttyflush(SYNCHing|flushout);
+ if (old < 0) { + if (old < 0) {
+ if (! ((errno == EINTR) || (errno == EAGAIN) || (errno == ENOSPC))) { + err = errno;
+ if (! ((err == EINTR) || (err == EAGAIN) || (err == ENOSPC))) {
+ break; + break;
+ } + }
+ } + }

View File

@ -1,7 +1,7 @@
Summary: The client program for the telnet remote login protocol. Summary: The client program for the telnet remote login protocol.
Name: telnet Name: telnet
Version: 0.17 Version: 0.17
Release: 39%{?dist} Release: 40%{?dist}
Epoch: 1 Epoch: 1
License: BSD License: BSD
Group: Applications/Internet Group: Applications/Internet
@ -135,6 +135,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_mandir}/man8/telnetd.8* %{_mandir}/man8/telnetd.8*
%changelog %changelog
* Thu Sep 20 2007 Adam Tkac <atkac redhat com> 1:0.17-40
- improved patch to #274991
* Wed Aug 22 2007 Harald Hoyer <harald@redhat.com> - 1:0.17-39 * Wed Aug 22 2007 Harald Hoyer <harald@redhat.com> - 1:0.17-39
- added patch to prevent a rare loop in the client - added patch to prevent a rare loop in the client