sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s3:rpc_client: split out cli_rpc_pipe_client_auth_schannel()

Browse Source 
This will allow us to use it without creating a new
association group and transport connection.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Stefan Metzmacher 2024-09-17 04:23:40 +02:00 committed by Ralph Boehme
parent dd79808415
commit 14fe854ec5
2 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
source3/rpc_client/cli_pipe.c
View File

@ -4266,40 +4266,27 @@ NTSTATUS cli_rpc_pipe_open_with_creds(struct cli_state *cli,
return status;
}
NTSTATUS cli_rpc_pipe_open_bind_schannel(
struct cli_state *cli,
NTSTATUS cli_rpc_pipe_client_auth_schannel(
struct rpc_pipe_client *rpccli,
const struct ndr_interface_table *table,
enum dcerpc_transport_t transport,
struct netlogon_creds_cli_context *netlogon_creds,
const char *remote_name,
const struct sockaddr_storage *remote_sockaddr,
struct rpc_pipe_client **_rpccli)
struct netlogon_creds_cli_context *netlogon_creds)
{
struct rpc_pipe_client *rpccli;
struct pipe_auth_data *rpcauth;
TALLOC_CTX *frame = talloc_stackframe();
struct pipe_auth_data *rpcauth = NULL;
const char *target_service = table->authservices->names[0];
struct cli_credentials *cli_creds;
struct cli_credentials *cli_creds = NULL;
enum dcerpc_AuthLevel auth_level;
NTSTATUS status;
status = cli_rpc_pipe_open(cli,
transport,
table,
remote_name,
remote_sockaddr,
&rpccli);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
auth_level = netlogon_creds_cli_auth_level(netlogon_creds);
status = netlogon_creds_bind_cli_credentials(
netlogon_creds, rpccli, &cli_creds);
status = netlogon_creds_bind_cli_credentials(netlogon_creds,
frame,
&cli_creds);
if (!NT_STATUS_IS_OK(status)) {
DBG_DEBUG("netlogon_creds_bind_cli_credentials failed: %s\n",
nt_errstr(status));
TALLOC_FREE(rpccli);
TALLOC_FREE(frame);
return status;
}
@ -4313,16 +4300,47 @@ NTSTATUS cli_rpc_pipe_open_bind_schannel(
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("rpccli_generic_bind_data_from_creds returned %s\n",
nt_errstr(status)));
TALLOC_FREE(rpccli);
TALLOC_FREE(frame);
return status;
}
status = rpc_pipe_bind(rpccli, rpcauth);
if (!NT_STATUS_IS_OK(status)) {
DBG_DEBUG("rpc_pipe_bind failed with error %s\n",
nt_errstr(status));
TALLOC_FREE(frame);
return status;
}
/* No TALLOC_FREE, gensec takes references */
talloc_unlink(rpccli, cli_creds);
cli_creds = NULL;
TALLOC_FREE(frame);
return NT_STATUS_OK;
}
NTSTATUS cli_rpc_pipe_open_bind_schannel(
struct cli_state *cli,
const struct ndr_interface_table *table,
enum dcerpc_transport_t transport,
struct netlogon_creds_cli_context *netlogon_creds,
const char *remote_name,
const struct sockaddr_storage *remote_sockaddr,
struct rpc_pipe_client **_rpccli)
{
struct rpc_pipe_client *rpccli = NULL;
NTSTATUS status;
status = cli_rpc_pipe_open(cli,
transport,
table,
remote_name,
remote_sockaddr,
&rpccli);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
status = cli_rpc_pipe_client_auth_schannel(rpccli,
table,
netlogon_creds);
if (!NT_STATUS_IS_OK(status)) {
DBG_DEBUG("rpc_pipe_bind failed with error %s\n",
nt_errstr(status));

4
source3/rpc_client/cli_pipe.h
View File

@ -109,6 +109,10 @@ NTSTATUS cli_rpc_pipe_open_with_creds(struct cli_state *cli,
struct cli_credentials *creds,
struct rpc_pipe_client **presult);
NTSTATUS cli_rpc_pipe_client_auth_schannel(
struct rpc_pipe_client *rpccli,
const struct ndr_interface_table *table,
struct netlogon_creds_cli_context *netlogon_creds);
NTSTATUS cli_rpc_pipe_open_bind_schannel(
struct cli_state *cli,
const struct ndr_interface_table *table,