sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3/rpc_client: make map_validation_to_info3() public and move to util_netlogon

Browse Source 
Will be needed in the next commit.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Ralph Boehme 2017-11-30 23:19:07 +01:00
parent a001f4b509
commit 7eed1661f6
3 changed files with 81 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
source3/rpc_client/cli_netlogon.c
View File

@ -447,83 +447,6 @@ fail:
return status;
}
static NTSTATUS map_validation_to_info3(TALLOC_CTX *mem_ctx,
uint16_t validation_level,
union netr_Validation *validation,
struct netr_SamInfo3 **info3_p)
{
struct netr_SamInfo3 *info3;
struct netr_SamInfo6 *info6 = NULL;
NTSTATUS status;
if (validation == NULL) {
return NT_STATUS_INVALID_PARAMETER;
}
switch (validation_level) {
case 3:
if (validation->sam3 == NULL) {
return NT_STATUS_INVALID_PARAMETER;
}
info3 = copy_netr_SamInfo3(mem_ctx, validation->sam3);
if (info3 == NULL) {
return NT_STATUS_NO_MEMORY;
}
break;
case 6:
if (validation->sam6 == NULL) {
return NT_STATUS_INVALID_PARAMETER;
}
info6 = validation->sam6;
info3 = talloc_zero(mem_ctx, struct netr_SamInfo3);
if (info3 == NULL) {
return NT_STATUS_NO_MEMORY;
}
status = copy_netr_SamBaseInfo(info3,
&info6->base,
&info3->base);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(info3);
return status;
}
if (validation->sam6->sidcount > 0) {
int i;
info3->sidcount = info6->sidcount;
info3->sids = talloc_array(info3,
struct netr_SidAttr,
info3->sidcount);
if (info3->sids == NULL) {
TALLOC_FREE(info3);
return NT_STATUS_NO_MEMORY;
}
for (i = 0; i < info3->sidcount; i++) {
info3->sids[i].sid = dom_sid_dup(
info3->sids, info6->sids[i].sid);
if (info3->sids[i].sid == NULL) {
TALLOC_FREE(info3);
return NT_STATUS_NO_MEMORY;
}
info3->sids[i].attributes =
info6->sids[i].attributes;
}
}
break;
default:
return NT_STATUS_BAD_VALIDATION_CLASS;
}
*info3_p = info3;
return NT_STATUS_OK;
}
/* Logon domain user */
NTSTATUS rpccli_netlogon_password_logon(

77
source3/rpc_client/util_netlogon.c
View File

@ -102,3 +102,80 @@ struct netr_SamInfo3 *copy_netr_SamInfo3(TALLOC_CTX *mem_ctx,
return info3;
}
NTSTATUS map_validation_to_info3(TALLOC_CTX *mem_ctx,
uint16_t validation_level,
union netr_Validation *validation,
struct netr_SamInfo3 **info3_p)
{
struct netr_SamInfo3 *info3;
struct netr_SamInfo6 *info6 = NULL;
NTSTATUS status;
if (validation == NULL) {
return NT_STATUS_INVALID_PARAMETER;
}
switch (validation_level) {
case 3:
if (validation->sam3 == NULL) {
return NT_STATUS_INVALID_PARAMETER;
}
info3 = copy_netr_SamInfo3(mem_ctx, validation->sam3);
if (info3 == NULL) {
return NT_STATUS_NO_MEMORY;
}
break;
case 6:
if (validation->sam6 == NULL) {
return NT_STATUS_INVALID_PARAMETER;
}
info6 = validation->sam6;
info3 = talloc_zero(mem_ctx, struct netr_SamInfo3);
if (info3 == NULL) {
return NT_STATUS_NO_MEMORY;
}
status = copy_netr_SamBaseInfo(info3,
&info6->base,
&info3->base);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(info3);
return status;
}
if (validation->sam6->sidcount > 0) {
int i;
info3->sidcount = info6->sidcount;
info3->sids = talloc_array(info3,
struct netr_SidAttr,
info3->sidcount);
if (info3->sids == NULL) {
TALLOC_FREE(info3);
return NT_STATUS_NO_MEMORY;
}
for (i = 0; i < info3->sidcount; i++) {
info3->sids[i].sid = dom_sid_dup(
info3->sids, info6->sids[i].sid);
if (info3->sids[i].sid == NULL) {
TALLOC_FREE(info3);
return NT_STATUS_NO_MEMORY;
}
info3->sids[i].attributes =
info6->sids[i].attributes;
}
}
break;
default:
return NT_STATUS_BAD_VALIDATION_CLASS;
}
*info3_p = info3;
return NT_STATUS_OK;
}

4
source3/rpc_client/util_netlogon.h
View File

@ -27,5 +27,9 @@ NTSTATUS copy_netr_SamBaseInfo(TALLOC_CTX *mem_ctx,
struct netr_SamBaseInfo *out);
struct netr_SamInfo3 *copy_netr_SamInfo3(TALLOC_CTX *mem_ctx,
const struct netr_SamInfo3 *orig);
NTSTATUS map_validation_to_info3(TALLOC_CTX *mem_ctx,
uint16_t validation_level,
union netr_Validation *validation,
struct netr_SamInfo3 **info3_p);
#endif /* _RPC_CLIENT_UTIL_NETLOGON_H_ */