From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 29 Nov 2012 01:19:37 +0000 (-0500)
Subject: Avoid redundant socket cleanup in sendto_kdc.c
X-Git-Tag: krb5-1.12-alpha1~449
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d31794d43d04d592d079a08dc3cc4ce7164c0df0;p=thirdparty%2Fkrb5.git

Avoid redundant socket cleanup in sendto_kdc.c

Since r25120, kill_conn() has been responsible for closing and
invalidating conn->fd.  In the unlikely event that the KDC sends a TCP
response to us before we send a TCP request, we were cleaning up the
socket again, which is useless (though also harmless).  Get rid of
that code.
---

diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index 22cd908126..d8b6a95963 100644
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -963,10 +963,6 @@ service_tcp_fd(krb5_context context, struct conn_state *conn,
         kill_conn:
             TRACE_SENDTO_KDC_TCP_DISCONNECT(context, conn);
             kill_conn(conn, selstate, e);
-            if (e == EINVAL) {
-                closesocket(conn->fd);
-                conn->fd = INVALID_SOCKET;
-            }
             return e == 0;
         }
         if (ssflags & SSF_EXCEPTION) {