Use pidl for _samr_GetAliasMembership().

Guenther

diff --git a/source/rpc_server/srv_samr.c b/source/rpc_server/srv_samr.c
index 8c71e5ea1ee92316147d490a1a3a35914cf7917b..6375d6dbd3d6ac8ae629d067c892fa988d508648 100644 (file)
--- a/source/rpc_server/srv_samr.c
+++ b/source/rpc_server/srv_samr.c
@@ -619,28 +619,7 @@ static bool api_samr_set_userinfo2(pipes_struct *p)
 
 static bool api_samr_query_useraliases(pipes_struct *p)
 {
-       SAMR_Q_QUERY_USERALIASES q_u;
-       SAMR_R_QUERY_USERALIASES 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_useraliases("", &q_u, data, 0)) {
-               DEBUG(0,("api_samr_query_useraliases:  Unable to unmarshall SAMR_Q_QUERY_USERALIASES.\n"));
-               return False;
-       }
-
-       r_u.status = _samr_query_useraliases(p, &q_u, &r_u);
-
-       if (! samr_io_r_query_useraliases("", &r_u, rdata, 0)) {
-               DEBUG(0,("api_samr_query_useraliases:  Unable to nmarshall SAMR_R_QUERY_USERALIASES.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_samr_call(p, NDR_SAMR_GETALIASMEMBERSHIP);
 }
 
 /*******************************************************************

diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index 10a32675e272af8d18bee678dbc56f44f08a2b35..2f852702b2aed719f727b1dc33cc1b148fe1e6d6 100644 (file)
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -3781,10 +3781,11 @@ NTSTATUS _samr_set_userinfo2(pipes_struct *p, SAMR_Q_SET_USERINFO2 *q_u, SAMR_R_
 }
 
 /*********************************************************************
- _samr_query_aliasmem
+ _samr_GetAliasMembership
 *********************************************************************/
 
-NTSTATUS _samr_query_useraliases(pipes_struct *p, SAMR_Q_QUERY_USERALIASES *q_u, SAMR_R_QUERY_USERALIASES *r_u)
+NTSTATUS _samr_GetAliasMembership(pipes_struct *p,
+                                 struct samr_GetAliasMembership *r)
 {
        size_t num_alias_rids;
        uint32 *alias_rids;
@@ -3796,17 +3797,15 @@ NTSTATUS _samr_query_useraliases(pipes_struct *p, SAMR_Q_QUERY_USERALIASES *q_u,
 
        DOM_SID *members;
 
-       r_u->status = NT_STATUS_OK;
-
-       DEBUG(5,("_samr_query_useraliases: %d\n", __LINE__));
+       DEBUG(5,("_samr_GetAliasMembership: %d\n", __LINE__));
 
        /* find the policy handle.  open a policy on it. */
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)(void *)&info))
+       if (!find_policy_by_hnd(p, r->in.domain_handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
-               
-       ntstatus1 = access_check_samr_function(info->acc_granted, SA_RIGHT_DOMAIN_LOOKUP_ALIAS_BY_MEM, "_samr_query_useraliases");
-       ntstatus2 = access_check_samr_function(info->acc_granted, SA_RIGHT_DOMAIN_OPEN_ACCOUNT, "_samr_query_useraliases");
-       
+
+       ntstatus1 = access_check_samr_function(info->acc_granted, SA_RIGHT_DOMAIN_LOOKUP_ALIAS_BY_MEM, "_samr_GetAliasMembership");
+       ntstatus2 = access_check_samr_function(info->acc_granted, SA_RIGHT_DOMAIN_OPEN_ACCOUNT, "_samr_GetAliasMembership");
+
        if (!NT_STATUS_IS_OK(ntstatus1) || !NT_STATUS_IS_OK(ntstatus2)) {
                if (!(NT_STATUS_EQUAL(ntstatus1,NT_STATUS_ACCESS_DENIED) && NT_STATUS_IS_OK(ntstatus2)) &&
                    !(NT_STATUS_EQUAL(ntstatus1,NT_STATUS_ACCESS_DENIED) && NT_STATUS_IS_OK(ntstatus1))) {
@@ -3818,8 +3817,8 @@ NTSTATUS _samr_query_useraliases(pipes_struct *p, SAMR_Q_QUERY_USERALIASES *q_u,
            !sid_check_is_builtin(&info->sid))
                return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
-       if (q_u->num_sids1) {
-               members = TALLOC_ARRAY(p->mem_ctx, DOM_SID, q_u->num_sids1);
+       if (r->in.sids->num_sids) {
+               members = TALLOC_ARRAY(p->mem_ctx, DOM_SID, r->in.sids->num_sids);
 
                if (members == NULL)
                        return NT_STATUS_NO_MEMORY;
@@ -3827,15 +3826,15 @@ NTSTATUS _samr_query_useraliases(pipes_struct *p, SAMR_Q_QUERY_USERALIASES *q_u,
                members = NULL;
        }
 
-       for (i=0; i<q_u->num_sids1; i++)
-               sid_copy(&members[i], &q_u->sid[i].sid);
+       for (i=0; i<r->in.sids->num_sids; i++)
+               sid_copy(&members[i], r->in.sids->sids[i].sid);
 
        alias_rids = NULL;
        num_alias_rids = 0;
 
        become_root();
        ntstatus1 = pdb_enum_alias_memberships(p->mem_ctx, &info->sid, members,
-                                              q_u->num_sids1,
+                                              r->in.sids->num_sids,
                                               &alias_rids, &num_alias_rids);
        unbecome_root();
 
@@ -3843,8 +3842,9 @@ NTSTATUS _samr_query_useraliases(pipes_struct *p, SAMR_Q_QUERY_USERALIASES *q_u,
                return ntstatus1;
        }
 
-       init_samr_r_query_useraliases(r_u, num_alias_rids, alias_rids,
-                                     NT_STATUS_OK);
+       r->out.rids->count = num_alias_rids;
+       r->out.rids->ids = alias_rids;
+
        return NT_STATUS_OK;
 }
 
@@ -5157,16 +5157,6 @@ NTSTATUS _samr_EnumDomainAliases(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_GetAliasMembership(pipes_struct *p,
-                                 struct samr_GetAliasMembership *r)
-{
-       p->rng_fault_state = true;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
 NTSTATUS _samr_LookupNames(pipes_struct *p,
                           struct samr_LookupNames *r)
 {