winbindd: Fix indentation
[sfrench/samba-autobuild/.git] / source3 / winbindd / winbindd_samr.c
index 0c077aa32d265e5aa54fd0f33f9f79b27e67e58c..aedb77bdee9b425e222860ae1e8a4c212200b49b 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 "../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)
-{
-       static struct rpc_pipe_client *cli = NULL;
-       struct auth_serversupplied_info *server_info = NULL;
-       NTSTATUS status;
-
-       if (cli != NULL) {
-               goto done;
-       }
-
-       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;
-               }
-       }
-
-       /* create a samr connection */
-       status = rpc_pipe_open_internal(talloc_autofree_context(),
-                                       &ndr_table_samr.syntax_id,
-                                       rpc_samr_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;
-       }
-
-done:
-       if (samr_pipe) {
-               *samr_pipe = cli;
-       }
-
-       return NT_STATUS_OK;
-}
-
-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_samr_conn(TALLOC_CTX *mem_ctx,
+                                struct winbindd_domain *domain,
+                                struct rpc_pipe_client **samr_pipe,
+                                struct policy_handle *samr_domain_hnd)
 {
-       NTSTATUS status;
+       NTSTATUS status, result;
        struct policy_handle samr_connect_hnd;
+       struct dcerpc_binding_handle *b;
 
-       status = open_internal_samr_pipe(mem_ctx, samr_pipe);
+       status = wb_open_internal_pipe(mem_ctx, &ndr_table_samr, samr_pipe);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       status = rpccli_samr_Connect2((*samr_pipe),
-                                     mem_ctx,
+       b = (*samr_pipe)->binding_handle;
+
+       status = dcerpc_samr_Connect2(b, mem_ctx,
                                      (*samr_pipe)->desthost,
                                      SEC_FLAG_MAXIMUM_ALLOWED,
-                                     &samr_connect_hnd);
+                                     &samr_connect_hnd,
+                                     &result);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
+       if (!NT_STATUS_IS_OK(result)) {
+               return result;
+       }
 
-       status = rpccli_samr_OpenDomain((*samr_pipe),
-                                       mem_ctx,
+       status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                        &samr_connect_hnd,
                                        SEC_FLAG_MAXIMUM_ALLOWED,
                                        &domain->sid,
-                                       samr_domain_hnd);
-
-       return status;
-}
-
-static NTSTATUS open_internal_lsa_pipe(TALLOC_CTX *mem_ctx,
-                                      struct rpc_pipe_client **lsa_pipe)
-{
-       static struct rpc_pipe_client *cli = NULL;
-       struct auth_serversupplied_info *server_info = NULL;
-       NTSTATUS status;
-
-       if (cli != NULL) {
-               goto done;
-       }
-
-       if (server_info == NULL) {
-               status = make_server_info_system(mem_ctx, &server_info);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(0, ("open_lsa_pipe: Could not create auth_serversupplied_info: %s\n",
-                                 nt_errstr(status)));
-                       return status;
-               }
-       }
-
-       /* create a samr connection */
-       status = rpc_pipe_open_internal(talloc_autofree_context(),
-                                       &ndr_table_lsarpc.syntax_id,
-                                       rpc_lsarpc_dispatch,
-                                       server_info,
-                                       &cli);
+                                       samr_domain_hnd,
+                                       &result);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("open_lsa_pipe: Could not connect to lsa_pipe: %s\n",
-                         nt_errstr(status)));
                return status;
        }
 
-done:
-       if (lsa_pipe) {
-               *lsa_pipe = cli;
-       }
-
-       return NT_STATUS_OK;
+       return result;
 }
 
