summaryrefslogtreecommitdiffstats
path: root/source3/rpc_client
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2013-10-17 17:03:00 +0200
committerStefan Metzmacher <metze@samba.org>2014-01-07 12:47:07 +0100
commit5adfc5f9f737c003b84b0187fa17b9fc3784442e (patch)
tree52fa00abf1cbfceed9372473318f50ee3457cc42 /source3/rpc_client
parent38d4dba37406515181e4d6f1a1faffc18e652e27 (diff)
downloadsamba-5adfc5f9f737c003b84b0187fa17b9fc3784442e.tar.gz
samba-5adfc5f9f737c003b84b0187fa17b9fc3784442e.tar.xz
samba-5adfc5f9f737c003b84b0187fa17b9fc3784442e.zip
s3:rpc_client: use netlogon_creds_cli_auth_level() in cli_rpc_pipe_open_schannel_with_key()
This means the auth level is now based on the "winbindd sealed pipes" option, defaulting to "yes" and DCERPC_AUTH_LEVEL_PRIVACY. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3/rpc_client')
-rw-r--r--source3/rpc_client/cli_pipe.c4
-rw-r--r--source3/rpc_client/cli_pipe.h1
-rw-r--r--source3/rpc_client/cli_pipe_schannel.c2
3 files changed, 4 insertions, 3 deletions
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);