From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 4 Feb 2014 01:49:58 +0000 (+0100)
Subject: s4:torture/rpc: make use of dcerpc_binding_get_assoc_group_id() in handles.c
X-Git-Tag: tdb-1.2.13~426
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e796fcd4259d8f625a6c5ccf79e6dc85cf22b5c1;p=thirdparty%2Fsamba.git

s4:torture/rpc: make use of dcerpc_binding_get_assoc_group_id() in handles.c

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
---

diff --git a/source4/torture/rpc/handles.c b/source4/torture/rpc/handles.c
index 5c08a5f371a..98005212370 100644
--- a/source4/torture/rpc/handles.c
+++ b/source4/torture/rpc/handles.c
@@ -124,7 +124,7 @@ static bool test_handles_lsa_shared(struct torture_context *torture)
 	b1 = p1->binding_handle;
 
 	transport	= p1->conn->transport.transport;
-	assoc_group_id	= p1->assoc_group_id;
+	assoc_group_id	= dcerpc_binding_get_assoc_group_id(p1->binding);
 
 	torture_comment(torture, "use assoc_group_id[0x%08X] for new connections\n", assoc_group_id);
 
@@ -136,7 +136,7 @@ static bool test_handles_lsa_shared(struct torture_context *torture)
 	b2 = p2->binding_handle;
 
 	torture_comment(torture, "got assoc_group_id[0x%08X] for p2\n", 
-			p2->assoc_group_id);
+			dcerpc_binding_get_assoc_group_id(p2->binding));
 
 	qos.len = 0;
 	qos.impersonation_level = 2;
@@ -416,7 +416,7 @@ static bool test_handles_mixed_shared(struct torture_context *torture)
 	b1 = p1->binding_handle;
 
 	transport	= p1->conn->transport.transport;
-	assoc_group_id	= p1->assoc_group_id;
+	assoc_group_id	= dcerpc_binding_get_assoc_group_id(p1->binding);
 
 	torture_comment(torture, "use assoc_group_id[0x%08X] for new connections\n", assoc_group_id);
 
@@ -428,7 +428,7 @@ static bool test_handles_mixed_shared(struct torture_context *torture)
 	b2 = p2->binding_handle;
 
 	torture_comment(torture, "got assoc_group_id[0x%08X] for p2\n", 
-			p2->assoc_group_id);
+			dcerpc_binding_get_assoc_group_id(p2->binding));
 	r.in.system_name = 0;
 	r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	r.out.connect_handle = &handle;
@@ -510,14 +510,15 @@ static bool test_handles_random_assoc(struct torture_context *torture)
 	torture_assert_ntstatus_ok(torture, status, "opening samr pipe1");
 
 	torture_comment(torture, "pipe1 uses assoc_group_id[0x%08X]\n",
-			p1->assoc_group_id);
+			dcerpc_binding_get_assoc_group_id(p1->binding));
 
 	transport	= p1->conn->transport.transport;
 	/*
 	 * We use ~p1->assoc_group_id instead of p1->assoc_group_id, because
 	 * this way we are less likely to use an id which is already in use.
 	 */
-	assoc_group_id	= ~p1->assoc_group_id;
+	assoc_group_id = dcerpc_binding_get_assoc_group_id(p1->binding);
+	assoc_group_id = ~assoc_group_id;
 
 	torture_comment(torture, "connect samr pipe2 with assoc_group_id[0x%08X]- should fail\n", ++assoc_group_id);
 	status = torture_rpc_connection_transport(torture, &p2, &ndr_table_samr,