Use rpccli_samr_Connect2() all over the place.

Guenther
(This used to be commit bdf8d562621e1a09bf83e2009dec24966e7fdf22)

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 737474d8078a13c75caca0cc4f40668e269b2e74..f855a57f32927b8f7aee585350218194cf15174e 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -671,8 +671,10 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       status = rpccli_samr_connect(pipe_hnd, mem_ctx,
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED, &sam_pol);
+       status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     &sam_pol);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -849,8 +851,10 @@ static NTSTATUS libnet_join_unjoindomain_rpc(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       status = rpccli_samr_connect(pipe_hnd, mem_ctx,
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED, &sam_pol);
+       status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     &sam_pol);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index b0c6213f56aae9693ce71ae6789d21c3111820f3..dbc20089eadc0a77d51d01909d4032df25baa518 100644 (file)
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -326,7 +326,7 @@ static void display_sam_info_5(SAM_ENTRY5 *e5, SAM_STR5 *s5)
 }
 
 /****************************************************************************
- Try samr_connect4 first, then samr_conenct if it fails
+ Try samr_connect4 first, then samr_connect2 if it fails
  ****************************************************************************/
 static NTSTATUS try_samr_connects(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, 
                                  uint32 access_mask, POLICY_HND *connect_pol)
@@ -339,8 +339,10 @@ static NTSTATUS try_samr_connects(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
                                      access_mask,
                                      connect_pol);
        if (!NT_STATUS_IS_OK(result)) {
-               result = rpccli_samr_connect(cli, mem_ctx, access_mask,
-                                         connect_pol);
+               result = rpccli_samr_Connect2(cli, mem_ctx,
+                                             cli->cli->desthost,
+                                             access_mask,
+                                             connect_pol);
        }
        return result;
 }

diff --git a/source3/utils/net_domain.c b/source3/utils/net_domain.c
index 74b35d0d66829ebd8dbd10194f7e3d1cb4b539a4..11099ab233d1bfb9f27df715693f9b33a0b50b66 100644 (file)
--- a/source3/utils/net_domain.c
+++ b/source3/utils/net_domain.c
@@ -71,8 +71,10 @@ NTSTATUS netdom_leave_domain( TALLOC_CTX *mem_ctx, struct cli_state *cli,
                return status;
        }
 
-       status = rpccli_samr_connect(pipe_hnd, mem_ctx, 
-                       SEC_RIGHTS_MAXIMUM_ALLOWED, &sam_pol);
+       status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     &sam_pol);
        if ( !NT_STATUS_IS_OK(status) )
                return status;
 
@@ -240,8 +242,10 @@ NTSTATUS netdom_join_domain( TALLOC_CTX *mem_ctx, struct cli_state *cli,
                return status;
        }
 
-       status = rpccli_samr_connect(pipe_hnd, mem_ctx, 
-                       SEC_RIGHTS_MAXIMUM_ALLOWED, &sam_pol);
+       status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     &sam_pol);
        if ( !NT_STATUS_IS_OK(status) )
                return status;
 

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 9d8824c980c92df19ec81b8da2532f16e230fed2..8f79e2ea25d5cba8cf3f34b914bdda99a301ba4b 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -450,9 +450,11 @@ NTSTATUS rpc_info_internals(const DOM_SID *domain_sid,
 
        sid_to_fstring(sid_str, domain_sid);
 
-       /* Get sam policy handle */     
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+       /* Get sam policy handle */
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result)) {
                d_fprintf(stderr, "Could not connect to SAM: %s\n", nt_errstr(result));
                goto done;
@@ -609,9 +611,11 @@ static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid,
        init_lsa_String(&lsa_acct_name, acct_name);
 
        /* Get sam policy handle */
-       
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -770,8 +774,10 @@ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid,
 
        /* Get sam policy and domain handles */
 
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
@@ -883,9 +889,12 @@ static NTSTATUS rpc_user_rename_internals(const DOM_SID *domain_sid,
        ZERO_STRUCT(user_ctr);
 
        /* Get sam policy handle */
-       
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
+
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -1038,8 +1047,10 @@ static NTSTATUS rpc_user_password_internals(const DOM_SID *domain_sid,
 
        /* Get sam policy and domain handles */
 
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
@@ -1161,9 +1172,11 @@ static NTSTATUS rpc_user_info_internals(const DOM_SID *domain_sid,
                return NT_STATUS_OK;
        }
        /* Get sam policy handle */
-       
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result)) goto done;
        
        /* Get domain policy handle */
@@ -1270,9 +1283,11 @@ static NTSTATUS rpc_user_list_internals(const DOM_SID *domain_sid,
        SAM_DISPINFO_1 info1;
 
        /* Get sam policy handle */
-       
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -1418,8 +1433,10 @@ static NTSTATUS rpc_sh_handle_user(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx,
-                                    MAXIMUM_ALLOWED_ACCESS, &connect_pol);
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -1785,11 +1802,13 @@ static NTSTATUS rpc_group_delete_internals(const DOM_SID *domain_sid,
                return NT_STATUS_OK; /* ok? */
        }
 
-        result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                  &connect_pol);
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
 
         if (!NT_STATUS_IS_OK(result)) {
-               d_fprintf(stderr, "Request samr_connect failed\n");
+               d_fprintf(stderr, "Request samr_Connect2 failed\n");
                goto done;
         }
 
@@ -1974,9 +1993,11 @@ static NTSTATUS rpc_group_add_internals(const DOM_SID *domain_sid,
        init_lsa_String(&grp_name, argv[0]);
 
        /* Get sam policy handle */
-       
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result)) goto done;
        
        /* Get domain policy handle */
