From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 13 Feb 2024 15:53:15 +0000 (+0100)
Subject: s4:libcli/ldap: make use of tstream_tls_params_client_lpcfg()
X-Git-Tag: tdb-1.4.11~981
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c200cf1b5f430f686b39df8513a6b7e3c592ed43;p=thirdparty%2Fsamba.git

s4:libcli/ldap: make use of tstream_tls_params_client_lpcfg()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15621

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

diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 3c9f91601e6..61a49d34502 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -510,20 +510,12 @@ _PUBLIC_ struct composite_context *ldap_connect_send(struct ldap_connection *con
 		conn->port = port;
 
 		if (conn->ldaps) {
-			char *ca_file = lpcfg_tls_cafile(state, conn->lp_ctx);
-			char *crl_file = lpcfg_tls_crlfile(state, conn->lp_ctx);
-			const char *tls_priority = lpcfg_tls_priority(conn->lp_ctx);
-			enum tls_verify_peer_state verify_peer =
-				lpcfg_tls_verify_peer(conn->lp_ctx);
 			NTSTATUS status;
 
-			status = tstream_tls_params_client(state,
-							   ca_file,
-							   crl_file,
-							   tls_priority,
-							   verify_peer,
-							   conn->host,
-							   &state->tls_params);
+			status = tstream_tls_params_client_lpcfg(state,
+								 conn->lp_ctx,
+								 conn->host,
+								 &state->tls_params);
 			if (!NT_STATUS_IS_OK(status)) {
 				composite_error(result, status);
 				return result;