From: Andreas Schneider <asn@samba.org>
Date: Tue, 6 Apr 2021 13:21:00 +0000 (+0200)
Subject: s4:ldap_server: Use cli_credentials_init_server()
X-Git-Tag: tevent-0.11.0~1236
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb7bfe2f3a3b663e23a517e3e66ac41c1cb36411;p=thirdparty%2Fsamba.git

s4:ldap_server: Use cli_credentials_init_server()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 20442ecd9e5..ce4fd4f41d6 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -302,7 +302,6 @@ static void ldapsrv_accept(struct stream_connection *c,
 	struct ldapsrv_connection *conn;
 	struct cli_credentials *server_credentials;
 	struct socket_address *socket_address;
-	NTSTATUS status;
 	int port;
 	int ret;
 	struct tevent_req *subreq;
@@ -352,18 +351,12 @@ static void ldapsrv_accept(struct stream_connection *c,
 		conn->global_catalog = true;
 	}
 
-	server_credentials = cli_credentials_init(conn);
+	server_credentials = cli_credentials_init_server(conn, conn->lp_ctx);
 	if (!server_credentials) {
 		stream_terminate_connection(c, "Failed to init server credentials\n");
 		return;
 	}
 
-	cli_credentials_set_conf(server_credentials, conn->lp_ctx);
-	status = cli_credentials_set_machine_account(server_credentials, conn->lp_ctx);
-	if (!NT_STATUS_IS_OK(status)) {
-		stream_terminate_connection(c, talloc_asprintf(conn, "Failed to obtain server credentials, perhaps a standalone server?: %s\n", nt_errstr(status)));
-		return;
-	}
 	conn->server_credentials = server_credentials;
 
 	conn->session_info = session_info;