winbindd: winbindd_priv_pipe_dir() -> bool_dispatch_table
[samba.git] / source3 / winbindd / winbindd_samr.c
index a3bbb27df950eafd3b38783dbf3841776de431a5..31720d54997082b4847d5fd6bdf1923ff3c8cf39 100644 (file)
 #include "includes.h"
 #include "winbindd.h"
 #include "winbindd_rpc.h"
-
-#include "../librpc/gen_ndr/cli_samr.h"
+#include "lib/util_unixsids.h"
+#include "rpc_client/rpc_client.h"
+#include "rpc_client/cli_pipe.h"
+#include "../librpc/gen_ndr/ndr_samr_c.h"
 #include "rpc_client/cli_samr.h"
-#include "../librpc/gen_ndr/srv_samr.h"
-#include "../librpc/gen_ndr/cli_lsa.h"
+#include "../librpc/gen_ndr/ndr_lsa_c.h"
 #include "rpc_client/cli_lsarpc.h"
-#include "../librpc/gen_ndr/srv_lsa.h"
+#include "rpc_server/rpc_ncacn_np.h"
+#include "../libcli/security/security.h"
+#include "passdb/machine_sid.h"
+#include "auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-static NTSTATUS open_internal_samr_pipe(TALLOC_CTX *mem_ctx,
-                                       struct rpc_pipe_client **samr_pipe)
+/*
+ * The other end of this won't go away easily, so we can trust it
+ *
+ * It is either a long-lived process with the same lifetime as
+ * winbindd or a part of this process
+ */
+struct winbind_internal_pipes {
+       struct rpc_pipe_client *samr_pipe;
+       struct policy_handle samr_domain_hnd;
+       struct rpc_pipe_client *lsa_pipe;
+       struct policy_handle lsa_hnd;
+};
+
+
+NTSTATUS open_internal_samr_conn(TALLOC_CTX *mem_ctx,
+                                struct winbindd_domain *domain,
+                                struct rpc_pipe_client **samr_pipe,
+                                struct policy_handle *samr_domain_hnd)
 {
-       static struct rpc_pipe_client *cli = NULL;
-       struct auth_serversupplied_info *server_info = NULL;
-       NTSTATUS status;
+       NTSTATUS status, result;
+       struct policy_handle samr_connect_hnd;
+       struct dcerpc_binding_handle *b;
 
-       if (cli != NULL) {
-               goto done;
+       status = wb_open_internal_pipe(mem_ctx, &ndr_table_samr, samr_pipe);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       if (server_info == NULL) {
-               status = make_server_info_system(mem_ctx, &server_info);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(0, ("open_samr_pipe: Could not create auth_serversupplied_info: %s\n",
-                                 nt_errstr(status)));
-                       return status;
-               }
-       }
+       b = (*samr_pipe)->binding_handle;
 
-       /* create a samr connection */
-       status = rpc_pipe_open_internal(talloc_autofree_context(),
-                                       &ndr_table_samr.syntax_id,
-                                       rpc_samr_dispatch,
-                                       server_info,
-                                       &cli);
+       status = dcerpc_samr_Connect2(b, mem_ctx,
+                                     (*samr_pipe)->desthost,
+                                     SEC_FLAG_MAXIMUM_ALLOWED,
+                                     &samr_connect_hnd,
+                                     &result);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("open_samr_pipe: Could not connect to samr_pipe: %s\n",
-                         nt_errstr(status)));
                return status;
        }
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
+       }
 
