[29986] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.14]: Apply TCP timeouts to HTTPS (KKDCP) transport
daemon@ATHENA.MIT.EDU (Greg Hudson)
Mon Jul 17 22:43:55 2017
Date: Mon, 17 Jul 2017 22:41:26 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201707180241.v6I2fQU5003033@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/9a844b3f7206864d390cc35fc0cb4977684d7de2
commit 9a844b3f7206864d390cc35fc0cb4977684d7de2
Author: Greg Hudson <ghudson@mit.edu>
Date: Thu Apr 20 15:33:10 2017 -0400
Apply TCP timeouts to HTTPS (KKDCP) transport
We apply (as of ticket #7604) a ten-second minimum delay after a TCP
connection is accepted before creating new connections or sending UDP
packets. Apply this timeout to HTTPS connections as well, by removing
the transport check in get_endtime(). As the endtime field is only
set by service_tcp_connect(), it will always have the value 0 for UDP
connection state objects, so there is no need to check the transport
type.
(cherry picked from commit aace82e17ed0185faa3e9cda5437a3c6a7a40b10)
ticket: 8580
version_fixed: 1.14.6
src/lib/krb5/os/sendto_kdc.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index d11aa11..83f9025 100644
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -1313,8 +1313,7 @@ get_endtime(time_ms endtime, struct conn_state *conns)
struct conn_state *state;
for (state = conns; state != NULL; state = state->next) {
- if (state->addr.transport == TCP &&
- (state->state == READING || state->state == WRITING) &&
+ if ((state->state == READING || state->state == WRITING) &&
state->endtime > endtime)
endtime = state->endtime;
}
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
