sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-30 20:23:49 +03:00
Code Activity

Use pidl for _samr_GetMembersInAlias().

Browse Source 
Guenther
This commit is contained in:
Günther Deschner
2008-02-05 00:29:11 +01:00
parent 27e0b6a1aa
commit f6db8a51c8
2 changed files with 23 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/rpc_server/srv_samr.c
View File

@@ -669,28 +669,7 @@ static bool api_samr_query_useraliases(pipes_struct *p)
static bool api_samr_query_aliasmem(pipes_struct *p) static bool api_samr_query_aliasmem(pipes_struct *p)
{ {
SAMR_Q_QUERY_ALIASMEM q_u; return proxy_samr_call(p, NDR_SAMR_GETMEMBERSINALIAS);
SAMR_R_QUERY_ALIASMEM r_u;
prs_struct *data = &p->in_data.data;
prs_struct *rdata = &p->out_data.rdata;
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
if (!samr_io_q_query_aliasmem("", &q_u, data, 0)) {
DEBUG(0,("api_samr_query_aliasmem: unable to unmarshall SAMR_Q_QUERY_ALIASMEM.\n"));
return False;
}
r_u.status = _samr_query_aliasmem(p, &q_u, &r_u);
if (!samr_io_r_query_aliasmem("", &r_u, rdata, 0)) {
DEBUG(0,("api_samr_query_aliasmem: unable to marshall SAMR_R_QUERY_ALIASMEM.\n"));
return False;
}
return True;
} }
/******************************************************************* /*******************************************************************

48
source/rpc_server/srv_samr_nt.c
View File

@@ -3846,34 +3846,35 @@ NTSTATUS _samr_query_useraliases(pipes_struct *p, SAMR_Q_QUERY_USERALIASES *q_u,
} }
/********************************************************************* /*********************************************************************
_samr_query_aliasmem _samr_GetMembersInAlias
*********************************************************************/ *********************************************************************/
NTSTATUS _samr_query_aliasmem(pipes_struct *p, SAMR_Q_QUERY_ALIASMEM *q_u, SAMR_R_QUERY_ALIASMEM *r_u) NTSTATUS _samr_GetMembersInAlias(pipes_struct *p,
struct samr_GetMembersInAlias *r)
{ {
NTSTATUS status; NTSTATUS status;
size_t i; size_t i;
size_t num_sids = 0; size_t num_sids = 0;
DOM_SID2 *sid; struct lsa_SidPtr *sids = NULL;
DOM_SID *sids=NULL; DOM_SID *pdb_sids = NULL;
DOM_SID alias_sid; DOM_SID alias_sid;
uint32 acc_granted; uint32 acc_granted;
/* find the policy handle. open a policy on it. */ /* find the policy handle. open a policy on it. */
if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &alias_sid, &acc_granted, NULL)) if (!get_lsa_policy_samr_sid(p, r->in.alias_handle, &alias_sid, &acc_granted, NULL))
return NT_STATUS_INVALID_HANDLE; return NT_STATUS_INVALID_HANDLE;
if (!NT_STATUS_IS_OK(r_u->status = status = access_check_samr_function(acc_granted, SA_RIGHT_ALIAS_GET_MEMBERS, "_samr_GetMembersInAlias");
access_check_samr_function(acc_granted, SA_RIGHT_ALIAS_GET_MEMBERS, "_samr_query_aliasmem"))) { if (!NT_STATUS_IS_OK(status)) {
return r_u->status; return status;
} }
DEBUG(10, ("sid is %s\n", sid_string_dbg(&alias_sid))); DEBUG(10, ("sid is %s\n", sid_string_dbg(&alias_sid)));
become_root(); become_root();
status = pdb_enum_aliasmem(&alias_sid, &sids, &num_sids); status = pdb_enum_aliasmem(&alias_sid, &pdb_sids, &num_sids);
unbecome_root(); unbecome_root();
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
@@ -3881,22 +3882,25 @@ NTSTATUS _samr_query_aliasmem(pipes_struct *p, SAMR_Q_QUERY_ALIASMEM *q_u, SAMR_
} }
if (num_sids) { if (num_sids) {
sid = TALLOC_ZERO_ARRAY(p->mem_ctx, DOM_SID2, num_sids); sids = TALLOC_ZERO_ARRAY(p->mem_ctx, struct lsa_SidPtr, num_sids);
if (sid == NULL) { if (sids == NULL) {
SAFE_FREE(sids); TALLOC_FREE(pdb_sids);
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
} else {
sid = NULL;
} }
for (i = 0; i < num_sids; i++) { for (i = 0; i < num_sids; i++) {
init_dom_sid2(&sid[i], &sids[i]); sids[i].sid = sid_dup_talloc(p->mem_ctx, &pdb_sids[i]);
if (!sids[i].sid) {
TALLOC_FREE(pdb_sids);
return NT_STATUS_NO_MEMORY;
}
} }
init_samr_r_query_aliasmem(r_u, num_sids, sid, NT_STATUS_OK); r->out.sids->num_sids = num_sids;
r->out.sids->sids = sids;
TALLOC_FREE(sids); TALLOC_FREE(pdb_sids);
return NT_STATUS_OK; return NT_STATUS_OK;
} }
@@ -5250,16 +5254,6 @@ NTSTATUS _samr_SetAliasInfo(pipes_struct *p,
/**************************************************************** /****************************************************************
****************************************************************/ ****************************************************************/
NTSTATUS _samr_GetMembersInAlias(pipes_struct *p,
struct samr_GetMembersInAlias *r)
{
p->rng_fault_state = true;
return NT_STATUS_NOT_IMPLEMENTED;
}
/****************************************************************
****************************************************************/
NTSTATUS _samr_QueryUserInfo(pipes_struct *p, NTSTATUS _samr_QueryUserInfo(pipes_struct *p,
struct samr_QueryUserInfo *r) struct samr_QueryUserInfo *r)
{ {