[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  aa8dde6 s3: Fix bug 7842: WINBIND_LOOKUPRIDS does not return the 
proper domain name
      from  f0454dd s3: Fix bug 7841: WINBINDD_LOOKUPRIDS asks the wrong domain

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit aa8dde606ad6f052c674c3490836e802655e129b
Author: Volker Lendecke <v...@samba.org>
Date:   Sat Dec 4 20:16:00 2010 +0100

    s3: Fix bug 7842: WINBIND_LOOKUPRIDS does not return the proper domain name

-----------------------------------------------------------------------

Summary of changes:
 source3/librpc/idl/wbint.idl           |    1 +
 source3/winbindd/winbindd_dual_srv.c   |    2 ++
 source3/winbindd/winbindd_lookuprids.c |    3 ++-
 3 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/librpc/idl/wbint.idl b/source3/librpc/idl/wbint.idl
index 4ac3693..470fb8b 100644
--- a/source3/librpc/idl/wbint.idl
+++ b/source3/librpc/idl/wbint.idl
@@ -142,6 +142,7 @@ interface wbint
 
     NTSTATUS wbint_LookupRids(
        [in] wbint_RidArray *rids,
+       [out,string,charset(UTF8)] char **domain_name,
        [out] wbint_Principals *names
        );
 
diff --git a/source3/winbindd/winbindd_dual_srv.c 
b/source3/winbindd/winbindd_dual_srv.c
index b661fb3..1501fd8 100644
--- a/source3/winbindd/winbindd_dual_srv.c
+++ b/source3/winbindd/winbindd_dual_srv.c
@@ -385,6 +385,8 @@ NTSTATUS _wbint_LookupRids(struct pipes_struct *p, struct 
wbint_LookupRids *r)
                return status;
        }
 
+       *r->out.domain_name = talloc_move(r->out.domain_name, &domain_name);
+
        result = talloc_array(p->mem_ctx, struct wbint_Principal,
                              r->in.rids->num_rids);
        if (result == NULL) {
diff --git a/source3/winbindd/winbindd_lookuprids.c 
b/source3/winbindd/winbindd_lookuprids.c
index bd0a946..5577ad4 100644
--- a/source3/winbindd/winbindd_lookuprids.c
+++ b/source3/winbindd/winbindd_lookuprids.c
@@ -84,7 +84,8 @@ struct tevent_req *winbindd_lookuprids_send(TALLOC_CTX 
*mem_ctx,
        }
 
        subreq = dcerpc_wbint_LookupRids_send(
-               state, ev, domain->child.binding_handle, &state->rids, 
&state->names);
+               state, ev, domain->child.binding_handle, &state->rids,
+               &state->domain_name, &state->names);
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
        }


-- 
Samba Shared Repository