-done:
-       if (samr_pipe) {
-               *samr_pipe = cli;
+       status = dcerpc_samr_OpenDomain(b, mem_ctx,
+                                       &samr_connect_hnd,
+                                       SEC_FLAG_MAXIMUM_ALLOWED,
+                                       &domain->sid,
+                                       samr_domain_hnd,
+                                       &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       return NT_STATUS_OK;
+       return result;
 }
 
-static NTSTATUS open_internal_samr_conn(TALLOC_CTX *mem_ctx,
-                                       struct winbindd_domain *domain,
-                                       struct rpc_pipe_client **samr_pipe,
-                                       struct policy_handle *samr_domain_hnd)
+NTSTATUS open_internal_lsa_conn(TALLOC_CTX *mem_ctx,
+                               struct rpc_pipe_client **lsa_pipe,
+                               struct policy_handle *lsa_hnd)
 {
        NTSTATUS status;
-       struct policy_handle samr_connect_hnd;
-
-       status = open_internal_samr_pipe(mem_ctx, samr_pipe);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
 
-       status = rpccli_samr_Connect2((*samr_pipe),
-                                     mem_ctx,
-                                     (*samr_pipe)->desthost,
-                                     SEC_FLAG_MAXIMUM_ALLOWED,
-                                     &samr_connect_hnd);
+       status = wb_open_internal_pipe(mem_ctx, &ndr_table_lsarpc, lsa_pipe);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       status = rpccli_samr_OpenDomain((*samr_pipe),
+       status = rpccli_lsa_open_policy((*lsa_pipe),
                                        mem_ctx,
-                                       &samr_connect_hnd,
+                                       true,
                                        SEC_FLAG_MAXIMUM_ALLOWED,
-                                       &domain->sid,
-                                       samr_domain_hnd);
+                                       lsa_hnd);
 
        return status;
 }
 
-static NTSTATUS open_internal_lsa_pipe(TALLOC_CTX *mem_ctx,
-                                      struct rpc_pipe_client **lsa_pipe)
+
+static NTSTATUS open_cached_internal_pipe_conn(
+       struct winbindd_domain *domain,
+       struct rpc_pipe_client **samr_pipe,
+       struct policy_handle *samr_domain_hnd,
+       struct rpc_pipe_client **lsa_pipe,
+       struct policy_handle *lsa_hnd)
 {
-       static struct rpc_pipe_client *cli = NULL;
-       struct auth_serversupplied_info *server_info = NULL;
-       NTSTATUS status;
+       struct winbind_internal_pipes *internal_pipes = NULL;
 
-       if (cli != NULL) {
-               goto done;
-       }
+       if (domain->private_data == NULL) {
+               TALLOC_CTX *frame = talloc_stackframe();
+               NTSTATUS status;
+
+               internal_pipes = talloc_zero(frame,
+                                            struct winbind_internal_pipes);
 
-       if (server_info == NULL) {
-               status = make_server_info_system(mem_ctx, &server_info);
+               status = open_internal_samr_conn(
+                       internal_pipes,
+                       domain,
+                       &internal_pipes->samr_pipe,
+                       &internal_pipes->samr_domain_hnd);
                if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(0, ("open_samr_pipe: Could not create auth_serversupplied_info: %s\n",
-                                 nt_errstr(status)));
+                       TALLOC_FREE(frame);
                        return status;
                }
+
+               status = open_internal_lsa_conn(internal_pipes,
+                                               &internal_pipes->lsa_pipe,
+                                               &internal_pipes->lsa_hnd);
+
+               if (!NT_STATUS_IS_OK(status)) {
+                       TALLOC_FREE(frame);
+                       return status;
+               }
+
+               domain->private_data = talloc_move(domain, &internal_pipes);
+
+               TALLOC_FREE(frame);
+
        }
 
-       /* create a samr connection */
-       status = rpc_pipe_open_internal(talloc_autofree_context(),
-                                       &ndr_table_lsarpc.syntax_id,
-                                       rpc_lsarpc_dispatch,
-                                       server_info,
-                                       &cli);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("open_samr_pipe: Could not connect to samr_pipe: %s\n",
-                         nt_errstr(status)));
-               return status;
+       internal_pipes = talloc_get_type_abort(
+               domain->private_data, struct winbind_internal_pipes);
+
+       if (samr_domain_hnd) {
+               *samr_domain_hnd = internal_pipes->samr_domain_hnd;
+       }
+
+       if (samr_pipe) {
+               *samr_pipe = internal_pipes->samr_pipe;
+       }
+
+       if (lsa_hnd) {
+               *lsa_hnd = internal_pipes->lsa_hnd;
        }
 
-done:
        if (lsa_pipe) {
-               *lsa_pipe = cli;
+               *lsa_pipe = internal_pipes->lsa_pipe;
        }
 
        return NT_STATUS_OK;
 }
 
-static NTSTATUS open_internal_lsa_conn(TALLOC_CTX *mem_ctx,
-                                      struct rpc_pipe_client **lsa_pipe,
-                                      struct policy_handle *lsa_hnd)
+static bool reset_connection_on_error(struct winbindd_domain *domain,
+                                     struct rpc_pipe_client *p,
+                                     NTSTATUS status)
 {
-       NTSTATUS status;
+       struct winbind_internal_pipes *internal_pipes = NULL;
 
-       status = open_internal_lsa_pipe(mem_ctx, lsa_pipe);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
+       internal_pipes = talloc_get_type_abort(
+               domain->private_data, struct winbind_internal_pipes);
+
+       if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT) ||
+           NT_STATUS_EQUAL(status, NT_STATUS_IO_DEVICE_ERROR))
+       {
+               TALLOC_FREE(internal_pipes);
+               domain->private_data = NULL;
+               return true;
        }
 
-       status = rpccli_lsa_open_policy((*lsa_pipe),
-                                       mem_ctx,
-                                       true,
-                                       SEC_FLAG_MAXIMUM_ALLOWED,
-                                       lsa_hnd);
+       if (!rpccli_is_connected(p)) {
+               TALLOC_FREE(internal_pipes);
+               domain->private_data = NULL;
+               return true;
+       }
 
