s3: Fix bug 7842: WINBINDD_LOOKUPRIDS does not return the domain name

(cherry picked from commit 0737a34a12e46d53e4332ea06eac0ba948608fff)

diff --git a/source3/librpc/gen_ndr/cli_wbint.c b/source3/librpc/gen_ndr/cli_wbint.c
index 592b27b50dbf7dd138e5dbb18a02181b40a73a2d..7200d2ac94cd43aca318aed8942091b240c2d6df 100644 (file)
--- a/source3/librpc/gen_ndr/cli_wbint.c
+++ b/source3/librpc/gen_ndr/cli_wbint.c
@@ -2509,6 +2509,7 @@ struct tevent_req *rpccli_wbint_LookupRids_send(TALLOC_CTX *mem_ctx,
                                                struct tevent_context *ev,
                                                struct rpc_pipe_client *cli,
                                                struct wbint_RidArray *_rids /* [in] [ref] */,
+                                               const char **_domain_name /* [out] [ref,charset(UTF8)] */,
                                                struct wbint_Principals *_names /* [out] [ref] */)
 {
        struct tevent_req *req;
@@ -2527,6 +2528,7 @@ struct tevent_req *rpccli_wbint_LookupRids_send(TALLOC_CTX *mem_ctx,
        state->orig.in.rids = _rids;
 
        /* Out parameters */
+       state->orig.out.domain_name = _domain_name;
        state->orig.out.names = _names;
 
        /* Result */
@@ -2575,6 +2577,7 @@ static void rpccli_wbint_LookupRids_done(struct tevent_req *subreq)
        }
 
        /* Copy out parameters */
+       *state->orig.out.domain_name = *state->tmp.out.domain_name;
        *state->orig.out.names = *state->tmp.out.names;
 
        /* Copy result */
@@ -2612,6 +2615,7 @@ NTSTATUS rpccli_wbint_LookupRids_recv(struct tevent_req *req,
 NTSTATUS rpccli_wbint_LookupRids(struct rpc_pipe_client *cli,
                                 TALLOC_CTX *mem_ctx,
                                 struct wbint_RidArray *rids /* [in] [ref] */,
+                                const char **domain_name /* [out] [ref,charset(UTF8)] */,
                                 struct wbint_Principals *names /* [out] [ref] */)
 {
        struct wbint_LookupRids r;
@@ -2635,6 +2639,7 @@ NTSTATUS rpccli_wbint_LookupRids(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
+       *domain_name = *r.out.domain_name;
        *names = *r.out.names;
 
        /* Return result */

diff --git a/source3/librpc/gen_ndr/cli_wbint.h b/source3/librpc/gen_ndr/cli_wbint.h
index 4528d43efc2eb46013268fc36716f814f7af409c..c4f9a813bb2ed490f6f4ed4aa18e40938a7e889c 100644 (file)
--- a/source3/librpc/gen_ndr/cli_wbint.h
+++ b/source3/librpc/gen_ndr/cli_wbint.h
@@ -224,6 +224,7 @@ struct tevent_req *rpccli_wbint_LookupRids_send(TALLOC_CTX *mem_ctx,
                                                struct tevent_context *ev,
                                                struct rpc_pipe_client *cli,
                                                struct wbint_RidArray *_rids /* [in] [ref] */,
+                                               const char **_domain_name /* [out] [ref,charset(UTF8)] */,
                                                struct wbint_Principals *_names /* [out] [ref] */);
 NTSTATUS rpccli_wbint_LookupRids_recv(struct tevent_req *req,
                                      TALLOC_CTX *mem_ctx,
@@ -231,6 +232,7 @@ NTSTATUS rpccli_wbint_LookupRids_recv(struct tevent_req *req,
 NTSTATUS rpccli_wbint_LookupRids(struct rpc_pipe_client *cli,
                                 TALLOC_CTX *mem_ctx,
                                 struct wbint_RidArray *rids /* [in] [ref] */,
+                                const char **domain_name /* [out] [ref,charset(UTF8)] */,
                                 struct wbint_Principals *names /* [out] [ref] */);
 struct tevent_req *rpccli_wbint_CheckMachineAccount_send(TALLOC_CTX *mem_ctx,
                                                         struct tevent_context *ev,

diff --git a/source3/librpc/gen_ndr/ndr_wbint.c b/source3/librpc/gen_ndr/ndr_wbint.c
index 50f781cc208c43f646d35ce7c4beb9d22ce2b3f7..5bb68324f1915f79f6844799363ed943054fe80a 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_wbint.c
+++ b/source3/librpc/gen_ndr/ndr_wbint.c
@@ -2082,6 +2082,16 @@ static enum ndr_err_code ndr_push_wbint_LookupRids(struct ndr_push *ndr, int fla
                NDR_CHECK(ndr_push_wbint_RidArray(ndr, NDR_SCALARS, r->in.rids));
        }
        if (flags & NDR_OUT) {
+               if (r->out.domain_name == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+               }
+               NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.domain_name));
+               if (*r->out.domain_name) {
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(*r->out.domain_name, CH_UTF8)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(*r->out.domain_name, CH_UTF8)));
+                       NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, *r->out.domain_name, ndr_charset_length(*r->out.domain_name, CH_UTF8), sizeof(uint8_t), CH_UTF8));
+               }
                if (r->out.names == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
@@ -2093,7 +2103,10 @@ static enum ndr_err_code ndr_push_wbint_LookupRids(struct ndr_push *ndr, int fla
 
 static enum ndr_err_code ndr_pull_wbint_LookupRids(struct ndr_pull *ndr, int flags, struct wbint_LookupRids *r)
 {
+       uint32_t _ptr_domain_name;
        TALLOC_CTX *_mem_save_rids_0;
+       TALLOC_CTX *_mem_save_domain_name_0;
+       TALLOC_CTX *_mem_save_domain_name_1;
        TALLOC_CTX *_mem_save_names_0;
        if (flags & NDR_IN) {
                ZERO_STRUCT(r->out);
@@ -2105,10 +2118,36 @@ static enum ndr_err_code ndr_pull_wbint_LookupRids(struct ndr_pull *ndr, int fla
                NDR_PULL_SET_MEM_CTX(ndr, r->in.rids, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_wbint_RidArray(ndr, NDR_SCALARS, r->in.rids));
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_rids_0, LIBNDR_FLAG_REF_ALLOC);
+               NDR_PULL_ALLOC(ndr, r->out.domain_name);
+               ZERO_STRUCTP(r->out.domain_name);
                NDR_PULL_ALLOC(ndr, r->out.names);
                ZERO_STRUCTP(r->out.names);
        }
        if (flags & NDR_OUT) {
+               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+                       NDR_PULL_ALLOC(ndr, r->out.domain_name);
+               }
+               _mem_save_domain_name_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->out.domain_name, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_domain_name));
+               if (_ptr_domain_name) {
+                       NDR_PULL_ALLOC(ndr, *r->out.domain_name);
+               } else {
+                       *r->out.domain_name = NULL;
+               }
+               if (*r->out.domain_name) {
+                       _mem_save_domain_name_1 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, *r->out.domain_name, 0);
+                       NDR_CHECK(ndr_pull_array_size(ndr, r->out.domain_name));
+                       NDR_CHECK(ndr_pull_array_length(ndr, r->out.domain_name));
+                       if (ndr_get_array_length(ndr, r->out.domain_name) > ndr_get_array_size(ndr, r->out.domain_name)) {
+                               return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, r->out.domain_name), ndr_get_array_length(ndr, r->out.domain_name));
+                       }
+                       NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, r->out.domain_name), sizeof(uint8_t)));
+                       NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, r->out.domain_name, ndr_get_array_length(ndr, r->out.domain_name), sizeof(uint8_t), CH_UTF8));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domain_name_1, 0);
+               }
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domain_name_0, LIBNDR_FLAG_REF_ALLOC);
                if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
                        NDR_PULL_ALLOC(ndr, r->out.names);
                }
