diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2011-09-01 09:29:29 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2011-09-01 09:29:29 -0400 |
| commit | a26dd7c42cfc1ae0b8ffd11eebe36ede12915a80 (patch) | |
| tree | 9880654ccc423937e56a3d61657d80bdab5dac85 | |
| parent | 57d5eabb48f0869b0b9c77d268759ed1daa864e2 (diff) | |
| download | krb5-a26dd7c42cfc1ae0b8ffd11eebe36ede12915a80.tar.gz krb5-a26dd7c42cfc1ae0b8ffd11eebe36ede12915a80.tar.xz krb5-a26dd7c42cfc1ae0b8ffd11eebe36ede12915a80.zip | |
- switch to the upstream patch for #727829krb5-1.9.1-11.fc17
| -rw-r--r-- | krb5-1.9.1-sendto_poll2.patch | 31 | ||||
| -rw-r--r-- | krb5.spec | 5 |
2 files changed, 25 insertions, 11 deletions
diff --git a/krb5-1.9.1-sendto_poll2.patch b/krb5-1.9.1-sendto_poll2.patch index 2704bd6..0c2af4b 100644 --- a/krb5-1.9.1-sendto_poll2.patch +++ b/krb5-1.9.1-sendto_poll2.patch @@ -1,11 +1,22 @@ ---- 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; +RT#6951 +Index: krb5/src/lib/krb5/os/sendto_kdc.c +=================================================================== +--- krb5/src/lib/krb5/os/sendto_kdc.c (revision 25119) ++++ krb5/src/lib/krb5/os/sendto_kdc.c (revision 25120) +@@ -913,12 +913,12 @@ + static void + kill_conn(struct conn_state *conn, struct select_state *selstate, int err) + { ++ dprint("abandoning connection %d: %m\n", conn->fd, err); ++ cm_remove_fd(selstate, conn->fd); ++ closesocket(conn->fd); ++ conn->fd = INVALID_SOCKET; + conn->state = FAILED; + conn->err = err; +- shutdown(conn->fd, SHUTDOWN_BOTH); +- cm_remove_fd(selstate, conn->fd); +- dprint("abandoning connection %d: %m\n", conn->fd, err); +- /* Fix up max fd for next select call. */ + } -- 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) + /* Check socket for error. */ @@ -6,7 +6,7 @@ Summary: The Kerberos network authentication system Name: krb5 Version: 1.9.1 -Release: 10%{?dist} +Release: 11%{?dist} # Maybe we should explode from the now-available-to-everybody tarball instead? # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.1-signed.tar Source0: krb5-%{version}.tar.gz @@ -672,6 +672,9 @@ exit 0 %{_sbindir}/uuserver %changelog +* Thu Sep 1 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-11 +- switch to the upstream patch for #727829 + * Wed Aug 31 2011 Nalin Dahyabhai <nalin@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 |