From 909b111f587705a45f63540b39968f1af58a9b5d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 25 Mar 2006 16:01:28 +0000
Subject: r14720: Add torture_context argument to all torture tests (This used
 to be commit 3c7a5ce29108dd82210dc3e1f00414f545949e1d)

---
 source4/torture/basic/aliases.c     |  2 +-
 source4/torture/basic/attr.c        |  2 +-
 source4/torture/basic/base.c        | 22 +++++++++++-----------
 source4/torture/basic/charset.c     |  2 +-
 source4/torture/basic/delaywrite.c  |  2 +-
 source4/torture/basic/delete.c      |  2 +-
 source4/torture/basic/denytest.c    | 10 +++++-----
 source4/torture/basic/dir.c         |  4 ++--
 source4/torture/basic/disconnect.c  |  2 +-
 source4/torture/basic/locking.c     | 14 +++++++-------
 source4/torture/basic/mangle_test.c |  2 +-
 source4/torture/basic/properties.c  |  2 +-
 source4/torture/basic/rename.c      |  2 +-
 source4/torture/basic/scanner.c     |  6 +++---
 source4/torture/basic/secleak.c     |  2 +-
 source4/torture/basic/unlink.c      |  2 +-
 source4/torture/basic/utable.c      |  4 ++--
 17 files changed, 41 insertions(+), 41 deletions(-)

(limited to 'source4/torture/basic')

diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c
index 40a1c68b8b..00262e5e11 100644
--- a/source4/torture/basic/aliases.c
+++ b/source4/torture/basic/aliases.c
@@ -384,7 +384,7 @@ static void setpathinfo_aliases(struct smbcli_state *cli)
 
 
 /* look for aliased info levels in trans2 calls */