-       return status;
+       return false;
 }
 
 /*********************************************************************
@@ -177,14 +214,15 @@ static NTSTATUS open_internal_lsa_conn(TALLOC_CTX *mem_ctx,
 static NTSTATUS sam_enum_dom_groups(struct winbindd_domain *domain,
                                    TALLOC_CTX *mem_ctx,
                                    uint32_t *pnum_info,
-                                   struct acct_info **pinfo)
+                                   struct wb_acct_info **pinfo)
 {
        struct rpc_pipe_client *samr_pipe;
-       struct policy_handle dom_pol;
-       struct acct_info *info = NULL;
+       struct policy_handle dom_pol = { 0 };
+       struct wb_acct_info *info = NULL;
        uint32_t num_info = 0;
        TALLOC_CTX *tmp_ctx;
        NTSTATUS status;
+       bool retry = false;
 
        DEBUG(3,("sam_enum_dom_groups\n"));
 
@@ -197,9 +235,15 @@ static NTSTATUS sam_enum_dom_groups(struct winbindd_domain *domain,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = open_internal_samr_conn(tmp_ctx, domain, &samr_pipe, &dom_pol);
+again:
+       status = open_cached_internal_pipe_conn(domain,
+                                               &samr_pipe,
+                                               &dom_pol,
+                                               NULL,
+                                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
-               goto error;
+               TALLOC_FREE(tmp_ctx);
+               return status;
        }
 
        status = rpc_enum_dom_groups(tmp_ctx,
@@ -207,8 +251,15 @@ static NTSTATUS sam_enum_dom_groups(struct winbindd_domain *domain,
                                     &dom_pol,
                                     &num_info,
                                     &info);
+
+       if (!retry && reset_connection_on_error(domain, samr_pipe, status)) {
+               retry = true;
+               goto again;
+       }
+
        if (!NT_STATUS_IS_OK(status)) {
-               goto error;
+               TALLOC_FREE(tmp_ctx);
+               return status;
        }
 
        if (pnum_info) {
@@ -219,7 +270,6 @@ static NTSTATUS sam_enum_dom_groups(struct winbindd_domain *domain,
                *pinfo = talloc_move(mem_ctx, &info);
        }
 
-error:
        TALLOC_FREE(tmp_ctx);
        return status;
 }
@@ -227,28 +277,28 @@ error:
 /* Query display info for a domain */
 static NTSTATUS sam_query_user_list(struct winbindd_domain *domain,
                                    TALLOC_CTX *mem_ctx,
-                                   uint32_t *pnum_info,
-                                   struct wbint_userinfo **pinfo)
+                                   uint32_t **prids)
 {
        struct rpc_pipe_client *samr_pipe = NULL;
-       struct policy_handle dom_pol;
-       struct wbint_userinfo *info = NULL;
-       uint32_t num_info = 0;
+       struct policy_handle dom_pol = { 0 };
+       uint32_t *rids = NULL;
        TALLOC_CTX *tmp_ctx;
        NTSTATUS status;
+       bool retry = false;
 
        DEBUG(3,("samr_query_user_list\n"));
 
-       if (pnum_info) {
-               *pnum_info = 0;
-       }
-
        tmp_ctx = talloc_stackframe();
        if (tmp_ctx == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = open_internal_samr_conn(tmp_ctx, domain, &samr_pipe, &dom_pol);
+again:
+       status = open_cached_internal_pipe_conn(domain,
+                                               &samr_pipe,
+                                               &dom_pol,
+                                               NULL,
+                                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -257,67 +307,22 @@ static NTSTATUS sam_query_user_list(struct winbindd_domain *domain,
                                     samr_pipe,
                                     &dom_pol,
                                     &domain->sid,
-                                    &num_info,
-                                    &info);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto done;
-       }
-
-       if (pnum_info) {
-               *pnum_info = num_info;
-       }
-
-       if (pinfo) {
-               *pinfo = talloc_move(mem_ctx, &info);
+                                    &rids);
+       if (!retry && reset_connection_on_error(domain, samr_pipe, status)) {
+               retry = true;
+               goto again;
        }
 
-done:
-       TALLOC_FREE(tmp_ctx);
-       return status;
-}
-
-/* Lookup user information from a rid or username. */
-static NTSTATUS sam_query_user(struct winbindd_domain *domain,
-                              TALLOC_CTX *mem_ctx,
-                              const struct dom_sid *user_sid,
-                              struct wbint_userinfo *user_info)
-{
-       struct rpc_pipe_client *samr_pipe;
-       struct policy_handle dom_pol;
-       TALLOC_CTX *tmp_ctx;
-       NTSTATUS status;
-
-       DEBUG(3,("sam_query_user\n"));
-
-       /* Paranoia check */
-       if (!sid_check_is_in_our_domain(user_sid)) {
-               return NT_STATUS_NO_SUCH_USER;
-       }
-
-       if (user_info) {
-               user_info->homedir = NULL;
-               user_info->shell = NULL;
-               user_info->primary_gid = (gid_t) -1;
-       }
-
-       tmp_ctx = talloc_stackframe();
-       if (tmp_ctx == NULL) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       status = open_internal_samr_conn(tmp_ctx, domain, &samr_pipe, &dom_pol);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
 
-       status = rpc_query_user(tmp_ctx,
-                               samr_pipe,
-                               &dom_pol,
-                               &domain->sid,
-                               user_sid,
-                               user_info);
+       if (prids != NULL) {
+               *prids = talloc_move(mem_ctx, &rids);
+       }
 
 done:
+       TALLOC_FREE(rids);
        TALLOC_FREE(tmp_ctx);
        return status;
 }
@@ -325,87 +330,58 @@ done:
 /* get a list of trusted domains - builtin domain */
 static NTSTATUS sam_trusted_domains(struct winbindd_domain *domain,
                                    TALLOC_CTX *mem_ctx,
-                                   struct netr_DomainTrustList *trusts)
+                                   struct netr_DomainTrustList *ptrust_list)
 {
        struct rpc_pipe_client *lsa_pipe;
-       struct netr_DomainTrust *array = NULL;
-       struct policy_handle lsa_policy;
-       uint32_t enum_ctx = 0;
-       uint32_t count = 0;
+       struct policy_handle lsa_policy = { 0 };
+       struct netr_DomainTrust *trusts = NULL;
+       uint32_t num_trusts = 0;
        TALLOC_CTX *tmp_ctx;
        NTSTATUS status;
+       bool retry = false;
 
        DEBUG(3,("samr: trusted domains\n"));
 
+       if (ptrust_list) {
+               ZERO_STRUCTP(ptrust_list);
+       }
+
        tmp_ctx = talloc_stackframe();
        if (tmp_ctx == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = open_internal_lsa_conn(tmp_ctx, &lsa_pipe, &lsa_policy);
+again:
+       status = open_cached_internal_pipe_conn(domain,
+                                               NULL,
+                                               NULL,
+                                               &lsa_pipe,
+                                               &lsa_policy);
        if (!NT_STATUS_IS_OK(status)) {
-               goto error;
+               goto done;
        }
 
-       do {
-               struct lsa_DomainList dom_list;
-               uint32_t start_idx;
-               uint32_t i;
-
-               /*
-                * We don't run into deadlocks here, cause winbind_off() is
-                * called in the main function.
-                */
-               status = rpccli_lsa_EnumTrustDom(lsa_pipe,
-                                                tmp_ctx,
-                                                &lsa_policy,
-                                                &enum_ctx,
-                                                &dom_list,
-                                                (uint32_t) -1);
-               if (!NT_STATUS_IS_OK(status)) {
-                       if (!NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
-                               goto error;
-                       }
-               }
-
-               start_idx = trusts->count;
-               count += dom_list.count;
+       status = rpc_trusted_domains(tmp_ctx,
+                                    lsa_pipe,
+                                    &lsa_policy,
+                                    &num_trusts,
+                                    &trusts);
 
-               array = talloc_realloc(tmp_ctx,
-                                      array,
-                                      struct netr_DomainTrust,
-                                      count);
-               if (array == NULL) {
-                       status = NT_STATUS_NO_MEMORY;
-                       goto error;
-               }
-
-               for (i = 0; i < dom_list.count; i++) {
-                       struct netr_DomainTrust *trust = &array[i];
-                       struct dom_sid *sid;
-
-                       ZERO_STRUCTP(trust);
-
-                       trust->netbios_name = talloc_move(array,
-                                                         &dom_list.domains[i].name.string);
-                       trust->dns_name = NULL;
+       if (!retry && reset_connection_on_error(domain, lsa_pipe, status)) {
+               retry = true;
+               goto again;
+       }
 
-                       sid = talloc(array, struct dom_sid);
-                       if (sid == NULL) {
-                               status = NT_STATUS_NO_MEMORY;
-                               goto error;
-                       }
-                       sid_copy(sid, dom_list.domains[i].sid);
-                       trust->sid = sid;
-               }
-       } while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES));
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
+       }
 
