s4-samr: merge samr_LookupRids from s3 idl.

Guenther

diff --git a/librpc/idl/samr.idl b/librpc/idl/samr.idl
index f5d3cdac7a1326e28a25a576b88d241561f653e7..eb5b23e9efe2e19f4a4e43c80b8d9f5c1c77bb70 100644 (file)
--- a/librpc/idl/samr.idl
+++ b/librpc/idl/samr.idl
@@ -528,8 +528,8 @@ import "misc.idl", "lsa.idl", "security.idl";
                [in,ref]      policy_handle *domain_handle,
                [in,range(0,1000)] uint32 num_rids,
                [in,size_is(1000),length_is(num_rids)] uint32 rids[],
-               [out]         lsa_Strings names,
-               [out]         samr_Ids types
+               [out,ref]     lsa_Strings *names,
+               [out,ref]     samr_Ids *types
                );
 
        /************************/

diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 86e4a5217510c143511490e1ebd7dd3a8818570f..9a45616a8bfa3ac7535cf6b51272e2ee8991ee36 100644 (file)
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -1952,8 +1952,8 @@ static NTSTATUS dcesrv_samr_LookupRids(struct dcesrv_call_state *dce_call, TALLO
        struct lsa_String *names;
        uint32_t *ids;
 
-       ZERO_STRUCT(r->out.names);
-       ZERO_STRUCT(r->out.types);
+       ZERO_STRUCTP(r->out.names);
+       ZERO_STRUCTP(r->out.types);
 
        DCESRV_PULL_HANDLE(h, r->in.domain_handle, SAMR_HANDLE_DOMAIN);
 
@@ -2014,11 +2014,11 @@ static NTSTATUS dcesrv_samr_LookupRids(struct dcesrv_call_state *dce_call, TALLO
                }
        }
 
-       r->out.names.names = names;
-       r->out.names.count = r->in.num_rids;
+       r->out.names->names = names;
+       r->out.names->count = r->in.num_rids;
 
-       r->out.types.ids = ids;
-       r->out.types.count = r->in.num_rids;
+       r->out.types->ids = ids;
+       r->out.types->count = r->in.num_rids;
 
        return status;
 }

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index c52d08ac628dbe2b3d8a1d6a59c1c7b6c63e8a8d..b28877602c4afae32ffac0f79b565c28ff271bf9 100644 (file)
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -3276,6 +3276,9 @@ static bool test_EnumDomainUsers(struct dcerpc_pipe *p, struct torture_context *
        bool ret = true;
        struct samr_LookupNames n;
        struct samr_LookupRids  lr ;
+       struct lsa_Strings names;
+       struct samr_Ids types;
+
        uint32_t masks[] = {ACB_NORMAL, ACB_DOMTRUST, ACB_WSTRUST, 
                            ACB_DISABLED, ACB_NORMAL | ACB_DISABLED, 
                            ACB_SVRTRUST | ACB_DOMTRUST | ACB_WSTRUST, 
@@ -3332,6 +3335,8 @@ static bool test_EnumDomainUsers(struct dcerpc_pipe *p, struct torture_context *
        lr.in.domain_handle = handle;
        lr.in.num_rids = r.out.sam->count;
        lr.in.rids = talloc_array(tctx, uint32_t, r.out.sam->count);
+       lr.out.names = &names;
+       lr.out.types = &types;
        for (i=0;i<r.out.sam->count;i++) {
                lr.in.rids[i] = r.out.sam->entries[i].idx;
        }