-BOOL torture_trans2_aliases(void)
+BOOL torture_trans2_aliases(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 
diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c
index b410d5b3e5..b66adfaa5b 100644
--- a/source4/torture/basic/attr.c
+++ b/source4/torture/basic/attr.c
@@ -87,7 +87,7 @@ static const struct trunc_open_results attr_results[] = {
 };
 
 
-BOOL torture_openattrtest(void)
+BOOL torture_openattrtest(struct torture_context *torture)
 {
 	struct smbcli_state *cli1;
 	const char *fname = "\\openattr.file";
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 83ca797669..050c092296 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -116,7 +116,7 @@ static BOOL tcon_devtest(struct smbcli_state *cli,
 test whether fnums and tids open on one VC are available on another (a major
 security hole)
 */
-static BOOL run_fdpasstest(void)
+static BOOL run_fdpasstest(struct torture_context *torture)
 {
 	struct smbcli_state *cli1, *cli2;
 	const char *fname = "\\fdpass.tst";
@@ -174,7 +174,7 @@ static BOOL run_fdpasstest(void)
 /**
   This checks how the getatr calls works
 */
-static BOOL run_attrtest(void)
+static BOOL run_attrtest(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	int fnum;
@@ -244,7 +244,7 @@ static BOOL run_attrtest(void)
 /**
   This checks a couple of trans2 calls
 */
-static BOOL run_trans2test(void)
+static BOOL run_trans2test(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	int fnum;
@@ -378,7 +378,7 @@ static BOOL run_trans2test(void)
 }
 
 /* send smb negprot commands, not reading the response */
-static BOOL run_negprot_nowait(void)
+static BOOL run_negprot_nowait(struct torture_context *torture)
 {
 	int i;
 	struct smbcli_state *cli, *cli2;
@@ -431,7 +431,7 @@ static BOOL run_negprot_nowait(void)
   this checks to see if a secondary tconx can use open files from an
   earlier tconx
  */
-static BOOL run_tcon_test(void)
+static BOOL run_tcon_test(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	const char *fname = "\\tcontest.tmp";
@@ -544,7 +544,7 @@ static BOOL run_tcon_test(void)
 /**
  checks for correct tconX support
  */
-static BOOL run_tcon_devtype_test(void)
+static BOOL run_tcon_devtype_test(struct torture_context *torture)
 {
 	struct smbcli_state *cli1 = NULL;
 	NTSTATUS status;
@@ -685,7 +685,7 @@ static BOOL rw_torture2(struct smbcli_state *c1, struct smbcli_state *c2)
 
 #define BOOLSTR(b) ((b) ? "Yes" : "No")
 
-static BOOL run_readwritetest(void)
+static BOOL run_readwritetest(struct torture_context *torture)
 {
 	struct smbcli_state *cli1, *cli2;
 	BOOL test1, test2 = True;
@@ -794,7 +794,7 @@ static BOOL run_deferopen(struct smbcli_state *cli, int dummy)
   Try with a wrong vuid and check error message.
  */
 
-static BOOL run_vuidtest(void)
+static BOOL run_vuidtest(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	const char *fname = "\\vuid.tst";
@@ -861,7 +861,7 @@ static BOOL run_vuidtest(void)
 /*
   Test open mode returns on read-only files.
  */
- static BOOL run_opentest(void)
+ static BOOL run_opentest(struct torture_context *torture)
 {
 	static struct smbcli_state *cli1;
 	static struct smbcli_state *cli2;
@@ -1397,7 +1397,7 @@ error_test80:
 /**
   Test ntcreate calls made by xcopy
  */
-static BOOL run_xcopy(void)
+static BOOL run_xcopy(struct torture_context *torture)
 {
 	struct smbcli_state *cli1;
 	const char *fname = "\\test.txt";
@@ -1441,7 +1441,7 @@ static BOOL run_xcopy(void)
 /**
   tries variants of chkpath
  */
-static BOOL torture_chkpath_test(void)
+static BOOL torture_chkpath_test(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	int fnum;
diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index 81a9c6bb63..016d6a8a5e 100644
--- a/source4/torture/basic/charset.c
+++ b/source4/torture/basic/charset.c
@@ -229,7 +229,7 @@ static BOOL test_widea(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	return True;
 }
 
-BOOL torture_charset(void)
+BOOL torture_charset(struct torture_context *torture)
 {
 	static struct smbcli_state *cli;
 	BOOL ret = True;
diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c
index 2f1c4b98c7..7708e1c76d 100644
--- a/source4/torture/basic/delaywrite.c
+++ b/source4/torture/basic/delaywrite.c
@@ -625,7 +625,7 @@ static BOOL test_finfo_after_write(struct smbcli_state *cli, TALLOC_CTX *mem_ctx
 /* 
    testing of delayed update of write_time
 */
-BOOL torture_delay_write(void)
+BOOL torture_delay_write(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	BOOL ret = True;
diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
index 97ae518ea8..6e1c34612f 100644
--- a/source4/torture/basic/delete.c
+++ b/source4/torture/basic/delete.c
@@ -1622,7 +1622,7 @@ static BOOL deltest21(struct smbcli_state **ppcli1, struct smbcli_state **ppcli2
 /*
   Test delete on close semantics.
  */
-BOOL torture_test_delete(void)
+BOOL torture_test_delete(struct torture_context *torture)
 {
 	struct smbcli_state *cli1 = NULL;
 	struct smbcli_state *cli2 = NULL;
diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c
index 2a01d12c5b..9b9be967b1 100644
--- a/source4/torture/basic/denytest.c
+++ b/source4/torture/basic/denytest.c
@@ -1410,7 +1410,7 @@ static void progress_bar(uint_t i, uint_t total)
 /*
   this produces a matrix of deny mode behaviour for 1 connection
  */
-BOOL torture_denytest1(void)
+BOOL torture_denytest1(struct torture_context *torture)
 {
 	static struct smbcli_state *cli1;
 	int fnum1, fnum2;
@@ -1509,7 +1509,7 @@ failed:
 /*
   this produces a matrix of deny mode behaviour with 2 connections
  */
-BOOL torture_denytest2(void)
+BOOL torture_denytest2(struct torture_context *torture)
 {
 	static struct smbcli_state *cli1, *cli2;
 	int fnum1, fnum2;
@@ -1610,7 +1610,7 @@ failed:
 /*
    simple test harness for playing with deny modes
  */
-BOOL torture_denytest3(void)
+BOOL torture_denytest3(struct torture_context *torture)
 {
 	struct smbcli_state *cli1, *cli2;
 	int fnum1, fnum2;
@@ -1938,7 +1938,7 @@ BOOL torture_ntdenytest1(struct smbcli_state *cli, int client)
 /*
   a denytest for ntcreatex
  */
-BOOL torture_ntdenytest2(void)
+BOOL torture_ntdenytest2(struct torture_context *torture)
 {
 	struct smbcli_state *cli1, *cli2;
 	BOOL ret;
@@ -1980,7 +1980,7 @@ BOOL torture_ntdenytest2(void)
 /*
   test sharing of handles with DENY_DOS on a single connection
 */
-BOOL torture_denydos_sharing(void)
+BOOL torture_denydos_sharing(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	union smb_open io;
diff --git a/source4/torture/basic/dir.c b/source4/torture/basic/dir.c
index ca85ac4715..7e6f200ea4 100644
--- a/source4/torture/basic/dir.c
+++ b/source4/torture/basic/dir.c
@@ -34,7 +34,7 @@ static void list_fn(struct clilist_file_info *finfo, const char *name, void *sta
 /*
   test directory listing speed
  */
-BOOL torture_dirtest1(void)
+BOOL torture_dirtest1(struct torture_context *torture)
 {
 	int i;
 	struct smbcli_state *cli;
@@ -89,7 +89,7 @@ BOOL torture_dirtest1(void)
 	return correct;
 }
 
-BOOL torture_dirtest2(void)
+BOOL torture_dirtest2(struct torture_context *torture)
 {
 	int i;
 	struct smbcli_state *cli;
diff --git a/source4/torture/basic/disconnect.c b/source4/torture/basic/disconnect.c
index d21807aa83..7284f3c959 100644
--- a/source4/torture/basic/disconnect.c
+++ b/source4/torture/basic/disconnect.c
@@ -127,7 +127,7 @@ static BOOL test_disconnect_lock(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 /* 
    basic testing of disconnects
 */
-BOOL torture_disconnect(void)
+BOOL torture_disconnect(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	BOOL ret = True;
diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c
index 65f2dbac31..1ee7572967 100644
--- a/source4/torture/basic/locking.c
+++ b/source4/torture/basic/locking.c
@@ -38,7 +38,7 @@
      must not use posix semantics)
   2) support for lock timeouts
  */
-BOOL torture_locktest1(void)
+BOOL torture_locktest1(struct torture_context *torture)
 {
 	struct smbcli_state *cli1, *cli2;
 	const char *fname = BASEDIR "\\lockt1.lck";
@@ -195,7 +195,7 @@ BOOL torture_locktest1(void)
 
   3) the server denies unlock requests by an incorrect client PID
 */
-BOOL torture_locktest2(void)
+BOOL torture_locktest2(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	const char *fname = BASEDIR "\\lockt2.lck";
@@ -336,7 +336,7 @@ BOOL torture_locktest2(void)
 
   1) the server supports the full offset range in lock requests
 */
-BOOL torture_locktest3(void)
+BOOL torture_locktest3(struct torture_context *torture)
 {
 	struct smbcli_state *cli1, *cli2;
 	const char *fname = BASEDIR "\\lockt3.lck";
@@ -470,7 +470,7 @@ BOOL torture_locktest3(void)
 /*
   looks at overlapping locks
 */
-BOOL torture_locktest4(void)
+BOOL torture_locktest4(struct torture_context *torture)
 {
 	struct smbcli_state *cli1, *cli2;
 	const char *fname = BASEDIR "\\lockt4.lck";
@@ -640,7 +640,7 @@ BOOL torture_locktest4(void)
 /*
   looks at lock upgrade/downgrade.
 */
-BOOL torture_locktest5(void)
+BOOL torture_locktest5(struct torture_context *torture)
 {
 	struct smbcli_state *cli1, *cli2;
 	const char *fname = BASEDIR "\\lockt5.lck";
@@ -763,7 +763,7 @@ ret = NT_STATUS_IS_OK(smbcli_unlock(cli1->tree, fnum1, 0, 4)) &&
 /*
   tries the unusual lockingX locktype bits
 */
-BOOL torture_locktest6(void)
+BOOL torture_locktest6(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	const char *fname[1] = { "\\lock6.txt" };
@@ -805,7 +805,7 @@ BOOL torture_locktest6(void)
 	return True;
 }
 
-BOOL torture_locktest7(void)
+BOOL torture_locktest7(struct torture_context *torture)
 {
 	struct smbcli_state *cli1;
 	const char *fname = BASEDIR "\\lockt7.lck";
diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c
index 18b2e912ba..5eb00c076f 100644
--- a/source4/torture/basic/mangle_test.c
+++ b/source4/torture/basic/mangle_test.c
@@ -154,7 +154,7 @@ static void gen_name(char *name)
 }
 
 
-BOOL torture_mangle(void)
+BOOL torture_mangle(struct torture_context *torture)
 {
 	extern int torture_numops;
 	static struct smbcli_state *cli;
diff --git a/source4/torture/basic/properties.c b/source4/torture/basic/properties.c
index 1f0027cf0d..3eb05149ab 100644
--- a/source4/torture/basic/properties.c
+++ b/source4/torture/basic/properties.c
@@ -89,7 +89,7 @@ static void show_bits(const struct bitmapping *bm, uint32_t value)
 /*
   print out server properties
  */
-BOOL torture_test_properties(void)
+BOOL torture_test_properties(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	BOOL correct = True;
diff --git a/source4/torture/basic/rename.c b/source4/torture/basic/rename.c
index 3f4e218123..477b367745 100644
--- a/source4/torture/basic/rename.c
+++ b/source4/torture/basic/rename.c
@@ -28,7 +28,7 @@
 /*
   Test rename on files open with share delete and no share delete.
  */
-BOOL torture_test_rename(void)
+BOOL torture_test_rename(struct torture_context *torture)
 {
 	struct smbcli_state *cli1;
 	const char *fname = "\\test.txt";
diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index 8017afadb1..d936173590 100644
--- a/source4/torture/basic/scanner.c
+++ b/source4/torture/basic/scanner.c
@@ -242,7 +242,7 @@ static BOOL scan_trans2(struct smbcli_state *cli, int op, int level,
 }
 
 
-BOOL torture_trans2_scan(void)
+BOOL torture_trans2_scan(struct torture_context *torture)
 {
 	static struct smbcli_state *cli;
 	int op, level;
@@ -483,7 +483,7 @@ static BOOL scan_nttrans(struct smbcli_state *cli, int op, int level,
 }
 
 
-BOOL torture_nttrans_scan(void)
+BOOL torture_nttrans_scan(struct torture_context *torture)
 {
 	static struct smbcli_state *cli;
 	int op, level;
@@ -523,7 +523,7 @@ BOOL torture_nttrans_scan(void)
 
 
 /* scan for valid base SMB requests */
-BOOL torture_smb_scan(void)
+BOOL torture_smb_scan(struct torture_context *torture)
 {
 	static struct smbcli_state *cli;
 	int op;
diff --git a/source4/torture/basic/secleak.c b/source4/torture/basic/secleak.c
index 5b3685e1e4..3e5699ab29 100644
--- a/source4/torture/basic/secleak.c
+++ b/source4/torture/basic/secleak.c
@@ -56,7 +56,7 @@ static BOOL try_failed_login(struct smbcli_state *cli)
 	return True;
 }
 
-BOOL torture_sec_leak(void)
+BOOL torture_sec_leak(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	time_t t1 = time(NULL);
diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c
index ab7d5c5ac8..f5bfe66326 100644
--- a/source4/torture/basic/unlink.c
+++ b/source4/torture/basic/unlink.c
@@ -34,7 +34,7 @@
 
   1) the server does not allow an unlink on a file that is open
 */
-BOOL torture_unlinktest(void)
+BOOL torture_unlinktest(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	const char *fname = BASEDIR "\\unlink.tst";
diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c
index dfff6f168d..9e8ee6ced8 100644
--- a/source4/torture/basic/utable.c
+++ b/source4/torture/basic/utable.c
@@ -26,7 +26,7 @@
 #include "torture/util.h"
 #include "pstring.h"
 
-BOOL torture_utable(void)
+BOOL torture_utable(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	fstring fname;
@@ -121,7 +121,7 @@ static char *form_name(int c)
 	return fname;
 }
 
-BOOL torture_casetable(void)
+BOOL torture_casetable(struct torture_context *torture)
 {
 	static struct smbcli_state *cli;
 	char *fname;
-- 
cgit