From 1b61987e9d9711b1e10bc911f2c61c4f309c866e Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Sep 20 2007 09:19:07 +0000
Subject: - improved patch to #274991


---

diff --git a/telnet-0.17-errno_test_sys_bsd.patch b/telnet-0.17-errno_test_sys_bsd.patch
index 6f60a9b..9a4fcba 100644
--- a/telnet-0.17-errno_test_sys_bsd.patch
+++ b/telnet-0.17-errno_test_sys_bsd.patch
@@ -1,11 +1,21 @@
---- netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd	2007-08-01 11:37:27.000000000 +0200
-+++ netkit-telnet-0.17/telnet/sys_bsd.c	2007-08-01 11:39:23.000000000 +0200
-@@ -407,6 +407,11 @@
+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.errnosysbsd	2007-09-20 10:57:58.000000000 +0200
++++ 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);
  #endif	/* USE_TERMIO */
  	    old = ttyflush(SYNCHing|flushout);
 +            if (old < 0) {
-+              if (! ((errno == EINTR) || (errno == EAGAIN) || (errno == ENOSPC))) {
++	      err = errno;
++              if (! ((err == EINTR) || (err == EAGAIN) || (err == ENOSPC))) {
 +                break;
 +              }
 +            }
diff --git a/telnet.spec b/telnet.spec
index ea5bad8..a3fd45a 100644
--- a/telnet.spec
+++ b/telnet.spec
@@ -1,7 +1,7 @@
 Summary: The client program for the telnet remote login protocol.
 Name: telnet
 Version: 0.17
-Release: 39%{?dist}
+Release: 40%{?dist}
 Epoch: 1
 License: BSD
 Group: Applications/Internet
@@ -135,6 +135,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/telnetd.8*
 
 %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
 - added patch to prevent a rare loop in the client