From: Andreas Schneider <asn@samba.org>
Date: Fri, 22 Dec 2023 14:00:20 +0000 (+0100)
Subject: s4:rpc_server: Use dcesrv_lsa_CreateTrustedDomain_common() for lsa_CreateTrustedDomainEx
X-Git-Tag: tdb-1.4.11~1247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b957cb34d4402abe79ed8bb24d82f90151be4317;p=thirdparty%2Fsamba.git

s4:rpc_server: Use dcesrv_lsa_CreateTrustedDomain_common() for lsa_CreateTrustedDomainEx

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

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 6563b435194..514a49a384a 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -1755,7 +1755,12 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomainEx(struct dcesrv_call_state *dce_c
 					  TALLOC_CTX *mem_ctx,
 					  struct lsa_CreateTrustedDomainEx *r)
 {
-	struct lsa_CreateTrustedDomainEx2 r2 = {};
+	/*
+	 * More investigation required here, do not create secrets for now.
+	 */
+	struct trustDomainPasswords auth_struct = {
+		.incoming_size = 0,
+	};
 	struct dcesrv_handle *policy_handle = NULL;
 	NTSTATUS status;
 
@@ -1771,17 +1776,18 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomainEx(struct dcesrv_call_state *dce_c
 		return status;
 	}
 
-	r2.in.policy_handle = r->in.policy_handle;
-	r2.in.info = r->in.info;
-	r2.out.trustdom_handle = r->out.trustdom_handle;
+	if (r->in.auth_info->incoming_count > 1) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
 
-	return dcesrv_lsa_CreateTrustedDomain_base(
+	return dcesrv_lsa_CreateTrustedDomain_common(
 		dce_call,
 		mem_ctx,
 		policy_handle,
-		&r2,
-		NDR_LSA_CREATETRUSTEDDOMAINEX,
-		r->in.auth_info);
+		r->in.access_mask,
+		r->in.info,
+		&auth_struct,
+		&r->out.trustdom_handle);
 }
 
 /*