-static NTSTATUS open_internal_lsa_conn(TALLOC_CTX *mem_ctx,
-                                      struct rpc_pipe_client **lsa_pipe,
-                                      struct policy_handle *lsa_hnd)
+NTSTATUS open_internal_lsa_conn(TALLOC_CTX *mem_ctx,
+                               struct rpc_pipe_client **lsa_pipe,
+                               struct policy_handle *lsa_hnd)
 {
        NTSTATUS status;
 
-       status = open_internal_lsa_pipe(mem_ctx, lsa_pipe);
+       status = wb_open_internal_pipe(mem_ctx, &ndr_table_lsarpc, lsa_pipe);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -177,19 +109,18 @@ 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;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
 
        DEBUG(3,("sam_enum_dom_groups\n"));
 
-       ZERO_STRUCT(dom_pol);
-
        if (pnum_info) {
                *pnum_info = 0;
        }
@@ -204,6 +135,8 @@ static NTSTATUS sam_enum_dom_groups(struct winbindd_domain *domain,
                goto error;
        }
 
+       b = samr_pipe->binding_handle;
+
        status = rpc_enum_dom_groups(tmp_ctx,
                                     samr_pipe,
                                     &dom_pol,
@@ -222,8 +155,8 @@ static NTSTATUS sam_enum_dom_groups(struct winbindd_domain *domain,
        }
 
 error:
-       if (is_valid_policy_hnd(&dom_pol)) {
-               rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+       if (b && is_valid_policy_hnd(&dom_pol)) {
+               dcerpc_samr_Close(b, mem_ctx, &dom_pol, &result);
        }
        TALLOC_FREE(tmp_ctx);
        return status;
@@ -232,24 +165,17 @@ 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;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
 
        DEBUG(3,("samr_query_user_list\n"));
 
-       ZERO_STRUCT(dom_pol);
-
-       if (pnum_info) {
-               *pnum_info = 0;
-       }
-
        tmp_ctx = talloc_stackframe();
        if (tmp_ctx == NULL) {
                return NT_STATUS_NO_MEMORY;
@@ -260,81 +186,27 @@ static NTSTATUS sam_query_user_list(struct winbindd_domain *domain,
                goto done;
        }
 
+       b = samr_pipe->binding_handle;
+
        status = rpc_query_user_list(tmp_ctx,
                                     samr_pipe,
                                     &dom_pol,
                                     &domain->sid,
-                                    &num_info,
-                                    &info);
+                                    &rids);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
 
-       if (pnum_info) {
-               *pnum_info = num_info;
-       }
-
-       if (pinfo) {
-               *pinfo = talloc_move(mem_ctx, &info);
-       }
-
-done:
-       if (is_valid_policy_hnd(&dom_pol)) {
-               rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
-       }
-
-       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"));
-
-       ZERO_STRUCT(dom_pol);
-
-       /* 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;
+       if (prids != NULL) {
+               *prids = talloc_move(mem_ctx, &rids);
        }
 
-       status = rpc_query_user(tmp_ctx,
-                               samr_pipe,
-                               &dom_pol,
-                               &domain->sid,
-                               user_sid,
-                               user_info);
-
 done:
-       if (is_valid_policy_hnd(&dom_pol)) {
-               rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+       if (b && is_valid_policy_hnd(&dom_pol)) {
+               dcerpc_samr_Close(b, mem_ctx, &dom_pol, &result);
        }
 
+       TALLOC_FREE(rids);
        TALLOC_FREE(tmp_ctx);
        return status;
 }
@@ -345,16 +217,15 @@ static NTSTATUS sam_trusted_domains(struct winbindd_domain *domain,
                                    struct netr_DomainTrustList *ptrust_list)
 {
        struct rpc_pipe_client *lsa_pipe;
-       struct policy_handle lsa_policy;
+       struct policy_handle lsa_policy = { 0 };
        struct netr_DomainTrust *trusts = NULL;
        uint32_t num_trusts = 0;
        TALLOC_CTX *tmp_ctx;
-       NTSTATUS status;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
 
        DEBUG(3,("samr: trusted domains\n"));
 
-       ZERO_STRUCT(lsa_policy);
-
        if (ptrust_list) {
                ZERO_STRUCTP(ptrust_list);
        }
@@ -369,6 +240,8 @@ static NTSTATUS sam_trusted_domains(struct winbindd_domain *domain,
                goto done;
        }
 
+       b = lsa_pipe->binding_handle;
+
        status = rpc_trusted_domains(tmp_ctx,
                                     lsa_pipe,
                                     &lsa_policy,
@@ -384,8 +257,8 @@ static NTSTATUS sam_trusted_domains(struct winbindd_domain *domain,
        }
 
 done:
-       if (is_valid_policy_hnd(&lsa_policy)) {
-               rpccli_lsa_Close(lsa_pipe, mem_ctx, &lsa_policy);
+       if (b && is_valid_policy_hnd(&lsa_policy)) {
+               dcerpc_lsa_Close(b, mem_ctx, &lsa_policy, &result);
        }
 
        TALLOC_FREE(tmp_ctx);
@@ -403,7 +276,7 @@ static NTSTATUS sam_lookup_groupmem(struct winbindd_domain *domain,
                                    uint32_t **pname_types)
 {
        struct rpc_pipe_client *samr_pipe;
-       struct policy_handle dom_pol;
+       struct policy_handle dom_pol = { 0 };
 
        uint32_t num_names = 0;
        struct dom_sid *sid_mem = NULL;
@@ -411,12 +284,11 @@ static NTSTATUS sam_lookup_groupmem(struct winbindd_domain *domain,
        uint32_t *name_types = NULL;
 
        TALLOC_CTX *tmp_ctx;
-       NTSTATUS status;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
 
        DEBUG(3,("sam_lookup_groupmem\n"));
 
-       ZERO_STRUCT(dom_pol);
-
        /* Paranoia check */
        if (sid_check_is_in_builtin(group_sid) && (type != SID_NAME_ALIAS)) {
                /* There's no groups, only aliases in BUILTIN */
@@ -424,7 +296,7 @@ static NTSTATUS sam_lookup_groupmem(struct winbindd_domain *domain,
        }
 
        if (pnum_names) {
-               pnum_names = 0;
+               *pnum_names = 0;
        }
 
        tmp_ctx = talloc_stackframe();
@@ -437,6 +309,8 @@ static NTSTATUS sam_lookup_groupmem(struct winbindd_domain *domain,
                goto done;
        }
 
+       b = samr_pipe->binding_handle;
+
        status = rpc_lookup_groupmem(tmp_ctx,
                                     samr_pipe,
                                     &dom_pol,
@@ -466,8 +340,8 @@ static NTSTATUS sam_lookup_groupmem(struct winbindd_domain *domain,
        }
 
 done:
-       if (is_valid_policy_hnd(&dom_pol)) {
-               rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+       if (b && is_valid_policy_hnd(&dom_pol)) {
+               dcerpc_samr_Close(b, mem_ctx, &dom_pol, &result);
        }
 
        TALLOC_FREE(tmp_ctx);
@@ -481,8 +355,8 @@ done:
 /* 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;
@@ -493,24 +367,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,
@@ -528,19 +391,18 @@ 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;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
 
        DEBUG(3,("samr: enum local groups\n"));
 
-       ZERO_STRUCT(dom_pol);
-
        if (pnum_info) {
                *pnum_info = 0;
        }
@@ -555,6 +417,8 @@ static NTSTATUS sam_enum_local_groups(struct winbindd_domain *domain,
                goto done;
        }
 
+       b = samr_pipe->binding_handle;
+
        status = rpc_enum_local_groups(mem_ctx,
                                       samr_pipe,
                                       &dom_pol,
@@ -573,8 +437,8 @@ static NTSTATUS sam_enum_local_groups(struct winbindd_domain *domain,
        }
 
 done:
-       if (is_valid_policy_hnd(&dom_pol)) {
-               rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+       if (b && is_valid_policy_hnd(&dom_pol)) {
+               dcerpc_samr_Close(b, mem_ctx, &dom_pol, &result);
        }
 
        TALLOC_FREE(tmp_ctx);
@@ -591,16 +455,15 @@ 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;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
 
        DEBUG(3,("sam_name_to_sid\n"));
 
-       ZERO_STRUCT(lsa_policy);
-
        tmp_ctx = talloc_stackframe();
        if (tmp_ctx == NULL) {
                return NT_STATUS_NO_MEMORY;
@@ -611,6 +474,8 @@ static NTSTATUS sam_name_to_sid(struct winbindd_domain *domain,
                goto done;
        }
 
+       b = lsa_pipe->binding_handle;
+
        status = rpc_name_to_sid(tmp_ctx,
                                 lsa_pipe,
                                 &lsa_policy,
@@ -631,8 +496,8 @@ static NTSTATUS sam_name_to_sid(struct winbindd_domain *domain,
        }
 
 done:
-       if (is_valid_policy_hnd(&lsa_policy)) {
-               rpccli_lsa_Close(lsa_pipe, mem_ctx, &lsa_policy);
+       if (b && is_valid_policy_hnd(&lsa_policy)) {
+               dcerpc_lsa_Close(b, mem_ctx, &lsa_policy, &result);
        }
 
        TALLOC_FREE(tmp_ctx);
@@ -648,20 +513,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;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
 
        DEBUG(3,("sam_sid_to_name\n"));
 
-       ZERO_STRUCT(lsa_policy);
-
        /* 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) &&
@@ -682,6 +548,8 @@ static NTSTATUS sam_sid_to_name(struct winbindd_domain *domain,
                goto done;
        }
 
+       b = lsa_pipe->binding_handle;
+
        status = rpc_sid_to_name(tmp_ctx,
                                 lsa_pipe,
                                 &lsa_policy,
@@ -704,8 +572,8 @@ static NTSTATUS sam_sid_to_name(struct winbindd_domain *domain,
        }
 
 done:
-       if (is_valid_policy_hnd(&lsa_policy)) {
-               rpccli_lsa_Close(lsa_pipe, mem_ctx, &lsa_policy);
+       if (b && is_valid_policy_hnd(&lsa_policy)) {
+               dcerpc_lsa_Close(b, mem_ctx, &lsa_policy, &result);
        }
 
        TALLOC_FREE(tmp_ctx);
@@ -714,35 +582,32 @@ done:
 
 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;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
 
        DEBUG(3,("sam_rids_to_names for %s\n", domain->name));
 
-       ZERO_STRUCT(lsa_policy);
-
        /* 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;
        }
 
@@ -756,11 +621,13 @@ static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
                goto done;
        }
 
+       b = lsa_pipe->binding_handle;
+
        status = rpc_rids_to_names(tmp_ctx,
                                   lsa_pipe,
                                   &lsa_policy,
                                   domain,
-                                  sid,
+                                  domain_sid,
                                   rids,
                                   num_rids,
                                   &domain_name,
@@ -783,8 +650,8 @@ static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
        }
 
 done:
-       if (is_valid_policy_hnd(&lsa_policy)) {
-               rpccli_lsa_Close(lsa_pipe, mem_ctx, &lsa_policy);
+       if (b && is_valid_policy_hnd(&lsa_policy)) {
+               dcerpc_lsa_Close(b, mem_ctx, &lsa_policy, &result);
        }
 
        TALLOC_FREE(tmp_ctx);
@@ -796,15 +663,14 @@ static NTSTATUS sam_lockout_policy(struct winbindd_domain *domain,
                                   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;
 
        DEBUG(3,("sam_lockout_policy\n"));
 
-       ZERO_STRUCT(dom_pol);
-
        tmp_ctx = talloc_stackframe();
        if (tmp_ctx == NULL) {
                return NT_STATUS_NO_MEMORY;
@@ -815,20 +681,27 @@ static NTSTATUS sam_lockout_policy(struct winbindd_domain *domain,
                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 (!NT_STATUS_IS_OK(status)) {
                goto error;
        }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto error;
+       }
 
        *lockout_policy = info->info12;
 
 error:
-       if (is_valid_policy_hnd(&dom_pol)) {
-               rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+       if (b && is_valid_policy_hnd(&dom_pol)) {
+               dcerpc_samr_Close(b, mem_ctx, &dom_pol, &result);
        }
 
        TALLOC_FREE(tmp_ctx);
@@ -840,15 +713,14 @@ static NTSTATUS sam_password_policy(struct winbindd_domain *domain,
                                    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;
 
        DEBUG(3,("sam_password_policy\n"));
 
-       ZERO_STRUCT(dom_pol);
-
        tmp_ctx = talloc_stackframe();
        if (tmp_ctx == NULL) {
                return NT_STATUS_NO_MEMORY;
@@ -859,20 +731,27 @@ static NTSTATUS sam_password_policy(struct winbindd_domain *domain,
                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 (!NT_STATUS_IS_OK(status)) {
                goto error;
        }
+       if (!NT_STATUS_IS_OK(result)) {
+               status = result;
+               goto error;
+       }
 
        *passwd_policy = info->info1;
 
 error:
-       if (is_valid_policy_hnd(&dom_pol)) {
-               rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+       if (b && is_valid_policy_hnd(&dom_pol)) {
+               dcerpc_samr_Close(b, mem_ctx, &dom_pol, &result);
        }
 
        TALLOC_FREE(tmp_ctx);
@@ -891,7 +770,8 @@ static NTSTATUS sam_lookup_usergroups(struct winbindd_domain *domain,
        struct dom_sid *user_grpsids = NULL;
        uint32_t num_groups = 0;
        TALLOC_CTX *tmp_ctx;
-       NTSTATUS status;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
 
        DEBUG(3,("sam_lookup_usergroups\n"));
 
@@ -911,6 +791,8 @@ static NTSTATUS sam_lookup_usergroups(struct winbindd_domain *domain,
                goto done;
        }
 
+       b = samr_pipe->binding_handle;
+
        status = rpc_lookup_usergroups(tmp_ctx,
                                       samr_pipe,
                                       &dom_pol,
@@ -931,8 +813,8 @@ static NTSTATUS sam_lookup_usergroups(struct winbindd_domain *domain,
        }
 
 done:
-       if (is_valid_policy_hnd(&dom_pol)) {
-               rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+       if (b && is_valid_policy_hnd(&dom_pol)) {
+               dcerpc_samr_Close(b, mem_ctx, &dom_pol, &result);
        }
 
        TALLOC_FREE(tmp_ctx);
@@ -947,16 +829,15 @@ 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;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
 
        DEBUG(3,("sam_lookup_useraliases\n"));
 
-       ZERO_STRUCT(dom_pol);
-
        if (pnum_aliases) {
                *pnum_aliases = 0;
        }
@@ -971,6 +852,8 @@ static NTSTATUS sam_lookup_useraliases(struct winbindd_domain *domain,
                goto done;
        }
 
+       b = samr_pipe->binding_handle;
+
        status = rpc_lookup_useraliases(tmp_ctx,
                                        samr_pipe,
                                        &dom_pol,
@@ -991,8 +874,8 @@ static NTSTATUS sam_lookup_useraliases(struct winbindd_domain *domain,
        }
 
 done:
-       if (is_valid_policy_hnd(&dom_pol)) {
-               rpccli_samr_Close(samr_pipe, mem_ctx, &dom_pol);
+       if (b && is_valid_policy_hnd(&dom_pol)) {
+               dcerpc_samr_Close(b, mem_ctx, &dom_pol, &result);
        }
 
        TALLOC_FREE(tmp_ctx);
@@ -1004,15 +887,14 @@ static NTSTATUS sam_sequence_number(struct winbindd_domain *domain,
                                    uint32_t *pseq)
 {
        struct rpc_pipe_client *samr_pipe;
-       struct policy_handle dom_pol;
-       uint32_t seq;
+       struct policy_handle dom_pol = { 0 };
+       uint32_t seq = DOM_SEQUENCE_NONE;
        TALLOC_CTX *tmp_ctx;
-       NTSTATUS status;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
 
        DEBUG(3,("samr: sequence number\n"));
 
-       ZERO_STRUCT(dom_pol);
-
        if (pseq) {
                *pseq = DOM_SEQUENCE_NONE;
        }
@@ -1027,6 +909,8 @@ static NTSTATUS sam_sequence_number(struct winbindd_domain *domain,
                goto done;
        }
 
+       b = samr_pipe->binding_handle;
+
        status = rpc_sequence_number(tmp_ctx,
                                     samr_pipe,
                                     &dom_pol,
@@ -1040,8 +924,8 @@ static NTSTATUS sam_sequence_number(struct winbindd_domain *domain,
                *pseq = seq;
        }
 done:
-       if (is_valid_policy_hnd(&dom_pol)) {
-               rpccli_samr_Close(samr_pipe, tmp_ctx, &dom_pol);
+       if (b && is_valid_policy_hnd(&dom_pol)) {
+               dcerpc_samr_Close(b, tmp_ctx, &dom_pol, &result);
        }
 
        TALLOC_FREE(tmp_ctx);
@@ -1058,7 +942,6 @@ 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,
@@ -1078,7 +961,6 @@ 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,