-       if (trusts) {
-               trusts->count = count;
-               trusts->array = talloc_move(mem_ctx, &array);
+       if (ptrust_list) {
+               ptrust_list->count = num_trusts;
+               ptrust_list->array = talloc_move(mem_ctx, &trusts);
        }
 
-error:
+done:
        TALLOC_FREE(tmp_ctx);
        return status;
 }
@@ -421,33 +397,27 @@ static NTSTATUS sam_lookup_groupmem(struct winbindd_domain *domain,
                                    uint32_t **pname_types)
 {
        struct rpc_pipe_client *samr_pipe;
-       struct policy_handle dom_pol, group_pol;
-       uint32_t samr_access = SEC_FLAG_MAXIMUM_ALLOWED;
-       struct samr_RidTypeArray *rids = NULL;
-       uint32_t group_rid;
-       uint32_t *rid_mem = NULL;
+       struct policy_handle dom_pol = { 0 };
 
        uint32_t num_names = 0;
-       uint32_t total_names = 0;
        struct dom_sid *sid_mem = NULL;
        char **names = NULL;
        uint32_t *name_types = NULL;
 
-       struct lsa_Strings tmp_names;
-       struct samr_Ids tmp_types;
-
-       uint32_t j, r;
        TALLOC_CTX *tmp_ctx;
        NTSTATUS status;
+       bool retry = false;
 
-       DEBUG(3,("samr: lookup groupmem\n"));
+       DEBUG(3,("sam_lookup_groupmem\n"));
 
-       if (pnum_names) {
-               pnum_names = 0;
+       /* Paranoia check */
+       if (sid_check_is_in_builtin(group_sid) && (type != SID_NAME_ALIAS)) {
+               /* There's no groups, only aliases in BUILTIN */
+               return NT_STATUS_NO_SUCH_GROUP;
        }
 
-       if (!sid_peek_check_rid(&domain->sid, group_sid, &group_rid)) {
-               return NT_STATUS_UNSUCCESSFUL;
+       if (pnum_names) {
+               *pnum_names = 0;
        }
 
        tmp_ctx = talloc_stackframe();
@@ -455,101 +425,35 @@ static NTSTATUS sam_lookup_groupmem(struct winbindd_domain *domain,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = open_internal_samr_conn(tmp_ctx, domain, &samr_pipe, &dom_pol);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto error;
-       }
-
-       status = rpccli_samr_OpenGroup(samr_pipe,
-                                      tmp_ctx,
-                                      &dom_pol,
-                                      samr_access,
-                                      group_rid,
-                                      &group_pol);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto error;
-       }
-
-       /*
-        * Step #1: Get a list of user rids that are the members of the group.
-        */
-       status = rpccli_samr_QueryGroupMember(samr_pipe,
-                                             tmp_ctx,
-                                             &group_pol,
-                                             &rids);
-
-       rpccli_samr_Close(samr_pipe, tmp_ctx, &group_pol);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               goto error;
-       }
-
-       if (rids == NULL || rids->count == 0) {
-               pnum_names = 0;
-               pnames = NULL;
-               pname_types = NULL;
-               psid_mem = NULL;
-
-               status = NT_STATUS_OK;
-               goto error;
-       }
-
-       num_names = rids->count;
-       rid_mem = rids->rids;
-
-       /*
-        * Step #2: Convert list of rids into list of usernames.
-        */
-#define MAX_LOOKUP_RIDS 900
-
-       if (num_names > 0) {
-               names = TALLOC_ZERO_ARRAY(tmp_ctx, char *, num_names);
-               name_types = TALLOC_ZERO_ARRAY(tmp_ctx, uint32_t, num_names);
-               sid_mem = TALLOC_ZERO_ARRAY(tmp_ctx, struct dom_sid, num_names);
-               if (names == NULL || name_types == NULL || sid_mem == NULL) {
-                       status = NT_STATUS_NO_MEMORY;
-                       goto error;
-               }
-       }
-
-       for (j = 0; j < num_names; j++) {
-               sid_compose(&sid_mem[j], &domain->sid, rid_mem[j]);
-       }
-
-       status = rpccli_samr_LookupRids(samr_pipe,
-                                       tmp_ctx,
-                                       &dom_pol,
-                                       num_names,
-                                       rid_mem,
-                                       &tmp_names,
-                                       &tmp_types);
+again:
+       status = open_cached_internal_pipe_conn(domain,
+                                               &samr_pipe,
+                                               &dom_pol,
+                                               NULL,
+                                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
-               if (!NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) {
-                       goto error;
-               }
+               goto done;
        }
 
-       /* Copy result into array.  The talloc system will take
-          care of freeing the temporary arrays later on. */
-       if (tmp_names.count != tmp_types.count) {
-               status = NT_STATUS_UNSUCCESSFUL;
-               goto error;
-       }
+       status = rpc_lookup_groupmem(tmp_ctx,
+                                    samr_pipe,
+                                    &dom_pol,
+                                    domain->name,
+                                    &domain->sid,
+                                    group_sid,
+                                    type,
+                                    &num_names,
+                                    &sid_mem,
+                                    &names,
+                                    &name_types);
 
-       for (r = 0; r < tmp_names.count; r++) {
-               if (tmp_types.ids[r] == SID_NAME_UNKNOWN) {
-                       continue;
-               }
-               names[total_names] = fill_domain_username_talloc(names,
-                                                                domain->name,
-                                                                tmp_names.names[r].string,
-                                                                true);
-               name_types[total_names] = tmp_types.ids[r];
-               total_names++;
+       if (!retry && reset_connection_on_error(domain, samr_pipe, status)) {
+               retry = true;
+               goto again;
        }
 
        if (pnum_names) {
-               *pnum_names = total_names;
+               *pnum_names = num_names;
        }
 
        if (pnames) {
@@ -564,7 +468,7 @@ static NTSTATUS sam_lookup_groupmem(struct winbindd_domain *domain,
                *psid_mem = talloc_move(mem_ctx, &sid_mem);
        }
 
-error:
+done:
        TALLOC_FREE(tmp_ctx);
        return status;
 }
@@ -576,8 +480,8 @@ error:
 /* List all domain groups */
 static NTSTATUS builtin_enum_dom_groups(struct winbindd_domain *domain,
                                TALLOC_CTX *mem_ctx,
-                               uint32 *num_entries,
-                               struct acct_info **info)
+                               uint32_t *num_entries,
+                               struct wb_acct_info **info)
 {
        /* BUILTIN doesn't have domain groups */
        *num_entries = 0;
@@ -588,24 +492,13 @@ static NTSTATUS builtin_enum_dom_groups(struct winbindd_domain *domain,
 /* Query display info for a domain */
 static NTSTATUS builtin_query_user_list(struct winbindd_domain *domain,
                                TALLOC_CTX *mem_ctx,
-                               uint32 *num_entries,
-                               struct wbint_userinfo **info)
+                               uint32_t **rids)
 {
        /* We don't have users */
-       *num_entries = 0;
-       *info = NULL;
+       *rids = NULL;
        return NT_STATUS_OK;
 }
 
-/* Lookup user information from a rid or username. */
-static NTSTATUS builtin_query_user(struct winbindd_domain *domain,
-                               TALLOC_CTX *mem_ctx,
-                               const struct dom_sid *user_sid,
-                               struct wbint_userinfo *user_info)
-{
-       return NT_STATUS_NO_SUCH_USER;
-}
-
 /* get a list of trusted domains - builtin domain */
 static NTSTATUS builtin_trusted_domains(struct winbindd_domain *domain,
                                        TALLOC_CTX *mem_ctx,
@@ -623,14 +516,15 @@ static NTSTATUS builtin_trusted_domains(struct winbindd_domain *domain,
 static NTSTATUS sam_enum_local_groups(struct winbindd_domain *domain,
                                      TALLOC_CTX *mem_ctx,
                                      uint32_t *pnum_info,
-                                     struct acct_info **pinfo)
+                                     struct wb_acct_info **pinfo)
 {
        struct rpc_pipe_client *samr_pipe;
-       struct policy_handle dom_pol;
-       struct acct_info *info = NULL;
+       struct policy_handle dom_pol = { 0 };
+       struct wb_acct_info *info = NULL;
        uint32_t num_info = 0;
        TALLOC_CTX *tmp_ctx;
        NTSTATUS status;
+       bool retry = false;
 
        DEBUG(3,("samr: enum local groups\n"));
 
@@ -643,7 +537,12 @@ static NTSTATUS sam_enum_local_groups(struct winbindd_domain *domain,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = open_internal_samr_conn(tmp_ctx, domain, &samr_pipe, &dom_pol);
+again:
+       status = open_cached_internal_pipe_conn(domain,
+                                               &samr_pipe,
+                                               &dom_pol,
+                                               NULL,
+                                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -652,7 +551,13 @@ static NTSTATUS sam_enum_local_groups(struct winbindd_domain *domain,
                                       samr_pipe,
                                       &dom_pol,
                                       &num_info,
+
                                       &info);
+       if (!retry && reset_connection_on_error(domain, samr_pipe, status)) {
+               retry = true;
+               goto again;
+       }
+
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -680,11 +585,12 @@ static NTSTATUS sam_name_to_sid(struct winbindd_domain *domain,
                                   enum lsa_SidType *ptype)
 {
        struct rpc_pipe_client *lsa_pipe;
-       struct policy_handle lsa_policy;
+       struct policy_handle lsa_policy = { 0 };
        struct dom_sid sid;
        enum lsa_SidType type;
        TALLOC_CTX *tmp_ctx;
        NTSTATUS status;
+       bool retry = false;
 
        DEBUG(3,("sam_name_to_sid\n"));
 
@@ -693,7 +599,12 @@ static NTSTATUS sam_name_to_sid(struct winbindd_domain *domain,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = open_internal_lsa_conn(tmp_ctx, &lsa_pipe, &lsa_policy);
+again:
+       status = open_cached_internal_pipe_conn(domain,
+                                               NULL,
+                                               NULL,
+                                               &lsa_pipe,
+                                               &lsa_policy);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -706,6 +617,12 @@ static NTSTATUS sam_name_to_sid(struct winbindd_domain *domain,
                                 flags,
                                 &sid,
                                 &type);
+
+       if (!retry && reset_connection_on_error(domain, lsa_pipe, status)) {
+               retry = true;
+               goto again;
+       }
+
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -731,18 +648,21 @@ static NTSTATUS sam_sid_to_name(struct winbindd_domain *domain,
                                enum lsa_SidType *ptype)
 {
        struct rpc_pipe_client *lsa_pipe;
-       struct policy_handle lsa_policy;
+       struct policy_handle lsa_policy = { 0 };
        char *domain_name = NULL;
        char *name = NULL;
        enum lsa_SidType type;
        TALLOC_CTX *tmp_ctx;
        NTSTATUS status;
+       bool retry = false;
 
        DEBUG(3,("sam_sid_to_name\n"));
 
        /* Paranoia check */
        if (!sid_check_is_in_builtin(sid) &&
-           !sid_check_is_in_our_domain(sid) &&
+           !sid_check_is_builtin(sid) &&
+           !sid_check_is_in_our_sam(sid) &&
+           !sid_check_is_our_sam(sid) &&
            !sid_check_is_in_unix_users(sid) &&
            !sid_check_is_unix_users(sid) &&
            !sid_check_is_in_unix_groups(sid) &&
@@ -758,7 +678,12 @@ static NTSTATUS sam_sid_to_name(struct winbindd_domain *domain,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = open_internal_lsa_conn(tmp_ctx, &lsa_pipe, &lsa_policy);
+again:
+       status = open_cached_internal_pipe_conn(domain,
+                                               NULL,
+                                               NULL,
+                                               &lsa_pipe,
+                                               &lsa_policy);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -772,6 +697,11 @@ static NTSTATUS sam_sid_to_name(struct winbindd_domain *domain,
                                 &name,
                                 &type);
 
+       if (!retry && reset_connection_on_error(domain, lsa_pipe, status)) {
+               retry = true;
+               goto again;
+       }
+
        if (ptype) {
                *ptype = type;
        }
@@ -785,39 +715,39 @@ static NTSTATUS sam_sid_to_name(struct winbindd_domain *domain,
        }
 
 done:
+
        TALLOC_FREE(tmp_ctx);
        return status;
 }
 
 static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
                                  TALLOC_CTX *mem_ctx,
-                                 const struct dom_sid *sid,
-                                 uint32 *rids,
+                                 const struct dom_sid *domain_sid,
+                                 uint32_t *rids,
                                  size_t num_rids,
                                  char **pdomain_name,
                                  char ***pnames,
                                  enum lsa_SidType **ptypes)
 {
        struct rpc_pipe_client *lsa_pipe;
-       struct policy_handle lsa_policy;
+       struct policy_handle lsa_policy = { 0 };
        enum lsa_SidType *types = NULL;
        char *domain_name = NULL;
        char **names = NULL;
        TALLOC_CTX *tmp_ctx;
        NTSTATUS status;
+       bool retry = false;
 
        DEBUG(3,("sam_rids_to_names for %s\n", domain->name));
 
        /* Paranoia check */
-       if (!sid_check_is_in_builtin(sid) &&
-           !sid_check_is_in_our_domain(sid) &&
-           !sid_check_is_in_unix_users(sid) &&
-           !sid_check_is_unix_users(sid) &&
-           !sid_check_is_in_unix_groups(sid) &&
-           !sid_check_is_unix_groups(sid) &&
-           !sid_check_is_in_wellknown_domain(sid)) {
+       if (!sid_check_is_builtin(domain_sid) &&
+           !sid_check_is_our_sam(domain_sid) &&
+           !sid_check_is_unix_users(domain_sid) &&
+           !sid_check_is_unix_groups(domain_sid) &&
+           !sid_check_is_in_wellknown_domain(domain_sid)) {
                DEBUG(0, ("sam_rids_to_names: possible deadlock - trying to "
-                         "lookup SID %s\n", sid_string_dbg(sid)));
+                         "lookup SID %s\n", sid_string_dbg(domain_sid)));
                return NT_STATUS_NONE_MAPPED;
        }
 
@@ -826,7 +756,12 @@ static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = open_internal_lsa_conn(tmp_ctx, &lsa_pipe, &lsa_policy);
+again:
+       status = open_cached_internal_pipe_conn(domain,
+                                               NULL,
+                                               NULL,
+                                               &lsa_pipe,
+                                               &lsa_policy);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -835,12 +770,18 @@ static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
                                   lsa_pipe,
                                   &lsa_policy,
                                   domain,
-                                  sid,
+                                  domain_sid,
                                   rids,
                                   num_rids,
                                   &domain_name,
                                   &names,
                                   &types);
+
+       if (!retry && reset_connection_on_error(domain, lsa_pipe, status)) {
+               retry = true;
+               goto again;
+       }
+
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -862,36 +803,56 @@ done:
        return status;
 }
 
-static NTSTATUS common_lockout_policy(struct winbindd_domain *domain,
-                                     TALLOC_CTX *mem_ctx,
-                                     struct samr_DomInfo12 *lockout_policy)
+static NTSTATUS sam_lockout_policy(struct winbindd_domain *domain,
+                                  TALLOC_CTX *mem_ctx,
+                                  struct samr_DomInfo12 *lockout_policy)
 {
        struct rpc_pipe_client *samr_pipe;
-       struct policy_handle dom_pol;
+       struct policy_handle dom_pol = { 0 };
        union samr_DomainInfo *info = NULL;
        TALLOC_CTX *tmp_ctx;
-       NTSTATUS status;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
+       bool retry = false;
 
-       DEBUG(3,("samr: lockout policy\n"));
+       DEBUG(3,("sam_lockout_policy\n"));
 
        tmp_ctx = talloc_stackframe();
        if (tmp_ctx == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = open_internal_samr_conn(tmp_ctx, domain, &samr_pipe, &dom_pol);
+again:
+       status = open_cached_internal_pipe_conn(domain,
+                                               &samr_pipe,
+                                               &dom_pol,
+                                               NULL,
+                                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
                goto error;
        }
 
-       status = rpccli_samr_QueryDomainInfo(samr_pipe,
+       b = samr_pipe->binding_handle;
+
+       status = dcerpc_samr_QueryDomainInfo(b,
                                             mem_ctx,
                                             &dom_pol,
-                                            12,
-                                            &info);
+                                            DomainLockoutInformation,
+                                            &info,
+                                            &result);
+
+       if (!retry && reset_connection_on_error(domain, samr_pipe, status)) {
+               retry = true;
+               goto again;
+       }
+
        if (!NT_STATUS_IS_OK(status)) {
                goto error;
        }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto error;
+       }
 
        *lockout_policy = info->info12;
 
@@ -900,36 +861,56 @@ error:
        return status;
 }
 
-static NTSTATUS common_password_policy(struct winbindd_domain *domain,
-                                      TALLOC_CTX *mem_ctx,
-                                      struct samr_DomInfo1 *passwd_policy)
+static NTSTATUS sam_password_policy(struct winbindd_domain *domain,
+                                   TALLOC_CTX *mem_ctx,
+                                   struct samr_DomInfo1 *passwd_policy)
 {
        struct rpc_pipe_client *samr_pipe;
-       struct policy_handle dom_pol;
+       struct policy_handle dom_pol = { 0 };
        union samr_DomainInfo *info = NULL;
        TALLOC_CTX *tmp_ctx;
-       NTSTATUS status;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
+       bool retry = false;
 
-       DEBUG(3,("samr: password policy\n"));
+       DEBUG(3,("sam_password_policy\n"));
 
        tmp_ctx = talloc_stackframe();
        if (tmp_ctx == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = open_internal_samr_conn(tmp_ctx, domain, &samr_pipe, &dom_pol);
+again:
+       status = open_cached_internal_pipe_conn(domain,
+                                               &samr_pipe,
+                                               &dom_pol,
+                                               NULL,
+                                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
                goto error;
        }
 
-       status = rpccli_samr_QueryDomainInfo(samr_pipe,
+       b = samr_pipe->binding_handle;
+
+       status = dcerpc_samr_QueryDomainInfo(b,
                                             mem_ctx,
                                             &dom_pol,
-                                            1,
-                                            &info);
+                                            DomainPasswordInformation,
+                                            &info,
+                                            &result);
+
+       if (!retry && reset_connection_on_error(domain, samr_pipe, status)) {
+               retry = true;
+               goto again;
+       }
+
        if (!NT_STATUS_IS_OK(status)) {
                goto error;
        }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto error;
+       }
 
        *passwd_policy = info->info1;
 
@@ -951,9 +932,12 @@ static NTSTATUS sam_lookup_usergroups(struct winbindd_domain *domain,
        uint32_t num_groups = 0;
        TALLOC_CTX *tmp_ctx;
        NTSTATUS status;
+       bool retry = false;
 
        DEBUG(3,("sam_lookup_usergroups\n"));
 
+       ZERO_STRUCT(dom_pol);
+
        if (pnum_groups) {
                *pnum_groups = 0;
        }
@@ -963,7 +947,12 @@ static NTSTATUS sam_lookup_usergroups(struct winbindd_domain *domain,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = open_internal_samr_conn(tmp_ctx, domain, &samr_pipe, &dom_pol);
+again:
+       status = open_cached_internal_pipe_conn(domain,
+                                               &samr_pipe,
+                                               &dom_pol,
+                                               NULL,
+                                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -975,6 +964,12 @@ static NTSTATUS sam_lookup_usergroups(struct winbindd_domain *domain,
                                       user_sid,
                                       &num_groups,
                                       &user_grpsids);
+
+       if (!retry && reset_connection_on_error(domain, samr_pipe, status)) {
+               retry = true;
+               goto again;
+       }
+
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -988,6 +983,7 @@ static NTSTATUS sam_lookup_usergroups(struct winbindd_domain *domain,
        }
 
 done:
+
        TALLOC_FREE(tmp_ctx);
        return status;
 }
@@ -1000,11 +996,12 @@ static NTSTATUS sam_lookup_useraliases(struct winbindd_domain *domain,
                                       uint32_t **palias_rids)
 {
        struct rpc_pipe_client *samr_pipe;
-       struct policy_handle dom_pol;
+       struct policy_handle dom_pol = { 0 };
        uint32_t num_aliases = 0;
        uint32_t *alias_rids = NULL;
        TALLOC_CTX *tmp_ctx;
        NTSTATUS status;
+       bool retry = false;
 
        DEBUG(3,("sam_lookup_useraliases\n"));
 
@@ -1017,7 +1014,12 @@ static NTSTATUS sam_lookup_useraliases(struct winbindd_domain *domain,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = open_internal_samr_conn(tmp_ctx, domain, &samr_pipe, &dom_pol);
+again:
+       status = open_cached_internal_pipe_conn(domain,
+                                               &samr_pipe,
+                                               &dom_pol,
+                                               NULL,
+                                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -1029,6 +1031,12 @@ static NTSTATUS sam_lookup_useraliases(struct winbindd_domain *domain,
                                        sids,
                                        &num_aliases,
                                        &alias_rids);
+
+       if (!retry && reset_connection_on_error(domain, samr_pipe, status)) {
+               retry = true;
+               goto again;
+       }
+
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -1042,78 +1050,64 @@ static NTSTATUS sam_lookup_useraliases(struct winbindd_domain *domain,
        }
 
 done:
+
        TALLOC_FREE(tmp_ctx);
        return status;
 }
 
 /* find the sequence number for a domain */
-static NTSTATUS common_sequence_number(struct winbindd_domain *domain,
-                                      uint32_t *seq)
+static NTSTATUS sam_sequence_number(struct winbindd_domain *domain,
+                                   uint32_t *pseq)
 {
        struct rpc_pipe_client *samr_pipe;
-       struct policy_handle dom_pol;
-       union samr_DomainInfo *info = NULL;
-       bool got_seq_num = false;
-       TALLOC_CTX *mem_ctx;
+       struct policy_handle dom_pol = { 0 };
+       uint32_t seq = DOM_SEQUENCE_NONE;
+       TALLOC_CTX *tmp_ctx;
        NTSTATUS status;
+       bool retry = false;
 
        DEBUG(3,("samr: sequence number\n"));
 
-       mem_ctx = talloc_init("common_sequence_number");
-       if (mem_ctx == NULL) {
-               return NT_STATUS_NO_MEMORY;
+       if (pseq) {
+               *pseq = DOM_SEQUENCE_NONE;
        }
 
-       if (seq) {
-               *seq = DOM_SEQUENCE_NONE;
+       tmp_ctx = talloc_stackframe();
+       if (tmp_ctx == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       status = open_internal_samr_conn(mem_ctx, domain, &samr_pipe, &dom_pol);
+again:
+       status = open_cached_internal_pipe_conn(domain,
+                                               &samr_pipe,
+                                               &dom_pol,
+                                               NULL,
+                                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
-               goto error;
+               goto done;
        }
 
-       /* query domain info */
-       status = rpccli_samr_QueryDomainInfo(samr_pipe,
-                                            mem_ctx,
-                                            &dom_pol,
-                                            8,
-                                            &info);
-       if (NT_STATUS_IS_OK(status)) {
-               if (seq) {
-                       *seq = info->info8.sequence_num;
-                       got_seq_num = true;
-               }
-               goto seq_num;
+       status = rpc_sequence_number(tmp_ctx,
+                                    samr_pipe,
+                                    &dom_pol,
+                                    domain->name,
+                                    &seq);
+
+       if (!retry && reset_connection_on_error(domain, samr_pipe, status)) {
+               retry = true;
+               goto again;
        }
 
-       /* retry with info-level 2 in case the dc does not support info-level 8
-        * (like all older samba2 and samba3 dc's) - Guenther */
-       status = rpccli_samr_QueryDomainInfo(samr_pipe,
-                                            mem_ctx,
-                                            &dom_pol,
-                                            2,
-                                            &info);
-       if (NT_STATUS_IS_OK(status)) {
-               if (seq) {
-                       *seq = info->general.sequence_num;
-                       got_seq_num = true;
-               }
+       if (!NT_STATUS_IS_OK(status)) {
+               goto done;
        }
 
-seq_num:
-       if (got_seq_num) {
-               DEBUG(10,("domain_sequence_number: for domain %s is %u\n",
-                         domain->name, (unsigned)*seq));
-       } else {
-               DEBUG(10,("domain_sequence_number: failed to get sequence "
-                         "number (%u) for domain %s\n",
-                         (unsigned) *seq, domain->name ));
-               status = NT_STATUS_OK;
+       if (pseq) {
+               *pseq = seq;
        }
 
-error:
-       talloc_destroy(mem_ctx);
+done:
+       TALLOC_FREE(tmp_ctx);
        return status;
 }
 
@@ -1127,13 +1121,12 @@ struct winbindd_methods builtin_passdb_methods = {
        .name_to_sid           = sam_name_to_sid,
        .sid_to_name           = sam_sid_to_name,
        .rids_to_names         = sam_rids_to_names,
-       .query_user            = builtin_query_user,
        .lookup_usergroups     = sam_lookup_usergroups,
        .lookup_useraliases    = sam_lookup_useraliases,
        .lookup_groupmem       = sam_lookup_groupmem,
-       .sequence_number       = common_sequence_number,
-       .lockout_policy        = common_lockout_policy,
-       .password_policy       = common_password_policy,
+       .sequence_number       = sam_sequence_number,
+       .lockout_policy        = sam_lockout_policy,
+       .password_policy       = sam_password_policy,
        .trusted_domains       = builtin_trusted_domains
 };
 
@@ -1147,12 +1140,11 @@ struct winbindd_methods sam_passdb_methods = {
        .name_to_sid           = sam_name_to_sid,
        .sid_to_name           = sam_sid_to_name,
        .rids_to_names         = sam_rids_to_names,
-       .query_user            = sam_query_user,
        .lookup_usergroups     = sam_lookup_usergroups,
        .lookup_useraliases    = sam_lookup_useraliases,
        .lookup_groupmem       = sam_lookup_groupmem,
-       .sequence_number       = common_sequence_number,
-       .lockout_policy        = common_lockout_policy,
-       .password_policy       = common_password_policy,
+       .sequence_number       = sam_sequence_number,
+       .lockout_policy        = sam_lockout_policy,
+       .password_policy       = sam_password_policy,
        .trusted_domains       = sam_trusted_domains
 };