From 88c46879453a71ac5e5aff9bc3bbdb5d36b84a44 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 1 Feb 2016 21:45:48 +0100 Subject: [PATCH] idl: Rename "principle" to "principal_name" Signed-off-by: Volker Lendecke Reviewed-by: Guenther Deschner --- librpc/idl/netlogon.idl | 2 +- source3/auth/server_info.c | 8 ++++---- source4/rpc_server/netlogon/dcerpc_netlogon.c | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl index 19daaf635d9..a5c62308fa3 100644 --- a/librpc/idl/netlogon.idl +++ b/librpc/idl/netlogon.idl @@ -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; diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c index 9194cbd534f..e65fd5863d5 100644 --- a/source3/auth/server_info.c +++ b/source3/auth/server_info.c @@ -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; } diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index 49b5b2f2379..34bf1ea06a4 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -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);