s3-winbind: We need to use internal rpc connections in winbind.

[idra/samba.git] / source3 / winbindd / winbindd_samr.c

diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c
index 05ba7a7260a8eb764f432e2e72f53a3a9d27b010..582e2a696207cbc9ead82cb2e752c7b8b70d78cd 100644 (file)
--- a/source3/winbindd/winbindd_samr.c
+++ b/source3/winbindd/winbindd_samr.c
@@ -26,13 +26,15 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "winbindd_rpc.h"
-
-#include "../librpc/gen_ndr/cli_samr.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
@@ -41,17 +43,13 @@ static NTSTATUS open_internal_samr_pipe(TALLOC_CTX *mem_ctx,
                                        struct rpc_pipe_client **samr_pipe)
 {
        struct rpc_pipe_client *cli = NULL;
-       struct auth_serversupplied_info *server_info = NULL;
+       struct auth_session_info *session_info = NULL;
        NTSTATUS status;
 
-       if (cli != NULL) {
-               goto done;
-       }
-
-       if (server_info == NULL) {
-               status = make_server_info_system(mem_ctx, &server_info);
+       if (session_info == NULL) {
+               status = make_session_info_system(mem_ctx, &session_info);
                if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(0, ("open_samr_pipe: Could not create auth_serversupplied_info: %s\n",
+                       DEBUG(0, ("open_samr_pipe: Could not create auth_session_info: %s\n",
                                  nt_errstr(status)));
                        return status;
                }
@@ -60,7 +58,8 @@ static NTSTATUS open_internal_samr_pipe(TALLOC_CTX *mem_ctx,
        /* create a samr connection */
        status = rpc_pipe_open_internal(mem_ctx,
                                        &ndr_table_samr.syntax_id,
-                                       server_info,
+                                       session_info,
+                                       NULL,
                                        winbind_messaging_context(),
                                        &cli);
        if (!NT_STATUS_IS_OK(status)) {
@@ -69,7 +68,6 @@ static NTSTATUS open_internal_samr_pipe(TALLOC_CTX *mem_ctx,
                return status;
        }
 
-done:
        if (samr_pipe) {
                *samr_pipe = cli;
        }
@@ -82,57 +80,63 @@ NTSTATUS open_internal_samr_conn(TALLOC_CTX *mem_ctx,
                                 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);
        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);
+                                       samr_domain_hnd,
+                                       &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
 
-       return status;
+       return result;
 }
 
 static NTSTATUS open_internal_lsa_pipe(TALLOC_CTX *mem_ctx,
                                       struct rpc_pipe_client **lsa_pipe)
 {
        struct rpc_pipe_client *cli = NULL;
-       struct auth_serversupplied_info *server_info = NULL;
+       struct auth_session_info *session_info = NULL;
        NTSTATUS status;
 
-       if (cli != NULL) {
-               goto done;
-       }
-
-       if (server_info == NULL) {
-               status = make_server_info_system(mem_ctx, &server_info);
+       if (session_info == NULL) {
+               status = make_session_info_system(mem_ctx, &session_info);
                if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(0, ("open_lsa_pipe: Could not create auth_serversupplied_info: %s\n",
+                       DEBUG(0, ("open_lsa_pipe: Could not create auth_session_info: %s\n",
                                  nt_errstr(status)));
                        return status;
                }
        }
 
-       /* create a samr connection */
+       /* create a lsa connection */
        status = rpc_pipe_open_internal(mem_ctx,
                                        &ndr_table_lsarpc.syntax_id,
-                                       server_info,
+                                       session_info,
+                                       NULL,
                                        winbind_messaging_context(),
                                        &cli);
        if (!NT_STATUS_IS_OK(status)) {
@@ -141,7 +145,6 @@ static NTSTATUS open_internal_lsa_pipe(TALLOC_CTX *mem_ctx,
                return status;
        }
 
-done:
        if (lsa_pipe) {
                *lsa_pipe = cli;
        }
@@ -177,14 +180,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 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"));
 
@@ -204,6 +208,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 +228,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;
@@ -240,7 +246,8 @@ static NTSTATUS sam_query_user_list(struct winbindd_domain *domain,
        struct wbint_userinfo *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_query_user_list\n"));
 
@@ -260,6 +267,8 @@ 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,
@@ -279,8 +288,8 @@ static NTSTATUS sam_query_user_list(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);
@@ -296,7 +305,8 @@ static NTSTATUS sam_query_user(struct winbindd_domain *domain,
        struct rpc_pipe_client *samr_pipe;
        struct policy_handle dom_pol;
        TALLOC_CTX *tmp_ctx;
-       NTSTATUS status;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
 
        DEBUG(3,("sam_query_user\n"));
 
@@ -323,6 +333,8 @@ static NTSTATUS sam_query_user(struct winbindd_domain *domain,
                goto done;
        }
 
+       b = samr_pipe->binding_handle;
+
        status = rpc_query_user(tmp_ctx,
                                samr_pipe,
                                &dom_pol,
@@ -331,8 +343,8 @@ static NTSTATUS sam_query_user(struct winbindd_domain *domain,
                                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(tmp_ctx);
@@ -349,7 +361,8 @@ static NTSTATUS sam_trusted_domains(struct winbindd_domain *domain,
        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"));
 
@@ -369,6 +382,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 +399,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);
@@ -411,7 +426,8 @@ 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"));
 
@@ -424,7 +440,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 +453,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 +484,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);
@@ -482,7 +500,7 @@ done:
 static NTSTATUS builtin_enum_dom_groups(struct winbindd_domain *domain,
                                TALLOC_CTX *mem_ctx,
                                uint32 *num_entries,
-                               struct acct_info **info)
+                               struct wb_acct_info **info)
 {
        /* BUILTIN doesn't have domain groups */
        *num_entries = 0;
@@ -528,14 +546,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 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"));
 
@@ -555,6 +574,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 +594,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);
@@ -595,7 +616,8 @@ static NTSTATUS sam_name_to_sid(struct winbindd_domain *domain,
        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"));
 
@@ -611,6 +633,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 +655,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);
@@ -653,7 +677,8 @@ static NTSTATUS sam_sid_to_name(struct winbindd_domain *domain,
        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"));
 
@@ -682,6 +707,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 +731,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,7 +741,7 @@ done:
 
 static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
                                  TALLOC_CTX *mem_ctx,
-                                 const struct dom_sid *sid,
+                                 const struct dom_sid *domain_sid,
                                  uint32 *rids,
                                  size_t num_rids,
                                  char **pdomain_name,
@@ -727,22 +754,21 @@ static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
        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_domain(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 +782,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 +811,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);
@@ -799,7 +827,8 @@ static NTSTATUS sam_lockout_policy(struct winbindd_domain *domain,
        struct policy_handle dom_pol;
        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"));
 
@@ -815,20 +844,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);
+                                            &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);
@@ -843,7 +879,8 @@ static NTSTATUS sam_password_policy(struct winbindd_domain *domain,
        struct policy_handle dom_pol;
        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"));
 
@@ -859,20 +896,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);
+                                            &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 +935,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 +956,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 +978,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);
@@ -951,7 +998,8 @@ static NTSTATUS sam_lookup_useraliases(struct winbindd_domain *domain,
        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"));
 
@@ -971,6 +1019,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 +1041,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);
@@ -1007,7 +1057,8 @@ static NTSTATUS sam_sequence_number(struct winbindd_domain *domain,
        struct policy_handle dom_pol;
        uint32_t seq;
        TALLOC_CTX *tmp_ctx;
-       NTSTATUS status;
+       NTSTATUS status, result;
+       struct dcerpc_binding_handle *b = NULL;
 
        DEBUG(3,("samr: sequence number\n"));
 
@@ -1027,6 +1078,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 +1093,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);