s3:winbind: Delegate normalize_name_unmap to the idmap child in winbindd_getpwnam

Delegate name unmapping to the idmap child to avoid blocking the parent while
querying the LDAP server, depending on the idmap configuration.

Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/winbindd/winbindd_getpwnam.c b/source3/winbindd/winbindd_getpwnam.c
index db14fc96ad30860dc695e461f40bfec461e0d08b..f22b724ab66b0fde98f62f34403c3c806397c4a1 100644 (file)
--- a/source3/winbindd/winbindd_getpwnam.c
+++ b/source3/winbindd/winbindd_getpwnam.c
@@ -21,9 +21,12 @@
 #include "winbindd.h"
 #include "passdb/lookup_sid.h" /* only for LOOKUP_NAME_NO_NSS flag */
 #include "libcli/security/dom_sid.h"
+#include "librpc/gen_ndr/ndr_winbind_c.h"
 
 struct winbindd_getpwnam_state {
        struct tevent_context *ev;
+       const char *request_name;
+       const char *unmapped_name;
        char *namespace;
        char *domname;
        char *username;
@@ -35,6 +38,7 @@ struct winbindd_getpwnam_state {
 static void winbindd_getpwnam_lookupname_done(struct tevent_req *subreq);
 static void winbindd_getpwnam_done(struct tevent_req *subreq);
 
+static void winbindd_getgrnam_unmap_done(struct tevent_req *subreq);
 struct tevent_req *winbindd_getpwnam_send(TALLOC_CTX *mem_ctx,
                                          struct tevent_context *ev,
                                          struct winbindd_cli_state *cli,
@@ -42,9 +46,6 @@ struct tevent_req *winbindd_getpwnam_send(TALLOC_CTX *mem_ctx,
 {
        struct tevent_req *req, *subreq;
        struct winbindd_getpwnam_state *state;
-       char *domuser, *mapped_user;
-       NTSTATUS status;
-       bool ok;
 
        req = tevent_req_create(mem_ctx, &state,
                                struct winbindd_getpwnam_state);
@@ -62,38 +63,68 @@ struct tevent_req *winbindd_getpwnam_send(TALLOC_CTX *mem_ctx,
                 (unsigned int)cli->pid,
                 request->data.username);
 
-       domuser = request->data.username;
+       state->request_name = talloc_strdup(state, request->data.username);
+       if (tevent_req_nomem(state->request_name, req)) {
+               return tevent_req_post(req, ev);
+       }
 
-       status = normalize_name_unmap(state, domuser, &mapped_user);
+       subreq = dcerpc_wbint_NormalizeNameUnmap_send(state,
+                                                     state->ev,
+                                                     idmap_child_handle(),
+                                                     state->request_name,
+                                                     &state->unmapped_name);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, winbindd_getgrnam_unmap_done, req);
+       return req;
+}
 
-       if (NT_STATUS_IS_OK(status)
-           || NT_STATUS_EQUAL(status, NT_STATUS_FILE_RENAMED)) {
-               /* normalize_name_unmapped did something */
-               domuser = mapped_user;
+static void winbindd_getgrnam_unmap_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(subreq,
+                                                         struct tevent_req);
+       struct winbindd_getpwnam_state *state = tevent_req_data(
+               req, struct winbindd_getpwnam_state);
+       NTSTATUS status;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       bool ok;
+
+       status = dcerpc_wbint_NormalizeNameUnmap_recv(subreq, state, &result);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+
+       if (NT_STATUS_IS_OK(result) ||
+           NT_STATUS_EQUAL(result, NT_STATUS_FILE_RENAMED))
+       {
+               /* dcerpc_wbint_NormalizeNameUnmap did something */
+               state->request_name = state->unmapped_name;
        }
 
        ok = parse_domain_user(state,
-                              domuser,
+                              state->request_name,
                               &state->namespace,
                               &state->domname,
                               &state->username);
        if (!ok) {
-               D_WARNING("Could not parse domain user: %s\n", domuser);
+               D_WARNING("Could not parse domain user: %s\n",
+                         state->request_name);
                tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-               return tevent_req_post(req, ev);
+               return;
        }
 
-       subreq = wb_lookupname_send(state, ev,
+       subreq = wb_lookupname_send(state,
+                                   state->ev,
                                    state->namespace,
                                    state->domname,
                                    state->username,
                                    LOOKUP_NAME_NO_NSS);
        if (tevent_req_nomem(subreq, req)) {
-               return tevent_req_post(req, ev);
+               return;
        }
-       tevent_req_set_callback(subreq, winbindd_getpwnam_lookupname_done,
-                               req);
-       return req;
+       tevent_req_set_callback(subreq, winbindd_getpwnam_lookupname_done, req);
 }
 
 static void winbindd_getpwnam_lookupname_done(struct tevent_req *subreq)