[krb5] - handle an assertion failure that starts cropping up when the patch for using poll (#701446) meets
Nalin Dahyabhai
nalin at fedoraproject.org
Wed Aug 31 17:33:41 UTC 2011
commit db0e796a502d94e6c0afe7562c2faed4944d2f31
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Wed Aug 31 13:31:58 2011 -0400
- handle an assertion failure that starts cropping up when the patch for using poll (#701446) meets servers that aren't running KDCs or against which the connection fails for other reasons (#727829, #734172)
krb5-1.9.1-sendto_poll2.patch | 11 +++++++++++
krb5.spec | 7 +++++++
2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/krb5-1.9.1-sendto_poll2.patch b/krb5-1.9.1-sendto_poll2.patch
new file mode 100644
index 0000000..2704bd6
--- /dev/null
+++ b/krb5-1.9.1-sendto_poll2.patch
@@ -0,0 +1,11 @@
+--- krb5/src/lib/krb5/os/sendto_kdc.c
++++ krb5/src/lib/krb5/os/sendto_kdc.c
+@@ -1176,7 +1176,7 @@
+ for (i = 0; i < n_conns; i++) {
+ int ssflags;
+
+- if (conns[i].fd == INVALID_SOCKET)
++ if (conns[i].state == FAILED || conns[i].fd == INVALID_SOCKET)
+ continue;
+ ssflags = cm_get_ssflags(seltemp, conns[i].fd);
+ if (!ssflags)
diff --git a/krb5.spec b/krb5.spec
index 5bacefd..f397b9d 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -60,6 +60,7 @@ Patch83: krb5-1.9.1-ai_addrconfig2.patch
Patch84: krb5-1.9.1-sendto_poll.patch
Patch85: krb5-trunk-gss_delete_sec.patch
Patch86: krb5-1.9-debuginfo.patch
+Patch87: krb5-1.9.1-sendto_poll2.patch
License: MIT
URL: http://web.mit.edu/kerberos/www/
@@ -211,6 +212,7 @@ ln -s NOTICE LICENSE
%patch84 -p0 -b .sendto_poll
%patch85 -p1 -b .gss_delete_sec
%patch86 -p0 -b .debuginfo
+%patch87 -p1 -b .sendto_poll2
gzip doc/*.ps
sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
@@ -670,6 +672,11 @@ exit 0
%{_sbindir}/uuserver
%changelog
+* Wed Aug 31 2011 Nalin Dahyabhai <nalin at redhat.com> 1.9.1-10
+- handle an assertion failure that starts cropping up when the patch for
+ using poll (#701446) meets servers that aren't running KDCs or against
+ which the connection fails for other reasons (#727829, #734172)
+
* Mon Aug 8 2011 Nalin Dahyabhai <nalin at redhat.com> 1.9.1-9
- override the default build rules to not delete temporary y.tab.c files,
so that they can be packaged, allowing debuginfo files which point to them
More information about the scm-commits
mailing list