From: Günther Deschner <gd@samba.org>
Date: Mon, 20 Apr 2015 13:41:44 +0000 (+0200)
Subject: s4-torture: pass down struct torture_context to some more calls in mgmt test.
X-Git-Tag: tdb-1.3.5~51
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=3e1230e34aee20c4218949727b662244dfc562d7;p=kai%2Fsamba-autobuild%2F.git

s4-torture: pass down struct torture_context to some more calls in mgmt test.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
---

diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index 10400a9d64a..a19db3e8cdd 100644
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -79,7 +79,8 @@ bool test_inq_if_ids(struct torture_context *tctx,
 	return true;
 }
 
-static bool test_inq_stats(struct dcerpc_binding_handle *b,
+static bool test_inq_stats(struct torture_context *tctx,
+			   struct dcerpc_binding_handle *b,
 			   TALLOC_CTX *mem_ctx)
 {
 	NTSTATUS status;
@@ -110,7 +111,8 @@ static bool test_inq_stats(struct dcerpc_binding_handle *b,
 	return true;
 }
 
-static bool test_inq_princ_name(struct dcerpc_binding_handle *b,
+static bool test_inq_princ_name(struct torture_context *tctx,
+				struct dcerpc_binding_handle *b,
 				TALLOC_CTX *mem_ctx)
 {
 	NTSTATUS status;
@@ -146,7 +148,8 @@ static bool test_inq_princ_name(struct dcerpc_binding_handle *b,
 	return true;
 }
 
-static bool test_is_server_listening(struct dcerpc_binding_handle *b,
+static bool test_is_server_listening(struct torture_context *tctx,
+				     struct dcerpc_binding_handle *b,
 				     TALLOC_CTX *mem_ctx)
 {
 	NTSTATUS status;
@@ -168,7 +171,8 @@ static bool test_is_server_listening(struct dcerpc_binding_handle *b,
 	return true;
 }
 
-static bool test_stop_server_listening(struct dcerpc_binding_handle *b,
+static bool test_stop_server_listening(struct torture_context *tctx,
+				       struct dcerpc_binding_handle *b,
 				       TALLOC_CTX *mem_ctx)
 {
 	NTSTATUS status;
@@ -247,19 +251,19 @@ bool torture_rpc_mgmt(struct torture_context *tctx)
 			continue;
 		}
 
-		if (!test_is_server_listening(bh, loop_ctx)) {
+		if (!test_is_server_listening(tctx, bh, loop_ctx)) {
 			ret = false;
 		}
 
-		if (!test_stop_server_listening(bh, loop_ctx)) {
+		if (!test_stop_server_listening(tctx, bh, loop_ctx)) {
 			ret = false;
 		}
 
-		if (!test_inq_stats(bh, loop_ctx)) {
+		if (!test_inq_stats(tctx, bh, loop_ctx)) {
 			ret = false;
 		}
 
-		if (!test_inq_princ_name(bh, loop_ctx)) {
+		if (!test_inq_princ_name(tctx, bh, loop_ctx)) {
 			ret = false;
 		}