sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

s4-lsa: prepare dcesrv_lsa_CreateTrustedDomain_base() to deal with unencrypted auth info.

Browse Source 
Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Jul 15 19:57:48 CEST 2011 on sn-devel-104
This commit is contained in:
Günther Deschner 2011-07-15 18:38:21 +02:00
parent 7f52cd3b35
commit e898ad3ffe
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source4/rpc_server/lsa/dcesrv_lsa.c
View File

@ -874,7 +874,8 @@ static NTSTATUS add_trust_user(TALLOC_CTX *mem_ctx,
static NTSTATUS dcesrv_lsa_CreateTrustedDomain_base(struct dcesrv_call_state *dce_call, static NTSTATUS dcesrv_lsa_CreateTrustedDomain_base(struct dcesrv_call_state *dce_call,
TALLOC_CTX *mem_ctx, TALLOC_CTX *mem_ctx,
struct lsa_CreateTrustedDomainEx2 *r, struct lsa_CreateTrustedDomainEx2 *r,
int op) int op,
struct lsa_TrustDomainInfoAuthInfo *unencrypted_auth_info)
{ {
struct dcesrv_handle *policy_handle; struct dcesrv_handle *policy_handle;
struct lsa_policy_state *policy_state; struct lsa_policy_state *policy_state;
@ -931,7 +932,7 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomain_base(struct dcesrv_call_state *dc
/* No secrets are created at this time, for this function */ /* No secrets are created at this time, for this function */
auth_struct.outgoing.count = 0; auth_struct.outgoing.count = 0;
auth_struct.incoming.count = 0; auth_struct.incoming.count = 0;
} else { } else if (op == NDR_LSA_CREATETRUSTEDDOMAINEX2) {
auth_blob = data_blob_const(r->in.auth_info_internal->auth_blob.data, auth_blob = data_blob_const(r->in.auth_info_internal->auth_blob.data,
r->in.auth_info_internal->auth_blob.size); r->in.auth_info_internal->auth_blob.size);
nt_status = get_trustdom_auth_blob(dce_call, mem_ctx, nt_status = get_trustdom_auth_blob(dce_call, mem_ctx,
@ -939,12 +940,18 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomain_base(struct dcesrv_call_state *dc
if (!NT_STATUS_IS_OK(nt_status)) { if (!NT_STATUS_IS_OK(nt_status)) {
return nt_status; return nt_status;
} }
} else if (op == NDR_LSA_CREATETRUSTEDDOMAINEX) {
if (op == NDR_LSA_CREATETRUSTEDDOMAINEX) { if (unencrypted_auth_info->incoming_count > 1) {
if (auth_struct.incoming.count > 1) { return NT_STATUS_INVALID_PARAMETER;
return NT_STATUS_INVALID_PARAMETER;
}
} }
/* more investigation required here, do not create secrets for
* now */
auth_struct.outgoing.count = 0;
auth_struct.incoming.count = 0;
} else {
return NT_STATUS_INVALID_PARAMETER;
} }
if (auth_struct.incoming.count) { if (auth_struct.incoming.count) {
@ -1126,7 +1133,7 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomainEx2(struct dcesrv_call_state *dce_
TALLOC_CTX *mem_ctx, TALLOC_CTX *mem_ctx,
struct lsa_CreateTrustedDomainEx2 *r) struct lsa_CreateTrustedDomainEx2 *r)
{ {
return dcesrv_lsa_CreateTrustedDomain_base(dce_call, mem_ctx, r, NDR_LSA_CREATETRUSTEDDOMAINEX2); return dcesrv_lsa_CreateTrustedDomain_base(dce_call, mem_ctx, r, NDR_LSA_CREATETRUSTEDDOMAINEX2, NULL);
} }
/* /*
lsa_CreateTrustedDomainEx lsa_CreateTrustedDomainEx
@ -1139,14 +1146,8 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomainEx(struct dcesrv_call_state *dce_c
r2.in.policy_handle = r->in.policy_handle; r2.in.policy_handle = r->in.policy_handle;
r2.in.info = r->in.info; r2.in.info = r->in.info;
r2.in.auth_info_internal = talloc_zero(mem_ctx, struct lsa_TrustDomainInfoAuthInfoInternal);
if (!r2.in.auth_info_internal) {
return NT_STATUS_NO_MEMORY;
}
r2.out.trustdom_handle = r->out.trustdom_handle; r2.out.trustdom_handle = r->out.trustdom_handle;
return dcesrv_lsa_CreateTrustedDomain_base(dce_call, mem_ctx, &r2, NDR_LSA_CREATETRUSTEDDOMAINEX); return dcesrv_lsa_CreateTrustedDomain_base(dce_call, mem_ctx, &r2, NDR_LSA_CREATETRUSTEDDOMAINEX, r->in.auth_info);
} }
/* /*
@ -1173,7 +1174,7 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomain(struct dcesrv_call_state *dce_cal
r2.in.access_mask = r->in.access_mask; r2.in.access_mask = r->in.access_mask;
r2.out.trustdom_handle = r->out.trustdom_handle; r2.out.trustdom_handle = r->out.trustdom_handle;
return dcesrv_lsa_CreateTrustedDomain_base(dce_call, mem_ctx, &r2, NDR_LSA_CREATETRUSTEDDOMAIN); return dcesrv_lsa_CreateTrustedDomain_base(dce_call, mem_ctx, &r2, NDR_LSA_CREATETRUSTEDDOMAIN, NULL);
} }