sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

idl: Rename "principle" to "principal_name"

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
This commit is contained in:
Volker Lendecke 2016-02-01 21:45:48 +01:00
parent 11970e6506
commit 88c4687945
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
librpc/idl/netlogon.idl
View File

@ -264,7 +264,7 @@ interface netlogon
uint32 sidcount;
[size_is(sidcount)] netr_SidAttr *sids;
lsa_String dns_domainname;
lsa_String principle;
lsa_String principal_name;
uint32 unknown4[20];
} netr_SamInfo6;

8
source3/auth/server_info.c
View File

@ -173,10 +173,10 @@ NTSTATUS serverinfo_to_SamInfo6(struct auth_serversupplied_info *server_info,
return NT_STATUS_NO_MEMORY;
}
sam6->principle.string = talloc_asprintf(sam6, "%s@%s",
sam6->base.account_name.string,
sam6->dns_domainname.string);
if (sam6->principle.string == NULL) {
sam6->principal_name.string = talloc_asprintf(
sam6, "%s@%s", sam6->base.account_name.string,
sam6->dns_domainname.string);
if (sam6->principal_name.string == NULL) {
return NT_STATUS_NO_MEMORY;
}

7
source4/rpc_server/netlogon/dcerpc_netlogon.c
View File

@ -991,9 +991,10 @@ static NTSTATUS dcesrv_netr_LogonSamLogon_base(struct dcesrv_call_state *dce_cal
sam6->sids = sam3->sids;
sam6->dns_domainname.string = lpcfg_dnsdomain(dce_call->conn->dce_ctx->lp_ctx);
sam6->principle.string = talloc_asprintf(mem_ctx, "%s@%s",
sam->account_name.string, sam6->dns_domainname.string);
NT_STATUS_HAVE_NO_MEMORY(sam6->principle.string);
sam6->principal_name.string = talloc_asprintf(
mem_ctx, "%s@%s", sam->account_name.string,
sam6->dns_domainname.string);
NT_STATUS_HAVE_NO_MEMORY(sam6->principal_name.string);
/* And put into the talloc tree */
talloc_steal(sam6, sam3);