7 files changed, 15 insertions, 12 deletions
diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index 18933cb033..79902d1e7c 100644
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -69,7 +69,7 @@ static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 
-BOOL torture_domainopen(void)
+BOOL torture_domainopen(struct torture_context *torture)
 {
 	NTSTATUS status;
 	const char *binding;
diff --git a/source4/torture/libnet/libnet_lookup.c b/source4/torture/libnet/libnet_lookup.c
index eed8541f9a..5d347cd049 100644
--- a/source4/torture/libnet/libnet_lookup.c
+++ b/source4/torture/libnet/libnet_lookup.c
@@ -23,9 +23,10 @@
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/nbt.h"
+#include "torture/torture.h"
 
 
-BOOL torture_lookup(void)
+BOOL torture_lookup(struct torture_context *torture)
 {
 	BOOL ret;
 	NTSTATUS status;
@@ -62,7 +63,7 @@ done:
 }
 
 
-BOOL torture_lookup_host(void)
+BOOL torture_lookup_host(struct torture_context *torture)
 {
 	BOOL ret;
 	NTSTATUS status;
@@ -98,7 +99,7 @@ done:
 }
 
 
-BOOL torture_lookup_pdc(void)
+BOOL torture_lookup_pdc(struct torture_context *torture)
 {
 	BOOL ret;
 	NTSTATUS status;
diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c
index b3efa35b46..723a2fd40b 100644
--- a/source4/torture/libnet/libnet_rpc.c
+++ b/source4/torture/libnet/libnet_rpc.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/rpc/dcerpc.h"
+#include "torture/torture.h"
 
 
 static BOOL test_lsa_connect(struct libnet_context *ctx)
@@ -70,7 +71,7 @@ static BOOL test_samr_connect(struct libnet_context *ctx)
 	return True;
 }
 
-BOOL torture_rpc_connect(void)
+BOOL torture_rpc_connect(struct torture_context *torture)
 {
 	struct libnet_context *ctx;
 	
diff --git a/source4/torture/libnet/libnet_share.c b/source4/torture/libnet/libnet_share.c
index b7d877b097..65316f3f32 100644
--- a/source4/torture/libnet/libnet_share.c
+++ b/source4/torture/libnet/libnet_share.c
@@ -109,7 +109,7 @@ static void test_displayshares(struct libnet_ListShares s)
 }
 
 
-BOOL torture_listshares(void)
+BOOL torture_listshares(struct torture_context *torture)
 {
 	struct libnet_ListShares share;
 	NTSTATUS  status;
@@ -194,7 +194,7 @@ static BOOL test_addshare(struct dcerpc_pipe *pipe, TALLOC_CTX *mem_ctx, const c
 }
 
 
-BOOL torture_delshare(void)
+BOOL torture_delshare(struct torture_context *torture)
 {
 	struct dcerpc_pipe *p;
 	struct dcerpc_binding *bind;
diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c
index adb9a3bdd7..f577f352d6 100644
--- a/source4/torture/libnet/libnet_user.c
+++ b/source4/torture/libnet/libnet_user.c
@@ -23,6 +23,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
+#include "torture/torture.h"
 
 
 #define TEST_USERNAME  "libnetusertest"
@@ -93,7 +94,7 @@ static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 
-BOOL torture_createuser(void)
+BOOL torture_createuser(struct torture_context *torture)
 {
 	NTSTATUS status;
 	const char *binding;
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index 15ff443af2..e49112ef54 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -265,7 +265,7 @@ static BOOL test_userinfo_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 
-BOOL torture_userinfo(void)
+BOOL torture_userinfo(struct torture_context *torture)
 {
 	NTSTATUS status;
 	const char *binding;
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 2df495a15f..99cd435584 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -298,7 +298,7 @@ static BOOL test_usermod(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 
-BOOL torture_useradd(void)
+BOOL torture_useradd(struct torture_context *torture)
 {
 	NTSTATUS status;
 	const char *binding;
@@ -357,7 +357,7 @@ done:
 }
 
 
-BOOL torture_userdel(void)
+BOOL torture_userdel(struct torture_context *torture)
 {
 	NTSTATUS status;
 	const char *binding;
@@ -401,7 +401,7 @@ done:
 }
 
 
-BOOL torture_usermod(void)
+BOOL torture_usermod(struct torture_context *torture)
 {
 	NTSTATUS status;
 	const char *binding;