[krb5] abort the current transmit attempt if our timeout is negative

[Nalin Dahyabhai]

commit a4ad97ae2224cd355c70e23480a3c24ab02ff96d
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Mon Sep 10 16:30:11 2012 -0400

    abort the current transmit attempt if our timeout is negative
    
    - add patch from Filip Krska to abort a transmit attempt when we've given
      poll() a negative timeout (#838548)

 krb5-1.10.3-timeout_over.patch |   14 ++++++++++++++
 krb5.spec                      |    8 +++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/krb5-1.10.3-timeout_over.patch b/krb5-1.10.3-timeout_over.patch
new file mode 100644
index 0000000..98c9e1d
--- /dev/null
+++ b/krb5-1.10.3-timeout_over.patch
@@ -0,0 +1,14 @@
+Filip Krska's patch to abort the current pass after poll() returns when
+we've given it an indefinite timeout.
+
+--- krb5/src/lib/krb5/os/sendto_kdc.c
++++ krb5/src/lib/krb5/os/sendto_kdc.c
+@@ -529,6 +529,8 @@ cm_select_or_poll(const struct select_st
+     *out = *in;
+     *sret = poll(out->fds, out->nfds, timeout);
+     e = SOCKET_ERRNO;
++    if (timeout < 0)
++        return e;
+     return (*sret < 0) ? e : 0;
+ #else
+     /* Use the select wrapper from cm.c. */
diff --git a/krb5.spec b/krb5.spec
index 1e876ae..0b915e7 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -29,7 +29,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.10.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.3-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -85,6 +85,7 @@ Patch108: krb5-1.10.2-replay.patch
 Patch109: krb5-1.10.3-as_rep_skew.patch
 Patch110: krb5-1.10.3-keytab-etype-corners-prep.patch
 Patch111: krb5-1.10.3-keytab-etype-corners.patch
+Patch112: krb5-1.10.3-timeout_over.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -282,6 +283,7 @@ ln -s NOTICE LICENSE
 %patch109 -p1 -b .as_rep_skew
 %patch110 -p1 -b .keytab-etype-corners-prep
 %patch111 -p1 -b .keytab-etype-corners
+%patch112 -p1 -b .timeout_over
 rm src/lib/krb5/krb/deltat.c
 
 gzip doc/*.ps
@@ -851,6 +853,10 @@ exit 0
 
 %changelog
 * Fri Sep  6 2012 Nalin Dahyabhai <nalin at redhat.com> 1.10.3-5
+- add patch from Filip Krska to abort a transmit attempt when we've given
+  poll() a negative timeout (#838548)
+
+* Fri Sep  6 2012 Nalin Dahyabhai <nalin at redhat.com>
 - on EL6, conflict with libsmbclient before 3.5.10-124, which is when it
   stopped linking with a symbol which we no longer export (#771687)
 - pull up patch for RT#7063, in which not noticing a prompt for a long