diff options
| -rw-r--r-- | source3/libnet/libnet_join.c | 1 | ||||
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 4 | ||||
| -rw-r--r-- | source3/rpc_client/cli_pipe.h | 1 | ||||
| -rw-r--r-- | source3/rpc_client/cli_pipe_schannel.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 5 |
5 files changed, 5 insertions, 8 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 5dc620f270..b2805eed54 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -1278,7 +1278,6 @@ NTSTATUS libnet_join_ok(const char *netbios_domain_name, status = cli_rpc_pipe_open_schannel_with_key( cli, &ndr_table_netlogon, NCACN_NP, - DCERPC_AUTH_LEVEL_PRIVACY, netbios_domain_name, netlogon_pipe->netlogon_creds, &pipe_hnd); diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 7f79046fc7..b9473bbb83 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -3023,7 +3023,6 @@ NTSTATUS cli_rpc_pipe_open_generic_auth(struct cli_state *cli, NTSTATUS cli_rpc_pipe_open_schannel_with_key(struct cli_state *cli, const struct ndr_interface_table *table, enum dcerpc_transport_t transport, - enum dcerpc_AuthLevel auth_level, const char *domain, struct netlogon_creds_cli_context *netlogon_creds, struct rpc_pipe_client **_rpccli) @@ -3031,6 +3030,7 @@ NTSTATUS cli_rpc_pipe_open_schannel_with_key(struct cli_state *cli, struct rpc_pipe_client *rpccli; struct pipe_auth_data *rpcauth; struct netlogon_creds_CredentialState *creds = NULL; + enum dcerpc_AuthLevel auth_level; NTSTATUS status; const char *target_service = table->authservices->names[0]; int rpc_pipe_bind_dbglvl = 0; @@ -3048,6 +3048,8 @@ NTSTATUS cli_rpc_pipe_open_schannel_with_key(struct cli_state *cli, return status; } + auth_level = netlogon_creds_cli_auth_level(netlogon_creds); + status = rpccli_generic_bind_data(rpccli, DCERPC_AUTH_TYPE_SCHANNEL, auth_level, diff --git a/source3/rpc_client/cli_pipe.h b/source3/rpc_client/cli_pipe.h index 4e9f84a333..2a10a810bb 100644 --- a/source3/rpc_client/cli_pipe.h +++ b/source3/rpc_client/cli_pipe.h @@ -96,7 +96,6 @@ NTSTATUS cli_rpc_pipe_open_spnego(struct cli_state *cli, NTSTATUS cli_rpc_pipe_open_schannel_with_key(struct cli_state *cli, const struct ndr_interface_table *table, enum dcerpc_transport_t transport, - enum dcerpc_AuthLevel auth_level, const char *domain, struct netlogon_creds_cli_context *netlogon_creds, struct rpc_pipe_client **presult); diff --git a/source3/rpc_client/cli_pipe_schannel.c b/source3/rpc_client/cli_pipe_schannel.c index e3d65c8620..8f9161fc5a 100644 --- a/source3/rpc_client/cli_pipe_schannel.c +++ b/source3/rpc_client/cli_pipe_schannel.c @@ -112,7 +112,7 @@ NTSTATUS cli_rpc_pipe_open_schannel(struct cli_state *cli, } status = cli_rpc_pipe_open_schannel_with_key( - cli, table, transport, auth_level, domain, + cli, table, transport, domain, netlogon_pipe->netlogon_creds, &result); diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index d08d7de13f..25e6d50f3e 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -2430,7 +2430,6 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, } status = cli_rpc_pipe_open_schannel_with_key (conn->cli, &ndr_table_samr, NCACN_NP, - DCERPC_AUTH_LEVEL_PRIVACY, domain->name, p_creds, &conn->samr_pipe); if (!NT_STATUS_IS_OK(status)) { @@ -2563,7 +2562,6 @@ NTSTATUS cm_connect_lsa_tcp(struct winbindd_domain *domain, status = cli_rpc_pipe_open_schannel_with_key(conn->cli, &ndr_table_lsarpc, NCACN_IP_TCP, - DCERPC_AUTH_LEVEL_PRIVACY, domain->name, creds, &conn->lsa_pipe_tcp); @@ -2661,7 +2659,6 @@ NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, } result = cli_rpc_pipe_open_schannel_with_key (conn->cli, &ndr_table_lsarpc, NCACN_NP, - DCERPC_AUTH_LEVEL_PRIVACY, domain->name, p_creds, &conn->lsa_pipe); if (!NT_STATUS_IS_OK(result)) { @@ -2841,7 +2838,7 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain, result = cli_rpc_pipe_open_schannel_with_key( conn->cli, &ndr_table_netlogon, NCACN_NP, - DCERPC_AUTH_LEVEL_PRIVACY, domain->name, + domain->name, netlogon_pipe->netlogon_creds, &conn->netlogon_pipe); |