winbindd: remove useless calls to get_trust_credentials() before cli_rpc_pipe_open_sc...
authorStefan Metzmacher <metze@samba.org>
Mon, 15 Jan 2018 13:30:12 +0000 (14:30 +0100)
committerRalph Boehme <slow@samba.org>
Sat, 10 Feb 2018 07:35:15 +0000 (08:35 +0100)
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13231

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/winbindd/winbindd_cm.c

index 2aca5f374f6e53a7e01754a561a707571ff35050..b7fd981547f7a0fef0628ad39e7b333c32cb2c9c 100644 (file)
@@ -2758,13 +2758,6 @@ retry:
                goto anonymous;
        }
        TALLOC_FREE(creds);
-       result = get_trust_credentials(domain, talloc_tos(), true, &creds);
-       if (!NT_STATUS_IS_OK(result)) {
-               DEBUG(10, ("cm_connect_sam: No user available for "
-                          "domain %s (error %s), trying anon\n", domain->name,
-                          nt_errstr(result)));
-               goto anonymous;
-       }
        status = cli_rpc_pipe_open_schannel_with_creds(
                conn->cli, &ndr_table_samr, NCACN_NP, p_creds,
                &conn->samr_pipe);
@@ -2908,7 +2901,6 @@ static NTSTATUS cm_connect_lsa_tcp(struct winbindd_domain *domain,
 {
        struct winbindd_cm_conn *conn;
        struct netlogon_creds_cli_context *p_creds = NULL;
-       struct cli_credentials *creds = NULL;
        NTSTATUS status;
 
        DEBUG(10,("cm_connect_lsa_tcp\n"));
@@ -2936,11 +2928,6 @@ static NTSTATUS cm_connect_lsa_tcp(struct winbindd_domain *domain,
                goto done;
        }
 
-       status = get_trust_credentials(domain, talloc_tos(), true, &creds);
-       if (!NT_STATUS_IS_OK(status)) {
-               goto done;
-       }
-
        status = cli_rpc_pipe_open_schannel_with_creds(conn->cli,
                                                       &ndr_table_lsarpc,
                                                       NCACN_IP_TCP,
@@ -3063,13 +3050,6 @@ retry:
        }
 
        TALLOC_FREE(creds);
-       result = get_trust_credentials(domain, talloc_tos(), true, &creds);
-       if (!NT_STATUS_IS_OK(result)) {
-               DEBUG(10, ("cm_connect_lsa: No user available for "
-                          "domain %s (error %s), trying anon\n", domain->name,
-                          nt_errstr(result)));
-               goto anonymous;
-       }
        result = cli_rpc_pipe_open_schannel_with_creds(
                conn->cli, &ndr_table_lsarpc, NCACN_NP, p_creds,
                &conn->lsa_pipe);