From ec55c18ceda5c430eaec97c5d7e594941e3a31fc Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 22 Jan 2018 09:27:49 +0100 Subject: s4:rpc_server/lsa: rename 'state' variable to 'policy_state' in dcesrv_lsa_LookupNames2() Bug: https://bugzilla.samba.org/show_bug.cgi?id=13286 Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme --- source4/rpc_server/lsa/lsa_lookup.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/source4/rpc_server/lsa/lsa_lookup.c b/source4/rpc_server/lsa/lsa_lookup.c index 65c664ebfb8..cefc48fcd8b 100644 --- a/source4/rpc_server/lsa/lsa_lookup.c +++ b/source4/rpc_server/lsa/lsa_lookup.c @@ -1015,8 +1015,8 @@ NTSTATUS dcesrv_lsa_LookupNames2(struct dcesrv_call_state *dce_call, { enum dcerpc_transport_t transport = dcerpc_binding_get_transport(dce_call->conn->endpoint->ep_description); - struct lsa_policy_state *state; - struct dcesrv_handle *h; + struct lsa_policy_state *policy_state = NULL; + struct dcesrv_handle *policy_handle = NULL; uint32_t i; struct loadparm_context *lp_ctx = dce_call->conn->dce_ctx->lp_ctx; struct lsa_RefDomainList *domains; @@ -1025,7 +1025,9 @@ NTSTATUS dcesrv_lsa_LookupNames2(struct dcesrv_call_state *dce_call, DCESRV_FAULT(DCERPC_FAULT_ACCESS_DENIED); } - DCESRV_PULL_HANDLE(h, r->in.handle, LSA_HANDLE_POLICY); + DCESRV_PULL_HANDLE(policy_handle, r->in.handle, LSA_HANDLE_POLICY); + + policy_state = policy_handle->data; *r->out.domains = NULL; r->out.sids->count = 0; @@ -1037,8 +1039,6 @@ NTSTATUS dcesrv_lsa_LookupNames2(struct dcesrv_call_state *dce_call, return NT_STATUS_INVALID_PARAMETER; } - state = h->data; - domains = talloc_zero(r->out.domains, struct lsa_RefDomainList); if (domains == NULL) { return NT_STATUS_NO_MEMORY; @@ -1069,14 +1069,17 @@ NTSTATUS dcesrv_lsa_LookupNames2(struct dcesrv_call_state *dce_call, r->out.sids->sids[i].sid_index = 0xFFFFFFFF; r->out.sids->sids[i].unknown = 0; - status2 = dcesrv_lsa_lookup_name(dce_call->event_ctx, lp_ctx, state, mem_ctx, name, - &authority_name, &sid, &rtype, &rid); + status2 = dcesrv_lsa_lookup_name(dce_call->event_ctx, lp_ctx, + policy_state, mem_ctx, name, + &authority_name, &sid, &rtype, + &rid); if (!NT_STATUS_IS_OK(status2)) { continue; } - status2 = dcesrv_lsa_authority_list(state, mem_ctx, rtype, authority_name, - sid, domains, &sid_index); + status2 = dcesrv_lsa_authority_list(policy_state, mem_ctx, + rtype, authority_name, sid, + domains, &sid_index); if (!NT_STATUS_IS_OK(status2)) { continue; } -- cgit v1.2.1