From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 17 Apr 2024 16:16:46 +0000 (+0200)
Subject: s4:lib/tls: we no longer need ifdef GNUTLS_NO_TICKETS
X-Git-Tag: tdb-1.4.11~987
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecdd76919132430372ef04b03304fc51d6014e2f;p=thirdparty%2Fsamba.git

s4:lib/tls: we no longer need ifdef GNUTLS_NO_TICKETS

We require gnutls 3.6.13

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/lib/tls/tls_tstream.c b/source4/lib/tls/tls_tstream.c
index 9a69a015403..cfcff836624 100644
--- a/source4/lib/tls/tls_tstream.c
+++ b/source4/lib/tls/tls_tstream.c
@@ -997,7 +997,6 @@ static NTSTATUS tstream_tls_prepare_gnutls(struct tstream_tls_params *_tlsp,
 		flags = GNUTLS_SERVER;
 	} else {
 		flags = GNUTLS_CLIENT;
-#ifdef GNUTLS_NO_TICKETS
 		/*
 		 * tls_tstream can't properly handle 'New Session Ticket'
 		 * messages sent 'after' the client sends the 'Finished'
@@ -1006,7 +1005,6 @@ static NTSTATUS tstream_tls_prepare_gnutls(struct tstream_tls_params *_tlsp,
 		 * use resumption with session tickets.
 		 */
 		flags |= GNUTLS_NO_TICKETS;
-#endif
 	}
 
 	/*