From aace82e17ed0185faa3e9cda5437a3c6a7a40b10 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Thu, 20 Apr 2017 15:33:10 -0400 Subject: [PATCH] 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. ticket: 8580 target_version: 1.15-next target_version: 1.14-next tags: pullup --- src/lib/krb5/os/sendto_kdc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c index 8b4614887f..e8bc0ad6e2 100644 --- a/src/lib/krb5/os/sendto_kdc.c +++ b/src/lib/krb5/os/sendto_kdc.c @@ -1372,8 +1372,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; } -- 2.47.2