summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-01-17 13:39:45 +0100
committerGünther Deschner <gd@samba.org>2015-07-07 17:07:49 +0200
commit66736fee3a896edf5571dc627a9cf6d8eee405b0 (patch)
treec89ceb002c129c458212cb45c1b641ee5a3f422a /source4
parent87bf1a6edd2395b1a98775af0edb0a0b5be59c62 (diff)
downloadsamba-66736fee3a896edf5571dc627a9cf6d8eee405b0.tar.gz
s4:torture/rpc: use dcerpc_secondary_auth_connection with creds
This is the same as calling dcerpc_secondary_connection/dcerpc_bind_auth. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Guenther Deschner <gd@samba.org> Autobuild-User(master): Günther Deschner <gd@samba.org> Autobuild-Date(master): Tue Jul 7 17:07:49 CEST 2015 on sn-devel-104
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/rpc/schannel.c33
1 files changed, 12 insertions, 21 deletions
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index fb8af5fba0f..a72dd314967 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -399,17 +399,13 @@ static bool test_schannel(struct torture_context *tctx,
status = dcerpc_epm_map_binding(tctx, b, &ndr_table_netlogon, tctx->ev, tctx->lp_ctx);
torture_assert_ntstatus_ok(tctx, status, "epm map");
- status = dcerpc_secondary_connection(p, &p_netlogon,
- b);
- torture_assert_ntstatus_ok(tctx, status, "secondary connection");
-
- status = dcerpc_bind_auth(p_netlogon, &ndr_table_netlogon,
- credentials, lpcfg_gensec_settings(tctx, tctx->lp_ctx),
- DCERPC_AUTH_TYPE_SCHANNEL,
- dcerpc_auth_level(p->conn),
- NULL);
+ status = dcerpc_binding_set_flags(b, dcerpc_flags, DCERPC_AUTH_OPTIONS);
+ torture_assert_ntstatus_ok(tctx, status, "set flags");
- torture_assert_ntstatus_ok(tctx, status, "bind auth");
+ status = dcerpc_secondary_auth_connection(p, b, &ndr_table_netlogon,
+ credentials, tctx->lp_ctx,
+ tctx, &p_netlogon);
+ torture_assert_ntstatus_ok(tctx, status, "Failed to create secondary connection");
creds = cli_credentials_get_netlogon_creds(credentials);
torture_assert(tctx, (creds != NULL), "schannel creds");
@@ -491,18 +487,13 @@ static bool test_schannel(struct torture_context *tctx,
status = dcerpc_epm_map_binding(tctx, b, &ndr_table_netlogon, tctx->ev, tctx->lp_ctx);
torture_assert_ntstatus_ok(tctx, status, "epm");
- status = dcerpc_secondary_connection(p_samr2, &p_netlogon2,
- b);
- torture_assert_ntstatus_ok(tctx, status, "secondary connection");
-
- /* and now setup an SCHANNEL bind on netlogon */
- status = dcerpc_bind_auth(p_netlogon2, &ndr_table_netlogon,
- credentials, lpcfg_gensec_settings(tctx, tctx->lp_ctx),
- DCERPC_AUTH_TYPE_SCHANNEL,
- dcerpc_auth_level(p_samr2->conn),
- NULL);
+ status = dcerpc_binding_set_flags(b, dcerpc_flags, DCERPC_AUTH_OPTIONS);
+ torture_assert_ntstatus_ok(tctx, status, "set flags");
- torture_assert_ntstatus_ok(tctx, status, "auth failed");
+ status = dcerpc_secondary_auth_connection(p_samr2, b, &ndr_table_netlogon,
+ credentials, tctx->lp_ctx,
+ tctx, &p_netlogon2);
+ torture_assert_ntstatus_ok(tctx, status, "Failed to create secondary connection");
/* checks the capabilities */
torture_assert(tctx, test_netlogon_capabilities(p_netlogon2, tctx, credentials, creds),