sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-20 17:44:21 +03:00
Code Activity

s3/auth: add create_info6_from_pac()

Browse Source 
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13261

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Stefan Metzmacher
2018-01-23 21:32:25 +01:00
committed by Ralph Boehme
parent e1ba819960
commit d4ba23fd35
2 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source3/auth/proto.h
View File

@@ -312,6 +312,10 @@ NTSTATUS serverinfo_to_SamInfo6(struct auth_serversupplied_info *server_info,
NTSTATUS create_info3_from_pac_logon_info(TALLOC_CTX *mem_ctx, NTSTATUS create_info3_from_pac_logon_info(TALLOC_CTX *mem_ctx,
const struct PAC_LOGON_INFO *logon_info, const struct PAC_LOGON_INFO *logon_info,
struct netr_SamInfo3 **pp_info3); struct netr_SamInfo3 **pp_info3);
NTSTATUS create_info6_from_pac(TALLOC_CTX *mem_ctx,
const struct PAC_LOGON_INFO *logon_info,
const struct PAC_UPN_DNS_INFO *upn_dns_info,
struct netr_SamInfo6 **pp_info6);
NTSTATUS samu_to_SamInfo3(TALLOC_CTX *mem_ctx, NTSTATUS samu_to_SamInfo3(TALLOC_CTX *mem_ctx,
struct samu *samu, struct samu *samu,
const char *login_server, const char *login_server,

56
source3/auth/server_info.c
View File

@@ -362,6 +362,62 @@ NTSTATUS create_info3_from_pac_logon_info(TALLOC_CTX *mem_ctx,
return NT_STATUS_OK; return NT_STATUS_OK;
} }
/*
* Create a copy of an info6 struct from the PAC_UPN_DNS_INFO and PAC_LOGON_INFO
* then merge resource SIDs, if any, into it. If successful return the created
* info6 struct.
*/
NTSTATUS create_info6_from_pac(TALLOC_CTX *mem_ctx,
const struct PAC_LOGON_INFO *logon_info,
const struct PAC_UPN_DNS_INFO *upn_dns_info,
struct netr_SamInfo6 **pp_info6)
{
NTSTATUS status;
struct netr_SamInfo6 *info6 = NULL;
struct netr_SamInfo3 *info3 = NULL;
info6 = talloc_zero(mem_ctx, struct netr_SamInfo6);
if (info6 == NULL) {
return NT_STATUS_NO_MEMORY;
}
status = copy_netr_SamInfo3(info6,
&logon_info->info3,
&info3);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(info6);
return status;
}
status = merge_resource_sids(logon_info, info3);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(info6);
return status;
}
info6->base = info3->base;
info6->sids = info3->sids;
info6->sidcount = info3->sidcount;
if (upn_dns_info != NULL) {
info6->dns_domainname.string = talloc_strdup(info6,
upn_dns_info->dns_domain_name);
if (info6->dns_domainname.string == NULL) {
TALLOC_FREE(info6);
return NT_STATUS_NO_MEMORY;
}
info6->principal_name.string = talloc_strdup(info6,
upn_dns_info->upn_name);
if (info6->principal_name.string == NULL) {
TALLOC_FREE(info6);
return NT_STATUS_NO_MEMORY;
}
}
*pp_info6 = info6;
return NT_STATUS_OK;
}
/* /*
* Check if this is a "Unix Users" domain user, or a * Check if this is a "Unix Users" domain user, or a
* "Unix Groups" domain group, we need to handle it * "Unix Groups" domain group, we need to handle it