@@ -2040,9 +2061,11 @@ static NTSTATUS rpc_alias_add_internals(const DOM_SID *domain_sid,
        init_lsa_String(&alias_name, argv[0]);
 
        /* Get sam policy handle */
-       
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result)) goto done;
        
        /* Get domain policy handle */
@@ -2172,9 +2195,11 @@ static NTSTATUS rpc_add_groupmem(struct rpc_pipe_client *pipe_hnd,
                return NT_STATUS_UNSUCCESSFUL;
        }
 
-       /* Get sam policy handle */     
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+       /* Get sam policy handle */
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result)) {
                return result;
        }
@@ -2247,9 +2272,11 @@ static NTSTATUS rpc_add_aliasmem(struct rpc_pipe_client *pipe_hnd,
                return result;
        }
 
-       /* Get sam policy handle */     
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+       /* Get sam policy handle */
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -2363,9 +2390,11 @@ static NTSTATUS rpc_del_groupmem(struct rpc_pipe_client *pipe_hnd,
        if (!sid_split_rid(&sid, &group_rid))
                return NT_STATUS_UNSUCCESSFUL;
 
-       /* Get sam policy handle */     
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+       /* Get sam policy handle */
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result))
                return result;
 
@@ -2433,9 +2462,11 @@ static NTSTATUS rpc_del_aliasmem(struct rpc_pipe_client *pipe_hnd,
                return result;
        }
 
-       /* Get sam policy handle */     
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+       /* Get sam policy handle */
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -2576,9 +2607,11 @@ static NTSTATUS rpc_group_list_internals(const DOM_SID *domain_sid,
        }
 
        /* Get sam policy handle */
-       
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -2919,9 +2952,11 @@ static NTSTATUS rpc_group_members_internals(const DOM_SID *domain_sid,
        uint32 num_rids, *rids, *rid_types;
 
        /* Get sam policy handle */
-       
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                return result;
@@ -3020,9 +3055,11 @@ static NTSTATUS rpc_group_rename_internals(const DOM_SID *domain_sid,
        }
 
        /* Get sam policy handle */
-       
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                return result;
@@ -4271,8 +4308,10 @@ static NTSTATUS rpc_aliaslist_internals(const DOM_SID *domain_sid,
        NTSTATUS result;
        POLICY_HND connect_pol;
 
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -5485,8 +5524,10 @@ static NTSTATUS rpc_trustdom_add_internals(const DOM_SID *domain_sid,
        init_lsa_String(&lsa_acct_name, acct_name);
 
        /* Get samr policy handle */
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                 &connect_pol);
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -5639,8 +5680,10 @@ static NTSTATUS rpc_trustdom_del_internals(const DOM_SID *domain_sid,
 
 
        /* Get samr policy handle */
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
-                                 &connect_pol);
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -6327,10 +6370,12 @@ static int rpc_trustdom_list(int argc, const char **argv)
                talloc_destroy(mem_ctx);
                return -1;
        };
-       
-       /* SamrConnect */
-       nt_status = rpccli_samr_connect(pipe_hnd, mem_ctx, SA_RIGHT_SAM_OPEN_DOMAIN,
-                                                                &connect_hnd);
+
+       /* SamrConnect2 */
+       nt_status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                        pipe_hnd->cli->desthost,
+                                        SA_RIGHT_SAM_OPEN_DOMAIN,
+                                        &connect_hnd);
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0, ("Couldn't open SAMR policy handle. Error was %s\n",
                        nt_errstr(nt_status)));

diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 27819bb6ab865ffde82a20fc2360f5bd6d0fdb04..d678029c466cdff2bf2b27cc1a4d1a862eca9ba8 100644 (file)
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -239,9 +239,10 @@ int net_rpc_join_newstyle(int argc, const char **argv)
                goto done;
        }
 
-       CHECK_RPC_ERR(rpccli_samr_connect(pipe_hnd, mem_ctx, 
-                                      SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                      &sam_pol),
+       CHECK_RPC_ERR(rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                          pipe_hnd->cli->desthost,
+                                          SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                          &sam_pol),
                      "could not connect to SAM database");
 
 

diff --git a/source3/utils/net_rpc_sh_acct.c b/source3/utils/net_rpc_sh_acct.c
index 12da031d4b36d5113204a696f84a1ba2355cb59e..5d5f7ad4856f5a901909bbe67e86264bad2349f5 100644 (file)
--- a/source3/utils/net_rpc_sh_acct.c
+++ b/source3/utils/net_rpc_sh_acct.c
@@ -45,10 +45,11 @@ static NTSTATUS rpc_sh_acct_do(TALLOC_CTX *mem_ctx,
        ZERO_STRUCT(domain_pol);
 
        /* Get sam policy handle */
-       
-       result = rpccli_samr_connect(pipe_hnd, mem_ctx,
-                                    MAXIMUM_ALLOWED_ACCESS, 
-                                    &connect_pol);
+
+       result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &connect_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index d2a76630024dcca051a147275e81508f17af2c79..7bc449c90d11ad29cddd19e6b6b0077343d9cab4 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2109,13 +2109,14 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
                  "pipe: user %s\\%s\n", domain->name,
                  domain_name, machine_account));
 
-       result = rpccli_samr_connect(conn->samr_pipe, mem_ctx,
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                    &conn->sam_connect_handle);
+       result = rpccli_samr_Connect2(conn->samr_pipe, mem_ctx,
+                                     conn->samr_pipe->cli->desthost,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     &conn->sam_connect_handle);
        if (NT_STATUS_IS_OK(result)) {
                goto open_domain;
        }
-       DEBUG(10,("cm_connect_sam: ntlmssp-sealed rpccli_samr_connect "
+       DEBUG(10,("cm_connect_sam: ntlmssp-sealed rpccli_samr_Connect2 "
                  "failed for domain %s, error was %s. Trying schannel\n",
                  domain->name, nt_errstr(result) ));
        cli_rpc_pipe_close(conn->samr_pipe);
@@ -2143,13 +2144,14 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
        DEBUG(10,("cm_connect_sam: connected to SAMR pipe for domain %s using "
                  "schannel.\n", domain->name ));
 
-       result = rpccli_samr_connect(conn->samr_pipe, mem_ctx,
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                    &conn->sam_connect_handle);
+       result = rpccli_samr_Connect2(conn->samr_pipe, mem_ctx,
+                                     conn->samr_pipe->cli->desthost,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     &conn->sam_connect_handle);
        if (NT_STATUS_IS_OK(result)) {
                goto open_domain;
        }
-       DEBUG(10,("cm_connect_sam: schannel-sealed rpccli_samr_connect failed "
+       DEBUG(10,("cm_connect_sam: schannel-sealed rpccli_samr_Connect2 failed "
                  "for domain %s, error was %s. Trying anonymous\n",
                  domain->name, nt_errstr(result) ));
        cli_rpc_pipe_close(conn->samr_pipe);
@@ -2165,11 +2167,12 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       result = rpccli_samr_connect(conn->samr_pipe, mem_ctx,
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                    &conn->sam_connect_handle);
+       result = rpccli_samr_Connect2(conn->samr_pipe, mem_ctx,
+                                     conn->samr_pipe->cli->desthost,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     &conn->sam_connect_handle);
        if (!NT_STATUS_IS_OK(result)) {
-               DEBUG(10,("cm_connect_sam: rpccli_samr_connect failed "
+               DEBUG(10,("cm_connect_sam: rpccli_samr_Connect2 failed "
                          "for domain %s Error was %s\n",
                          domain->name, nt_errstr(result) ));
                goto done;