@@ -2140,6 +2179,15 @@ _PUBLIC_ void ndr_print_wbint_LookupRids(struct ndr_print *ndr, const char *name
        if (flags & NDR_OUT) {
                ndr_print_struct(ndr, "out", "wbint_LookupRids");
                ndr->depth++;
+               ndr_print_ptr(ndr, "domain_name", r->out.domain_name);
+               ndr->depth++;
+               ndr_print_ptr(ndr, "domain_name", *r->out.domain_name);
+               ndr->depth++;
+               if (*r->out.domain_name) {
+                       ndr_print_string(ndr, "domain_name", *r->out.domain_name);
+               }
+               ndr->depth--;
+               ndr->depth--;
                ndr_print_ptr(ndr, "names", r->out.names);
                ndr->depth++;
                ndr_print_wbint_Principals(ndr, "names", r->out.names);

diff --git a/source3/librpc/gen_ndr/srv_wbint.c b/source3/librpc/gen_ndr/srv_wbint.c
index efd9be6b7a5519c126679366f0b705878d5b71f6..afa50cac5fee4c2ff992fc371f1544c926edc06c 100644 (file)
--- a/source3/librpc/gen_ndr/srv_wbint.c
+++ b/source3/librpc/gen_ndr/srv_wbint.c
@@ -1423,6 +1423,12 @@ static bool api_wbint_LookupRids(pipes_struct *p)
        }
 
        ZERO_STRUCT(r->out);
+       r->out.domain_name = talloc_zero(r, const char *);
+       if (r->out.domain_name == NULL) {
+               talloc_free(r);
+               return false;
+       }
+
        r->out.names = talloc_zero(r, struct wbint_Principals);
        if (r->out.names == NULL) {
                talloc_free(r);
@@ -2168,6 +2174,11 @@ NTSTATUS rpc_wbint_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, co
                case NDR_WBINT_LOOKUPRIDS: {
                        struct wbint_LookupRids *r = (struct wbint_LookupRids *)_r;
                        ZERO_STRUCT(r->out);
+                       r->out.domain_name = talloc_zero(mem_ctx, const char *);
+                       if (r->out.domain_name == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+                       }
+
                        r->out.names = talloc_zero(mem_ctx, struct wbint_Principals);
                        if (r->out.names == NULL) {
                        return NT_STATUS_NO_MEMORY;

diff --git a/source3/librpc/gen_ndr/wbint.h b/source3/librpc/gen_ndr/wbint.h
index 96b7800624f10173b85a6c4b58b24b1461de51c9..2add7fc7e393920708624d02cff613a3527404e5 100644 (file)
--- a/source3/librpc/gen_ndr/wbint.h
+++ b/source3/librpc/gen_ndr/wbint.h
@@ -280,6 +280,7 @@ struct wbint_LookupRids {
        } in;
 
        struct {
+               const char **domain_name;/* [ref,charset(UTF8)] */
                struct wbint_Principals *names;/* [ref] */
                NTSTATUS result;
        } out;

diff --git a/source3/librpc/idl/wbint.idl b/source3/librpc/idl/wbint.idl
index 432d59e08616400d1a44b219baa99909412bdcd5..d12fae8a83cc2e36b841c4752dfb343953d8bc71 100644 (file)
--- a/source3/librpc/idl/wbint.idl
+++ b/source3/librpc/idl/wbint.idl
@@ -141,6 +141,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 9fef7801179dbfe7a1cf328f54dff53a34eaa5ef..b4232a90cfdf352026da1cec45cff783b8201330 100644 (file)
--- a/source3/winbindd/winbindd_dual_srv.c
+++ b/source3/winbindd/winbindd_dual_srv.c
@@ -379,6 +379,8 @@ NTSTATUS _wbint_LookupRids(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 51cd4d8e2ad333f64b19f0a5f90c6477d10abcb4..e1ac26cf2973a54fa1be18034f528de2746ae068 100644 (file)
--- a/source3/winbindd/winbindd_lookuprids.c
+++ b/source3/winbindd/winbindd_lookuprids.c
@@ -83,7 +83,8 @@ struct tevent_req *winbindd_lookuprids_send(TALLOC_CTX *mem_ctx,
        }
 
        subreq = rpccli_wbint_LookupRids_send(
-               state, ev, domain->child.rpccli, &state->rids, &state->names);
+               state, ev, domain->child.rpccli, &state->rids,
+               &state->domain_name, &state->names);
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
        }