r16333: Move more code out of the core smbtorture. It now no longer

contains protocol-specific code.
(This used to be commit 819d3b457648ffb7526a770e842badc17b6061fb)

14 files changed, 843 insertions, 707 deletions

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 0eb9385749..b10ccd4d65 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -6,17 +6,8 @@ VERSION = 0.0.1
 PUBLIC_HEADERS = torture.h
 PUBLIC_PROTO_HEADER = proto.h
 OBJ_FILES = \
-		torture.o
+		torture.o 
 PUBLIC_DEPENDENCIES = \
-		TORTURE_UTIL \
-		TORTURE_RAW \
-		TORTURE_SMB2 \
-		TORTURE_RAP \
-		TORTURE_AUTH \
-		TORTURE_LOCAL \
-		TORTURE_NBENCH \
-		TORTURE_LDAP \
-		TORTURE_NBT \
 		LIBSAMBA-CONFIG \
 		LIBSAMBA-UTIL
 
@@ -56,13 +47,16 @@ OBJ_FILES = \
 		basic/attr.o \
 		basic/properties.o 
 PUBLIC_DEPENDENCIES = \
-		LIBCLI_SMB POPT_CREDENTIALS
+		LIBCLI_SMB POPT_CREDENTIALS \
+		TORTURE_UTIL
 # End SUBSYSTEM TORTURE_BASIC
 #################################
 
 #################################
 # Start SUBSYSTEM TORTURE_RAW
-[SUBSYSTEM::TORTURE_RAW]
+[MODULE::TORTURE_RAW]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_raw_init
 PRIVATE_PROTO_HEADER = \
 		raw/proto.h
 OBJ_FILES = \
@@ -89,7 +83,8 @@ OBJ_FILES = \
 		raw/acls.o \
 		raw/seek.o \
 		raw/samba3hide.o \
-		raw/composite.o
+		raw/composite.o \
+		raw/raw.o
 PUBLIC_DEPENDENCIES = \
 		LIBCLI_SMB LIBCLI_LSA LIBCLI_SMB_COMPOSITE \
 		POPT_CREDENTIALS
@@ -98,6 +93,11 @@ PUBLIC_DEPENDENCIES = \
 
 include smb2/config.mk
 
+[MODULE::torture_misc]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_misc_init
+OBJ_FILES = misc.o
+
 [MODULE::torture_rpc]
 # TORTURE_NET and TORTURE_NBT use functions from torture_rpc...
 OUTPUT_TYPE = INTEGRATED
@@ -157,7 +157,9 @@ PUBLIC_DEPENDENCIES = \
 
 #################################
 # Start SUBSYSTEM TORTURE_RAP
-[SUBSYSTEM::TORTURE_RAP]
+[MODULE::TORTURE_RAP]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_rap_init
 PRIVATE_PROTO_HEADER = \
 		rap/proto.h
 OBJ_FILES = \
@@ -169,7 +171,8 @@ PUBLIC_DEPENDENCIES = \
 
 #################################
 # Start SUBSYSTEM TORTURE_AUTH
-[SUBSYSTEM::TORTURE_AUTH]
+[MODULE::TORTURE_AUTH]
+SUBSYSTEM = torture
 PRIVATE_PROTO_HEADER = \
 		auth/proto.h
 OBJ_FILES = \
@@ -196,7 +199,9 @@ OBJ_FILES = \
 
 #################################
 # Start SUBSYSTEM TORTURE_LDAP
-[SUBSYSTEM::TORTURE_LDAP]
+[MODULE::TORTURE_LDAP]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_ldap_init
 PRIVATE_PROTO_HEADER = \
 		ldap/proto.h
 OBJ_FILES = \
@@ -212,7 +217,9 @@ PUBLIC_DEPENDENCIES = \
 
 #################################
 # Start SUBSYSTEM TORTURE_NBT
-[SUBSYSTEM::TORTURE_NBT]
+[MODULE::TORTURE_NBT]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_nbt_init
 PRIVATE_PROTO_HEADER = \
 		nbt/proto.h
 OBJ_FILES = \
@@ -222,7 +229,8 @@ OBJ_FILES = \
 		nbt/winsbench.o \
 		nbt/winsreplication.o \
 		nbt/dgram.o \
-		nbt/browse.o
+		nbt/browse.o \
+		nbt/nbt.o
 PUBLIC_DEPENDENCIES = \
 		LIBCLI_SMB LIBCLI_NBT LIBCLI_DGRAM LIBCLI_WREPL
 # End SUBSYSTEM TORTURE_NBT
diff --git a/source4/torture/ldap/common.c b/source4/torture/ldap/common.c
index 58944b2768..c08534715a 100644
--- a/source4/torture/ldap/common.c
+++ b/source4/torture/ldap/common.c
@@ -23,6 +23,8 @@
 
 #include "includes.h"
 #include "libcli/ldap/ldap.h"
+#include "torture/torture.h"
+#include "torture/ldap/proto.h"
 
 NTSTATUS torture_ldap_bind(struct ldap_connection *conn, const char *userdn, const char *password)
 {
@@ -96,3 +98,13 @@ NTSTATUS torture_ldap_close(struct ldap_connection *conn)
 	talloc_free(conn);
 	return NT_STATUS_OK;
 }
+
+NTSTATUS torture_ldap_init(void)
+{
+	register_torture_op("BENCH-CLDAP",   torture_bench_cldap);
+	register_torture_op("LDAP-BASIC", torture_ldap_basic);
+	register_torture_op("LDAP-SCHEMA", torture_ldap_schema);
+	register_torture_op("LDAP-CLDAP", torture_cldap);
+
+	return NT_STATUS_OK;
+}
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 7bcd8070ca..001ff559d5 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -1,6 +1,8 @@
 #################################
 # Start SUBSYSTEM TORTURE_LOCAL
-[SUBSYSTEM::TORTURE_LOCAL]
+[MODULE::TORTURE_LOCAL]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_local_init
 PRIVATE_PROTO_HEADER = \
 		proto.h
 OBJ_FILES = \
@@ -17,7 +19,8 @@ OBJ_FILES = \
 		util_file.o \
 		sddl.o \
 		ndr.o \
-		event.o
+		event.o \
+		local.o
 PUBLIC_DEPENDENCIES = \
 		RPC_NDR_ECHO \
 		LIBCLI_SMB \
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
new file mode 100644
index 0000000000..8f95cec4d5
--- /dev/null
+++ b/source4/torture/local/local.c
@@ -0,0 +1,57 @@
+/* 
+   Unix SMB/CIFS implementation.
+   SMB torture tester
+   Copyright (C) Jelmer Vernooij 2006
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "torture/torture.h"
+#include "torture/local/proto.h"
+#include "torture/auth/proto.h"
+
+/* ignore me */ static struct torture_suite *
+	(*suite_generators[]) (TALLOC_CTX *mem_ctx) =
+{ 
+	torture_local_binding_string, 
+	torture_ntlmssp, 
+	torture_local_messaging, 
+	torture_local_irpc, 
+	torture_local_util_strlist, 
+	torture_local_util_file, 
+	torture_local_idtree, 
+	torture_local_iconv,
+	torture_local_socket, 
+	torture_pac, 
+	torture_registry, 
+	torture_local_resolve,
+	torture_local_sddl,
+	torture_local_ndr, 
+	torture_local_event, 
+	NULL
+};
+
+NTSTATUS torture_local_init(void)
+{
+	int i;
+	TALLOC_CTX *mem_ctx = talloc_autofree_context();
+
+	register_torture_op("LOCAL-TALLOC", torture_local_talloc);
+	for (i = 0; suite_generators[i]; i++)
+		torture_register_suite(suite_generators[i](mem_ctx));
+
+	return NT_STATUS_OK;
+}
diff --git a/source4/torture/local/util_file.c b/source4/torture/local/util_file.c
index c950e68c6e..3c11d3d94e 100644
--- a/source4/torture/local/util_file.c
+++ b/source4/torture/local/util_file.c
@@ -84,7 +84,7 @@ static BOOL test_afdgets(struct torture_context *test, const void *data)
 
 struct torture_suite *torture_local_util_file(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "util_file");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "LOCAL-FILE");
 
 	torture_suite_add_simple_tcase(suite, "file_load_save", 
 								   test_file_load_save, NULL);
diff --git a/source4/torture/misc.c b/source4/torture/misc.c
new file mode 100644
index 0000000000..71dd1587cb
--- /dev/null
+++ b/source4/torture/misc.c
@@ -0,0 +1,401 @@
+/* 
+   Unix SMB/CIFS implementation.
+   SMB torture tester
+   Copyright (C) Andrew Tridgell 1997-2003
+   Copyright (C) Jelmer Vernooij 2006
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "libcli/raw/libcliraw.h"
+#include "system/time.h"
+#include "system/wait.h"
+#include "system/filesys.h"
+#include "libcli/raw/ioctl.h"
+#include "libcli/libcli.h"
+#include "lib/events/events.h"
+#include "libcli/resolve/resolve.h"
+#include "auth/credentials/credentials.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
+#include "torture/torture.h"
+#include "torture/util.h"
+
+static BOOL wait_lock(struct smbcli_state *c, int fnum, uint32_t offset, uint32_t len)
+{
+	while (NT_STATUS_IS_ERR(smbcli_lock(c->tree, fnum, offset, len, -1, WRITE_LOCK))) {
+		if (!check_error(__location__, c, ERRDOS, ERRlock, NT_STATUS_LOCK_NOT_GRANTED)) return False;
+	}
+	return True;
+}
+
+
+static BOOL rw_torture(struct smbcli_state *c)
+{
+	const char *lockfname = "\\torture.lck";
+	char *fname;
+	int fnum;
+	int fnum2;
+	pid_t pid2, pid = getpid();
+	int i, j;
+	uint8_t buf[1024];
+	BOOL correct = True;
+
+	fnum2 = smbcli_open(c->tree, lockfname, O_RDWR | O_CREAT | O_EXCL, 
+			 DENY_NONE);
+	if (fnum2 == -1)
+		fnum2 = smbcli_open(c->tree, lockfname, O_RDWR, DENY_NONE);
+	if (fnum2 == -1) {
+		printf("open of %s failed (%s)\n", lockfname, smbcli_errstr(c->tree));
+		return False;
+	}
+
+
+	for (i=0;i<torture_numops;i++) {
+		uint_t n = (uint_t)random()%10;
+		if (i % 10 == 0) {
+			printf("%d\r", i); fflush(stdout);
+		}
+		asprintf(&fname, "\\torture.%u", n);
+
+		if (!wait_lock(c, fnum2, n*sizeof(int), sizeof(int))) {
+			return False;
+		}
+
+		fnum = smbcli_open(c->tree, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_ALL);
+		if (fnum == -1) {
+			printf("open failed (%s)\n", smbcli_errstr(c->tree));
+			correct = False;
+			break;
+		}
+
+		if (smbcli_write(c->tree, fnum, 0, &pid, 0, sizeof(pid)) != sizeof(pid)) {
+			printf("write failed (%s)\n", smbcli_errstr(c->tree));
+			correct = False;
+		}
+
+		for (j=0;j<50;j++) {
+			if (smbcli_write(c->tree, fnum, 0, buf, 
+				      sizeof(pid)+(j*sizeof(buf)), 
+				      sizeof(buf)) != sizeof(buf)) {
+				printf("write failed (%s)\n", smbcli_errstr(c->tree));
+				correct = False;
+			}
+		}
+
+		pid2 = 0;
+
+		if (smbcli_read(c->tree, fnum, &pid2, 0, sizeof(pid)) != sizeof(pid)) {
+			printf("read failed (%s)\n", smbcli_errstr(c->tree));
+			correct = False;
+		}
+
+		if (pid2 != pid) {
+			printf("data corruption!\n");
+			correct = False;
+		}
+
+		if (NT_STATUS_IS_ERR(smbcli_close(c->tree, fnum))) {
+			printf("close failed (%s)\n", smbcli_errstr(c->tree));
+			correct = False;
+		}
+
+		if (NT_STATUS_IS_ERR(smbcli_unlink(c->tree, fname))) {
+			printf("unlink failed (%s)\n", smbcli_errstr(c->tree));
+			correct = False;
+		}
+
+		if (NT_STATUS_IS_ERR(smbcli_unlock(c->tree, fnum2, n*sizeof(int), sizeof(int)))) {
+			printf("unlock failed (%s)\n", smbcli_errstr(c->tree));
+			correct = False;
+		}
+		free(fname);
+	}
+
+	smbcli_close(c->tree, fnum2);
+	smbcli_unlink(c->tree, lockfname);
+
+	printf("%d\n", i);
+
+	return correct;
+}
+
+static BOOL run_torture(struct smbcli_state *cli, int dummy)
+{
+    BOOL ret;
+
+	ret = rw_torture(cli);
+	
+	if (!torture_close_connection(cli)) {
+		ret = False;
+	}
+
+	return ret;
+}
+
+
+/*
+  see how many RPC pipes we can open at once
+*/
+static BOOL run_pipe_number(struct torture_context *torture)
+{
+	struct smbcli_state *cli1;
+	const char *pipe_name = "\\WKSSVC";
+	int fnum;
+	int num_pipes = 0;
+
+	printf("starting pipenumber test\n");
+	if (!torture_open_connection(&cli1)) {
+		return False;
+	}
+
+	while(1) {
+		fnum = smbcli_nt_create_full(cli1->tree, pipe_name, 0, SEC_FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
+				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, NTCREATEX_DISP_OPEN_IF, 0, 0);
+
+		if (fnum == -1) {
+			printf("Open of pipe %s failed with error (%s)\n", pipe_name, smbcli_errstr(cli1->tree));
+			break;
+		}
+		num_pipes++;
+		printf("%d\r", num_pipes);
+		fflush(stdout);
+	}
+
+	printf("pipe_number test - we can open %d %s pipes.\n", num_pipes, pipe_name );
+	torture_close_connection(cli1);
+	return True;
+}
+
+
+
+
+/*
+  open N connections to the server and just hold them open
+  used for testing performance when there are N idle users
+  already connected
+ */
+ static BOOL torture_holdcon(struct torture_context *torture)
+{
+	int i;
+	struct smbcli_state **cli;
+	int num_dead = 0;
+
+	printf("Opening %d connections\n", torture_numops);
+	
+	cli = malloc_array_p(struct smbcli_state *, torture_numops);
+
+	for (i=0;i<torture_numops;i++) {
+		if (!torture_open_connection(&cli[i])) {
+			return False;
+		}
+		printf("opened %d connections\r", i);
+		fflush(stdout);
+	}
+
+	printf("\nStarting pings\n");
+
+	while (1) {
+		for (i=0;i<torture_numops;i++) {
+			NTSTATUS status;
+			if (cli[i]) {
+				status = smbcli_chkpath(cli[i]->tree, "\\");
+				if (!NT_STATUS_IS_OK(status)) {
+					printf("Connection %d is dead\n", i);
+					cli[i] = NULL;
+					num_dead++;
+				}
+				usleep(100);
+			}
+		}
+
+		if (num_dead == torture_numops) {
+			printf("All connections dead - finishing\n");
+			break;
+		}
+
+		printf(".");
+		fflush(stdout);
+	}
+
+	return True;
+}
+
+/*
+test how many open files this server supports on the one socket
+*/
+static BOOL run_maxfidtest(struct smbcli_state *cli, int dummy)
+{
+#define MAXFID_TEMPLATE "\\maxfid\\fid%d\\maxfid.%d.%d"
+	char *fname;
+	int fnums[0x11000], i;
+	int retries=4, maxfid;
+	BOOL correct = True;
+
+	if (retries <= 0) {
+		printf("failed to connect\n");
+		return False;
+	}
+
+	if (smbcli_deltree(cli->tree, "\\maxfid") == -1) {
+		printf("Failed to deltree \\maxfid - %s\n",
+		       smbcli_errstr(cli->tree));
+		return False;
+	}
+	if (NT_STATUS_IS_ERR(smbcli_mkdir(cli->tree, "\\maxfid"))) {
+		printf("Failed to mkdir \\maxfid, error=%s\n", 
+		       smbcli_errstr(cli->tree));
+		return False;
+	}
+
+	printf("Testing maximum number of open files\n");
+
+	for (i=0; i<0x11000; i++) {
+		if (i % 1000 == 0) {
+			asprintf(&fname, "\\maxfid\\fid%d", i/1000);
+			if (NT_STATUS_IS_ERR(smbcli_mkdir(cli->tree, fname))) {
+				printf("Failed to mkdir %s, error=%s\n", 
+				       fname, smbcli_errstr(cli->tree));
+				return False;
+			}
+			free(fname);
+		}
+		asprintf(&fname, MAXFID_TEMPLATE, i/1000, i,(int)getpid());
+		if ((fnums[i] = smbcli_open(cli->tree, fname, 
+					O_RDWR|O_CREAT|O_TRUNC, DENY_NONE)) ==
+		    -1) {
+			printf("open of %s failed (%s)\n", 
+			       fname, smbcli_errstr(cli->tree));
+			printf("maximum fnum is %d\n", i);
+			break;
+		}
+		free(fname);
+		printf("%6d\r", i);
+	}
+	printf("%6d\n", i);
+	i--;
+
+	maxfid = i;
+
+	printf("cleaning up\n");
+	for (i=0;i<maxfid/2;i++) {
+		asprintf(&fname, MAXFID_TEMPLATE, i/1000, i,(int)getpid());
+		if (NT_STATUS_IS_ERR(smbcli_close(cli->tree, fnums[i]))) {
+			printf("Close of fnum %d failed - %s\n", fnums[i], smbcli_errstr(cli->tree));
+		}
+		if (NT_STATUS_IS_ERR(smbcli_unlink(cli->tree, fname))) {
+			printf("unlink of %s failed (%s)\n", 
+			       fname, smbcli_errstr(cli->tree));
+			correct = False;
+		}
+		free(fname);
+
+		asprintf(&fname, MAXFID_TEMPLATE, (maxfid-i)/1000, maxfid-i,(int)getpid());
+		if (NT_STATUS_IS_ERR(smbcli_close(cli->tree, fnums[maxfid-i]))) {
+			printf("Close of fnum %d failed - %s\n", fnums[maxfid-i], smbcli_errstr(cli->tree));
+		}
+		if (NT_STATUS_IS_ERR(smbcli_unlink(cli->tree, fname))) {
+			printf("unlink of %s failed (%s)\n", 
+			       fname, smbcli_errstr(cli->tree));
+			correct = False;
+		}
+		free(fname);
+
+		printf("%6d %6d\r", i, maxfid-i);
+	}
+	printf("%6d\n", 0);
+
+	if (smbcli_deltree(cli->tree, "\\maxfid") == -1) {
+		printf("Failed to deltree \\maxfid - %s\n",
+		       smbcli_errstr(cli->tree));
+		return False;
+	}
+
+	printf("maxfid test finished\n");
+	if (!torture_close_connection(cli)) {
+		correct = False;
+	}
+	return correct;
+#undef MAXFID_TEMPLATE
+}
+
+
+
+/*
+  sees what IOCTLs are supported
+ */
+static BOOL torture_ioctl_test(struct torture_context *torture)
+{
+	struct smbcli_state *cli;
+	uint16_t device, function;
+	int fnum;
+	const char *fname = "\\ioctl.dat";
+	NTSTATUS status;
+	union smb_ioctl parms;
+	TALLOC_CTX *mem_ctx;
+
+	if (!torture_open_connection(&cli)) {
+		return False;
+	}
+
+	mem_ctx = talloc_init("ioctl_test");
+
+	printf("starting ioctl test\n");
+
+	smbcli_unlink(cli->tree, fname);
+
+	fnum = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+	if (fnum == -1) {
+		printf("open of %s failed (%s)\n", fname, smbcli_errstr(cli->tree));
+		return False;
+	}
+
+	parms.ioctl.level = RAW_IOCTL_IOCTL;
+	parms.ioctl.in.file.fnum = fnum;
+	parms.ioctl.in.request = IOCTL_QUERY_JOB_INFO;
+	status = smb_raw_ioctl(cli->tree, mem_ctx, &parms);
+	printf("ioctl job info: %s\n", smbcli_errstr(cli->tree));
+
+	for (device=0;device<0x100;device++) {
+		printf("testing device=0x%x\n", device);
+		for (function=0;function<0x100;function++) {
+			parms.ioctl.in.request = (device << 16) | function;
+			status = smb_raw_ioctl(cli->tree, mem_ctx, &parms);
+
+			if (NT_STATUS_IS_OK(status)) {
+				printf("ioctl device=0x%x function=0x%x OK : %d bytes\n", 
+					device, function, (int)parms.ioctl.out.blob.length);
+			}
+		}
+	}
+
+	if (!torture_close_connection(cli)) {
+		return False;
+	}
+
+	return True;
+}
+
+
+NTSTATUS torture_misc_init(void)
+{
+	register_torture_op("BENCH-HOLDCON", torture_holdcon);
+	register_torture_op("SCAN-PIPE_NUMBER", run_pipe_number);
+	register_torture_op("SCAN-IOCTL", torture_ioctl_test);
+	register_torture_multi_op("BENCH-TORTURE", run_torture);
+	register_torture_multi_op("SCAN-MAXFID", run_maxfidtest);
+
+	return NT_STATUS_OK;
+}
diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c
index 81c6a67b9f..3921bf66e8 100644
--- a/source4/torture/nbench/nbench.c
+++ b/source4/torture/nbench/nbench.c
@@ -221,3 +221,9 @@ BOOL torture_nbench(struct torture_context *torture)
 	printf("\nThroughput %g MB/sec\n", nbio_result());
 	return correct;
 }
+
+NTSTATUS torture_nbench_init(void)
+{
+	register_torture_op("BENCH-NBENCH",  torture_nbench);
+	return NT_STATUS_OK;
+}
diff --git a/source4/torture/nbt/nbt.c b/source4/torture/nbt/nbt.c
new file mode 100644
index 0000000000..6cf663f350
--- /dev/null
+++ b/source4/torture/nbt/nbt.c
@@ -0,0 +1,39 @@
+/* 
+   Unix SMB/CIFS implementation.
+   SMB torture tester
+   Copyright (C) Jelmer Vernooij 2006
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "torture/torture.h"
+#include "torture/nbt/proto.h"
+
+NTSTATUS torture_nbt_init(void)
+{
+	/* nbt tests */
+	register_torture_op("NBT-REGISTER", torture_nbt_register);
+	register_torture_op("NBT-WINS", torture_nbt_wins);
+	register_torture_op("NBT-DGRAM", torture_nbt_dgram);
+	register_torture_op("NBT-BROWSE", torture_nbt_browse);
+	register_torture_op("NBT-WINSREPLICATION-SIMPLE", torture_nbt_winsreplication_simple);
+	register_torture_op("NBT-WINSREPLICATION-REPLICA", torture_nbt_winsreplication_replica);
+	register_torture_op("NBT-WINSREPLICATION-OWNED", torture_nbt_winsreplication_owned);
+	register_torture_op("BENCH-WINS", torture_bench_wins);
+	register_torture_op("BENCH-NBT",     torture_bench_nbt);
+	
+	return NT_STATUS_OK;
+}
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index b68b5f690f..787d146076 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -478,3 +478,11 @@ BOOL torture_rap_scan(struct torture_context *torture)
 
 	return True;
 }
+
+NTSTATUS torture_rap_init(void)
+{
+	register_torture_op("RAP-BASIC", torture_rap_basic);
+	register_torture_op("SCAN-RAP",  torture_rap_scan);
+
+	return NT_STATUS_OK;
+}
diff --git a/source4/torture/raw/raw.c b/source4/torture/raw/raw.c
new file mode 100644
index 0000000000..0156925a73
--- /dev/null
+++ b/source4/torture/raw/raw.c
@@ -0,0 +1,59 @@
+/* 
+   Unix SMB/CIFS implementation.
+   SMB torture tester
+   Copyright (C) Jelmer Vernooij 2006
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "torture/torture.h"
+#include "libcli/raw/libcliraw.h"
+#include "torture/raw/proto.h"
+
+NTSTATUS torture_raw_init(void)
+{
+	/* RAW smb tests */
+
+	register_torture_op("BENCH-OPLOCK",   torture_bench_oplock);
+	register_torture_op("RAW-QFSINFO", torture_raw_qfsinfo);
+	register_torture_op("RAW-QFILEINFO", torture_raw_qfileinfo);
+	register_torture_op("RAW-SFILEINFO", torture_raw_sfileinfo);
+	register_torture_op("RAW-SFILEINFO-BUG", torture_raw_sfileinfo_bug);
+	register_torture_op("RAW-SEARCH", torture_raw_search);
+	register_torture_op("RAW-CLOSE", torture_raw_close);
+	register_torture_op("RAW-OPEN", torture_raw_open);
+	register_torture_op("RAW-MKDIR", torture_raw_mkdir);
+	register_torture_op("RAW-OPLOCK", torture_raw_oplock);
+	register_torture_op("RAW-NOTIFY", torture_raw_notify);
+	register_torture_op("RAW-MUX", torture_raw_mux);
+	register_torture_op("RAW-IOCTL", torture_raw_ioctl);
+	register_torture_op("RAW-CHKPATH", torture_raw_chkpath);
+	register_torture_op("RAW-UNLINK", torture_raw_unlink);
+	register_torture_op("RAW-READ", torture_raw_read);
+	register_torture_op("RAW-WRITE", torture_raw_write);
+	register_torture_op("RAW-LOCK", torture_raw_lock);
+	register_torture_op("RAW-CONTEXT", torture_raw_context);
+	register_torture_op("RAW-RENAME", torture_raw_rename);
+	register_torture_op("RAW-SEEK", torture_raw_seek);
+	register_torture_op("RAW-EAS", torture_raw_eas);
+	register_torture_op("RAW-STREAMS", torture_raw_streams);
+	register_torture_op("RAW-ACLS", torture_raw_acls);
+	register_torture_op("RAW-COMPOSITE", torture_raw_composite);
+	register_torture_op("RAW-SAMBA3HIDE", torture_samba3_hide);
+	register_torture_op("SCAN-EAMAX", torture_max_eas);
+
+	return NT_STATUS_OK;
+}
diff --git a/source4/torture/smb2/config.mk b/source4/torture/smb2/config.mk
index d53b9895d1..7dbb62015b 100644
--- a/source4/torture/smb2/config.mk
+++ b/source4/torture/smb2/config.mk
@@ -1,7 +1,9 @@
 
 #################################
 # Start SUBSYSTEM TORTURE_SMB2
-[SUBSYSTEM::TORTURE_SMB2]
+[MODULE::TORTURE_SMB2]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_smb2_init
 PRIVATE_PROTO_HEADER = \
 		proto.h
 OBJ_FILES = \
@@ -11,7 +13,8 @@ OBJ_FILES = \
 		getinfo.o \
 		setinfo.o \
 		find.o \
-		lock.o
+		lock.o \
+		smb2.o
 PUBLIC_DEPENDENCIES = \
 		LIBCLI_SMB2 POPT_CREDENTIALS
 # End SUBSYSTEM TORTURE_SMB2
diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
new file mode 100644
index 0000000000..bebf363db6
--- /dev/null
+++ b/source4/torture/smb2/smb2.c
@@ -0,0 +1,39 @@
+/* 
+   Unix SMB/CIFS implementation.
+   SMB torture tester
+   Copyright (C) Jelmer Vernooij 2006
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "torture/torture.h"
+#include "libcli/smb2/smb2.h"
+#include "torture/smb2/proto.h"
+
+NTSTATUS torture_smb2_init(void)
+{
+	register_torture_op("SMB2-CONNECT", torture_smb2_connect);
+	register_torture_op("SMB2-SCAN", torture_smb2_scan);
+	register_torture_op("SMB2-SCANGETINFO", torture_smb2_getinfo_scan);
+	register_torture_op("SMB2-SCANSETINFO", torture_smb2_setinfo_scan);
+	register_torture_op("SMB2-SCANFIND", torture_smb2_find_scan);
+	register_torture_op("SMB2-GETINFO", torture_smb2_getinfo);
+	register_torture_op("SMB2-SETINFO", torture_smb2_setinfo);
+	register_torture_op("SMB2-FIND", torture_smb2_find);
+	register_torture_op("SMB2-LOCK", torture_smb2_lock);
+
+	return NT_STATUS_OK;
+}
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index a33ac55c02..52349904a5 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -20,31 +20,8 @@
 */
 
 #include "includes.h"
-#include "libcli/raw/libcliraw.h"
 #include "system/time.h"
-#include "system/wait.h"
-#include "system/filesys.h"
-#include "libcli/raw/ioctl.h"
-#include "libcli/libcli.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/events/events.h"
-#include "libcli/resolve/resolve.h"
-#include "auth/credentials/credentials.h"
-#include "libcli/ldap/ldap_client.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 #include "torture/torture.h"
-
-#include "torture/raw/proto.h"
-#include "libcli/smb2/smb2.h"
-#include "torture/smb2/proto.h"
-#include "torture/rap/proto.h"
-#include "torture/auth/proto.h"
-#include "torture/local/proto.h"
-#include "torture/nbench/proto.h"
-#include "torture/ldap/proto.h"
-#include "torture/nbt/proto.h"
-#include "torture/libnet/proto.h"
-#include "torture/util.h"
 #include "build.h"
 #include "dlinklist.h"
 
@@ -55,643 +32,9 @@ _PUBLIC_ int torture_failures=1;
 _PUBLIC_ int torture_seed=0;
 _PUBLIC_ int torture_numasync=100;
 _PUBLIC_ BOOL use_oplocks;
-static int procnum; /* records process count number when forking */
-static struct smbcli_state *current_cli;
 _PUBLIC_ BOOL use_level_II_oplocks;
 _PUBLIC_ BOOL torture_showall = False;
 
-
-
-
-static BOOL wait_lock(struct smbcli_state *c, int fnum, uint32_t offset, uint32_t len)
-{
-	while (NT_STATUS_IS_ERR(smbcli_lock(c->tree, fnum, offset, len, -1, WRITE_LOCK))) {
-		if (!check_error(__location__, c, ERRDOS, ERRlock, NT_STATUS_LOCK_NOT_GRANTED)) return False;
-	}
-	return True;
-}
-
-
-static BOOL rw_torture(struct smbcli_state *c)
-{
-	const char *lockfname = "\\torture.lck";
-	char *fname;
-	int fnum;
-	int fnum2;
-	pid_t pid2, pid = getpid();
-	int i, j;
-	uint8_t buf[1024];
-	BOOL correct = True;
-
-	fnum2 = smbcli_open(c->tree, lockfname, O_RDWR | O_CREAT | O_EXCL, 
-			 DENY_NONE);
-	if (fnum2 == -1)
-		fnum2 = smbcli_open(c->tree, lockfname, O_RDWR, DENY_NONE);
-	if (fnum2 == -1) {
-		printf("open of %s failed (%s)\n", lockfname, smbcli_errstr(c->tree));
-		return False;
-	}
-
-
-	for (i=0;i<torture_numops;i++) {
-		uint_t n = (uint_t)random()%10;
-		if (i % 10 == 0) {
-			printf("%d\r", i); fflush(stdout);
-		}
-		asprintf(&fname, "\\torture.%u", n);
-
-		if (!wait_lock(c, fnum2, n*sizeof(int), sizeof(int))) {
-			return False;
-		}
-
-		fnum = smbcli_open(c->tree, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_ALL);
-		if (fnum == -1) {
-			printf("open failed (%s)\n", smbcli_errstr(c->tree));
-			correct = False;
-			break;
-		}
-
-		if (smbcli_write(c->tree, fnum, 0, &pid, 0, sizeof(pid)) != sizeof(pid)) {
-			printf("write failed (%s)\n", smbcli_errstr(c->tree));
-			correct = False;
-		}
-
-		for (j=0;j<50;j++) {
-			if (smbcli_write(c->tree, fnum, 0, buf, 
-				      sizeof(pid)+(j*sizeof(buf)), 
-				      sizeof(buf)) != sizeof(buf)) {
-				printf("write failed (%s)\n", smbcli_errstr(c->tree));
-				correct = False;
-			}
-		}
-
-		pid2 = 0;
-
-		if (smbcli_read(c->tree, fnum, &pid2, 0, sizeof(pid)) != sizeof(pid)) {
-			printf("read failed (%s)\n", smbcli_errstr(c->tree));
-			correct = False;
-		}
-
-		if (pid2 != pid) {
-			printf("data corruption!\n");
-			correct = False;
-		}
-
-		if (NT_STATUS_IS_ERR(smbcli_close(c->tree, fnum))) {
-			printf("close failed (%s)\n", smbcli_errstr(c->tree));
-			correct = False;
-		}
-
-		if (NT_STATUS_IS_ERR(smbcli_unlink(c->tree, fname))) {
-			printf("unlink failed (%s)\n", smbcli_errstr(c->tree));
-			correct = False;
-		}
-
-		if (NT_STATUS_IS_ERR(smbcli_unlock(c->tree, fnum2, n*sizeof(int), sizeof(int)))) {
-			printf("unlock failed (%s)\n", smbcli_errstr(c->tree));
-			correct = False;
-		}
-		free(fname);
-	}
-
-	smbcli_close(c->tree, fnum2);
-	smbcli_unlink(c->tree, lockfname);
-
-	printf("%d\n", i);
-
-	return correct;
-}
-
-static BOOL run_torture(struct smbcli_state *cli, int dummy)
-{
-    BOOL ret;
-
-	ret = rw_torture(cli);
-	
-	if (!torture_close_connection(cli)) {
-		ret = False;
-	}
-
-	return ret;
-}
-
-
-/*
-  see how many RPC pipes we can open at once
-*/
-static BOOL run_pipe_number(struct torture_context *torture)
-{
-	struct smbcli_state *cli1;
-	const char *pipe_name = "\\WKSSVC";
-	int fnum;
-	int num_pipes = 0;
-
-	printf("starting pipenumber test\n");
-	if (!torture_open_connection(&cli1)) {
-		return False;
-	}
-
-	while(1) {
-		fnum = smbcli_nt_create_full(cli1->tree, pipe_name, 0, SEC_FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
-				   NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, NTCREATEX_DISP_OPEN_IF, 0, 0);
-
-		if (fnum == -1) {
-			printf("Open of pipe %s failed with error (%s)\n", pipe_name, smbcli_errstr(cli1->tree));
-			break;
-		}
-		num_pipes++;
-		printf("%d\r", num_pipes);
-		fflush(stdout);
-	}
-
-	printf("pipe_number test - we can open %d %s pipes.\n", num_pipes, pipe_name );
-	torture_close_connection(cli1);
-	return True;
-}
-
-
-
-
-/*
-  open N connections to the server and just hold them open
-  used for testing performance when there are N idle users
-  already connected
- */
- static BOOL torture_holdcon(struct torture_context *torture)
-{
-	int i;
-	struct smbcli_state **cli;
-	int num_dead = 0;
-
-	printf("Opening %d connections\n", torture_numops);
-	
-	cli = malloc_array_p(struct smbcli_state *, torture_numops);
-
-	for (i=0;i<torture_numops;i++) {
-		if (!torture_open_connection(&cli[i])) {
-			return False;
-		}
-		printf("opened %d connections\r", i);
-		fflush(stdout);
-	}
-
-	printf("\nStarting pings\n");
-
-	while (1) {
-		for (i=0;i<torture_numops;i++) {
-			NTSTATUS status;
-			if (cli[i]) {
-				status = smbcli_chkpath(cli[i]->tree, "\\");
-				if (!NT_STATUS_IS_OK(status)) {
-					printf("Connection %d is dead\n", i);
-					cli[i] = NULL;
-					num_dead++;
-				}
-				usleep(100);
-			}
-		}
-
-		if (num_dead == torture_numops) {
-			printf("All connections dead - finishing\n");
-			break;
-		}
-
-		printf(".");
-		fflush(stdout);
-	}
-
-	return True;
-}
-
-/*
-test how many open files this server supports on the one socket
-*/
-static BOOL run_maxfidtest(struct smbcli_state *cli, int dummy)
-{
-#define MAXFID_TEMPLATE "\\maxfid\\fid%d\\maxfid.%d.%d"
-	char *fname;
-	int fnums[0x11000], i;
-	int retries=4, maxfid;
-	BOOL correct = True;
-
-	if (retries <= 0) {
-		printf("failed to connect\n");
-		return False;
-	}
-
-	if (smbcli_deltree(cli->tree, "\\maxfid") == -1) {
-		printf("Failed to deltree \\maxfid - %s\n",
-		       smbcli_errstr(cli->tree));
-		return False;
-	}
-	if (NT_STATUS_IS_ERR(smbcli_mkdir(cli->tree, "\\maxfid"))) {
-		printf("Failed to mkdir \\maxfid, error=%s\n", 
-		       smbcli_errstr(cli->tree));
-		return False;
-	}
-
-	printf("Testing maximum number of open files\n");
-
-	for (i=0; i<0x11000; i++) {
-		if (i % 1000 == 0) {
-			asprintf(&fname, "\\maxfid\\fid%d", i/1000);
-			if (NT_STATUS_IS_ERR(smbcli_mkdir(cli->tree, fname))) {
-				printf("Failed to mkdir %s, error=%s\n", 
-				       fname, smbcli_errstr(cli->tree));
-				return False;
-			}
-			free(fname);
-		}
-		asprintf(&fname, MAXFID_TEMPLATE, i/1000, i,(int)getpid());
-		if ((fnums[i] = smbcli_open(cli->tree, fname, 
-					O_RDWR|O_CREAT|O_TRUNC, DENY_NONE)) ==
-		    -1) {
-			printf("open of %s failed (%s)\n", 
-			       fname, smbcli_errstr(cli->tree));
-			printf("maximum fnum is %d\n", i);
-			break;
-		}
-		free(fname);
-		printf("%6d\r", i);
-	}
-	printf("%6d\n", i);
-	i--;
-
-	maxfid = i;
-
-	printf("cleaning up\n");
-	for (i=0;i<maxfid/2;i++) {
-		asprintf(&fname, MAXFID_TEMPLATE, i/1000, i,(int)getpid());
-		if (NT_STATUS_IS_ERR(smbcli_close(cli->tree, fnums[i]))) {
-			printf("Close of fnum %d failed - %s\n", fnums[i], smbcli_errstr(cli->tree));
-		}
-		if (NT_STATUS_IS_ERR(smbcli_unlink(cli->tree, fname))) {
-			printf("unlink of %s failed (%s)\n", 
-			       fname, smbcli_errstr(cli->tree));
-			correct = False;
-		}
-		free(fname);
-
-		asprintf(&fname, MAXFID_TEMPLATE, (maxfid-i)/1000, maxfid-i,(int)getpid());
-		if (NT_STATUS_IS_ERR(smbcli_close(cli->tree, fnums[maxfid-i]))) {
-			printf("Close of fnum %d failed - %s\n", fnums[maxfid-i], smbcli_errstr(cli->tree));
-		}
-		if (NT_STATUS_IS_ERR(smbcli_unlink(cli->tree, fname))) {
-			printf("unlink of %s failed (%s)\n", 
-			       fname, smbcli_errstr(cli->tree));
-			correct = False;
-		}
-		free(fname);
-
-		printf("%6d %6d\r", i, maxfid-i);
-	}
-	printf("%6d\n", 0);
-
-	if (smbcli_deltree(cli->tree, "\\maxfid") == -1) {
-		printf("Failed to deltree \\maxfid - %s\n",
-		       smbcli_errstr(cli->tree));
-		return False;
-	}
-
-	printf("maxfid test finished\n");
-	if (!torture_close_connection(cli)) {
-		correct = False;
-	}
-	return correct;
-#undef MAXFID_TEMPLATE
-}
-
-
-
-/*
-  sees what IOCTLs are supported
- */
-static BOOL torture_ioctl_test(struct torture_context *torture)
-{
-	struct smbcli_state *cli;
-	uint16_t device, function;
-	int fnum;
-	const char *fname = "\\ioctl.dat";
-	NTSTATUS status;
-	union smb_ioctl parms;
-	TALLOC_CTX *mem_ctx;
-
-	if (!torture_open_connection(&cli)) {
-		return False;
-	}
-
-	mem_ctx = talloc_init("ioctl_test");
-
-	printf("starting ioctl test\n");
-
-	smbcli_unlink(cli->tree, fname);
-
-	fnum = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
-	if (fnum == -1) {
-		printf("open of %s failed (%s)\n", fname, smbcli_errstr(cli->tree));
-		return False;
-	}
-
-	parms.ioctl.level = RAW_IOCTL_IOCTL;
-	parms.ioctl.in.file.fnum = fnum;
-	parms.ioctl.in.request = IOCTL_QUERY_JOB_INFO;
-	status = smb_raw_ioctl(cli->tree, mem_ctx, &parms);
-	printf("ioctl job info: %s\n", smbcli_errstr(cli->tree));
-
-	for (device=0;device<0x100;device++) {
-		printf("testing device=0x%x\n", device);
-		for (function=0;function<0x100;function++) {
-			parms.ioctl.in.request = (device << 16) | function;
-			status = smb_raw_ioctl(cli->tree, mem_ctx, &parms);
-
-			if (NT_STATUS_IS_OK(status)) {
-				printf("ioctl device=0x%x function=0x%x OK : %d bytes\n", 
-					device, function, (int)parms.ioctl.out.blob.length);
-			}
-		}
-	}
-
-	if (!torture_close_connection(cli)) {
-		return False;
-	}
-
-	return True;
-}
-
-
-static void sigcont(int sig)
-{
-}
-
-double torture_create_procs(BOOL (*fn)(struct smbcli_state *, int), BOOL *result)
-{
-	int i, status;
-	volatile pid_t *child_status;
-	volatile BOOL *child_status_out;
-	int synccount;
-	int tries = 8;
-	double start_time_limit = 10 + (torture_nprocs * 1.5);
-	char **unc_list = NULL;
-	const char *p;
-	int num_unc_names = 0;
-	struct timeval tv;
-
-	*result = True;
-
-	synccount = 0;
-
-	signal(SIGCONT, sigcont);
-
-	child_status = (volatile pid_t *)shm_setup(sizeof(pid_t)*torture_nprocs);
-	if (!child_status) {
-		printf("Failed to setup shared memory\n");
-		return -1;
-	}
-
-	child_status_out = (volatile BOOL *)shm_setup(sizeof(BOOL)*torture_nprocs);
-	if (!child_status_out) {
-		printf("Failed to setup result status shared memory\n");
-		return -1;
-	}
-
-	p = lp_parm_string(-1, "torture", "unclist");
-	if (p) {
-		unc_list = file_lines_load(p, &num_unc_names, NULL);
-		if (!unc_list || num_unc_names <= 0) {
-			printf("Failed to load unc names list from '%s'\n", p);
-			exit(1);
-		}
-	}
-
-	for (i = 0; i < torture_nprocs; i++) {
-		child_status[i] = 0;
-		child_status_out[i] = True;
-	}
-
-	tv = timeval_current();
-
-	for (i=0;i<torture_nprocs;i++) {
-		procnum = i;
-		if (fork() == 0) {
-			char *myname;
-			char *hostname=NULL, *sharename;
-
-			pid_t mypid = getpid();
-			srandom(((int)mypid) ^ ((int)time(NULL)));
-
-			asprintf(&myname, "CLIENT%d", i);
-			lp_set_cmdline("netbios name", myname);
-			free(myname);
-
-
-			if (unc_list) {
-				if (!smbcli_parse_unc(unc_list[i % num_unc_names],
-						      NULL, &hostname, &sharename)) {
-					printf("Failed to parse UNC name %s\n",
-					       unc_list[i % num_unc_names]);
-					exit(1);
-				}
-			}
-
-			while (1) {
-				if (hostname) {
-					if (torture_open_connection_share(NULL,
-									  &current_cli,
-									  hostname, 
-									  sharename,
-									  NULL)) {
-						break;
-					}
-				} else if (torture_open_connection(&current_cli)) {
-						break;
-				}
-				if (tries-- == 0) {
-					printf("pid %d failed to start\n", (int)getpid());
-					_exit(1);
-				}
-				msleep(100);	
-			}
-
-			child_status[i] = getpid();
-
-			pause();
-
-			if (child_status[i]) {
-				printf("Child %d failed to start!\n", i);
-				child_status_out[i] = 1;
-				_exit(1);
-			}
-
-			child_status_out[i] = fn(current_cli, i);
-			_exit(0);
-		}
-	}
-
-	do {
-		synccount = 0;
-		for (i=0;i<torture_nprocs;i++) {
-			if (child_status[i]) synccount++;
-		}
-		if (synccount == torture_nprocs) break;
-		msleep(100);
-	} while (timeval_elapsed(&tv) < start_time_limit);
-
-	if (synccount != torture_nprocs) {
-		printf("FAILED TO START %d CLIENTS (started %d)\n", torture_nprocs, synccount);
-		*result = False;
-		return timeval_elapsed(&tv);
-	}
-
-	printf("Starting %d clients\n", torture_nprocs);
-
-	/* start the client load */
-	tv = timeval_current();
-	for (i=0;i<torture_nprocs;i++) {
-		child_status[i] = 0;
-	}
-
-	printf("%d clients started\n", torture_nprocs);
-
-	kill(0, SIGCONT);
-
-	for (i=0;i<torture_nprocs;i++) {
-		int ret;
-		while ((ret=waitpid(0, &status, 0)) == -1 && errno == EINTR) /* noop */ ;
-		if (ret == -1 || WEXITSTATUS(status) != 0) {
-			*result = False;
-		}
-	}
-
-	printf("\n");
-	
-	for (i=0;i<torture_nprocs;i++) {
-		if (!child_status_out[i]) {
-			*result = False;
-		}
-	}
-	return timeval_elapsed(&tv);
-}
-
-#define FLAG_MULTIPROC 1
-
-static struct {
-	const char *name;
-	BOOL (*fn)(struct torture_context *);
-} builtin_torture_ops[] = {
-	/* benchmarking tests */
-	{"BENCH-HOLDCON",  torture_holdcon},
-	{"BENCH-NBENCH",  torture_nbench},
-	{"BENCH-NBT",     torture_bench_nbt},
-	{"BENCH-WINS",    torture_bench_wins},
-	{"BENCH-CLDAP",   torture_bench_cldap},
-	{"BENCH-OPLOCK",   torture_bench_oplock},
-
-	/* RAW smb tests */
-	{"RAW-QFSINFO", torture_raw_qfsinfo},
-	{"RAW-QFILEINFO", torture_raw_qfileinfo},
-	{"RAW-SFILEINFO", torture_raw_sfileinfo},
-	{"RAW-SFILEINFO-BUG", torture_raw_sfileinfo_bug},
-	{"RAW-SEARCH", torture_raw_search},
-	{"RAW-CLOSE", torture_raw_close},
-	{"RAW-OPEN", torture_raw_open},
-	{"RAW-MKDIR", torture_raw_mkdir},
-	{"RAW-OPLOCK", torture_raw_oplock},
-	{"RAW-NOTIFY", torture_raw_notify},
-	{"RAW-MUX", torture_raw_mux},
-	{"RAW-IOCTL", torture_raw_ioctl},
-	{"RAW-CHKPATH", torture_raw_chkpath},
-	{"RAW-UNLINK", torture_raw_unlink},
-	{"RAW-READ", torture_raw_read},
-	{"RAW-WRITE", torture_raw_write},
-	{"RAW-LOCK", torture_raw_lock},
-	{"RAW-CONTEXT", torture_raw_context},
-	{"RAW-RENAME", torture_raw_rename},
-	{"RAW-SEEK", torture_raw_seek},
-	{"RAW-EAS", torture_raw_eas},
-	{"RAW-STREAMS", torture_raw_streams},
-	{"RAW-ACLS", torture_raw_acls},
-	{"RAW-COMPOSITE", torture_raw_composite},
-	{"RAW-SAMBA3HIDE", torture_samba3_hide},
-
-	/* SMB2 tests */
-	{"SMB2-CONNECT", torture_smb2_connect},
-	{"SMB2-SCAN", torture_smb2_scan},
-	{"SMB2-SCANGETINFO", torture_smb2_getinfo_scan},
-	{"SMB2-SCANSETINFO", torture_smb2_setinfo_scan},
-	{"SMB2-SCANFIND", torture_smb2_find_scan},
-	{"SMB2-GETINFO", torture_smb2_getinfo},
-	{"SMB2-SETINFO", torture_smb2_setinfo},
-	{"SMB2-FIND", torture_smb2_find},
-	{"SMB2-LOCK", torture_smb2_lock},
-
-	/* RAP tests */
-	{"RAP-BASIC", torture_rap_basic},
-
-	/* protocol scanners */
-	{"SCAN-PIPE_NUMBER", run_pipe_number},
-	{"SCAN-IOCTL",  torture_ioctl_test},
-	{"SCAN-RAP",  torture_rap_scan},
-	{"SCAN-EAMAX", torture_max_eas},
-
-	/* local (no server) testers */
-	{"LOCAL-TALLOC", torture_local_talloc},
-
-	/* ldap testers */
-	{"LDAP-BASIC", torture_ldap_basic},
-	{"LDAP-SCHEMA", torture_ldap_schema},
-	{"LDAP-CLDAP", torture_cldap},
-
-	/* nbt tests */
-	{"NBT-REGISTER", torture_nbt_register},
-	{"NBT-WINS", torture_nbt_wins},
-	{"NBT-DGRAM", torture_nbt_dgram},
-	{"NBT-BROWSE", torture_nbt_browse},
-	{"NBT-WINSREPLICATION-SIMPLE", torture_nbt_winsreplication_simple},
-	{"NBT-WINSREPLICATION-REPLICA", torture_nbt_winsreplication_replica},
-	{"NBT-WINSREPLICATION-OWNED", torture_nbt_winsreplication_owned},
-	
-	{NULL, NULL}
-};
-
-/* ignore me */ static struct torture_suite *
-	(*suite_generators[]) (TALLOC_CTX *mem_ctx) =
-{ 
-	torture_local_binding_string, 
-	torture_ntlmssp, 
-	torture_local_messaging, 
-	torture_local_irpc, 
-	torture_local_util_strlist, 
-	torture_local_util_file, 
-	torture_local_idtree, 
-	torture_local_iconv,
-	torture_local_socket, 
-	torture_pac, 
-	torture_registry, 
-	torture_local_resolve,
-	torture_local_sddl,
-	torture_local_ndr, 
-	torture_local_event, 
-	NULL
-};
-
-static void register_builtin_ops(void)
-{
-	int i;
-	TALLOC_CTX *mem_ctx = talloc_autofree_context();
-
-	register_torture_multi_op("BENCH-TORTURE", run_torture);
-	register_torture_multi_op("SCAN-MAXFID", run_maxfidtest);
-
-	for (i = 0; builtin_torture_ops[i].name; i++) {
-		if (builtin_torture_ops[i].fn)
-			register_torture_op(builtin_torture_ops[i].name, 
-							builtin_torture_ops[i].fn);
-	}
-
-	for (i = 0; suite_generators[i]; i++)
-		torture_register_suite(suite_generators[i](mem_ctx));
-}
-
 struct torture_suite_list *torture_suites = NULL;
 
 NTSTATUS torture_register_suite(struct torture_suite *suite)
@@ -727,32 +70,8 @@ static BOOL wrap_old_torture_fn(struct torture_context *torture,
 	return fn(torture);
 }
 
-static BOOL wrap_old_torture_multifn(struct torture_context *torture,
-								const void *_fn)
-{
-	BOOL (*fn)(struct smbcli_state *, int ) = _fn;
-	BOOL result;
-
-	torture_create_procs(fn, &result);
-
-	return result;
-}
-
-_PUBLIC_ NTSTATUS register_torture_multi_op(const char *name, 
-											BOOL (*multi_fn)(struct smbcli_state *, int ))
-{
-	struct torture_suite *suite;
-
-	suite = torture_suite_create(talloc_autofree_context(), name);
-
-	torture_suite_add_simple_tcase(suite, name, 
-								   wrap_old_torture_multifn,
-								   multi_fn);
-	torture_register_suite(suite);
-
-	return NT_STATUS_OK;
-}
 
+/* Backwards compatibility wrapper */
 _PUBLIC_ NTSTATUS register_torture_op(const char *name, BOOL (*fn)(struct torture_context *))
 {
 	struct torture_suite *suite;
@@ -771,8 +90,6 @@ int torture_init(void)
 	init_module_fn static_init[] = STATIC_torture_MODULES;
 	init_module_fn *shared_init = load_samba_modules(NULL, "torture");
 	
-	register_builtin_ops();
-
 	run_init_functions(static_init);
 	run_init_functions(shared_init);
 
diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c
index 647f0ec73f..c8ffc04f80 100644
--- a/source4/torture/torture_util.c
+++ b/source4/torture/torture_util.c
@@ -24,7 +24,9 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/ioctl.h"
 #include "libcli/libcli.h"
+#include "system/filesys.h"
 #include "system/shmem.h"
+#include "system/wait.h"
 #include "system/time.h"
 #include "torture/torture.h"
 
@@ -549,4 +551,186 @@ _PUBLIC_ BOOL check_error(const char *location, struct smbcli_state *c,
 	return True;
 }
 
+static struct smbcli_state *current_cli;
+static int procnum; /* records process count number when forking */
 
+static void sigcont(int sig)
+{
+}
+
+double torture_create_procs(BOOL (*fn)(struct smbcli_state *, int), BOOL *result)
+{
+	int i, status;
+	volatile pid_t *child_status;
+	volatile BOOL *child_status_out;
+	int synccount;
+	int tries = 8;
+	double start_time_limit = 10 + (torture_nprocs * 1.5);
+	char **unc_list = NULL;
+	const char *p;
+	int num_unc_names = 0;
+	struct timeval tv;
+
+	*result = True;
+
+	synccount = 0;
+
+	signal(SIGCONT, sigcont);
+
+	child_status = (volatile pid_t *)shm_setup(sizeof(pid_t)*torture_nprocs);
+	if (!child_status) {
+		printf("Failed to setup shared memory\n");
+		return -1;
+	}
+
+	child_status_out = (volatile BOOL *)shm_setup(sizeof(BOOL)*torture_nprocs);
+	if (!child_status_out) {
+		printf("Failed to setup result status shared memory\n");
+		return -1;
+	}
+
+	p = lp_parm_string(-1, "torture", "unclist");
+	if (p) {
+		unc_list = file_lines_load(p, &num_unc_names, NULL);
+		if (!unc_list || num_unc_names <= 0) {
+			printf("Failed to load unc names list from '%s'\n", p);
+			exit(1);
+		}
+	}
+
+	for (i = 0; i < torture_nprocs; i++) {
+		child_status[i] = 0;
+		child_status_out[i] = True;
+	}
+
+	tv = timeval_current();
+
+	for (i=0;i<torture_nprocs;i++) {
+		procnum = i;
+		if (fork() == 0) {
+			char *myname;
+			char *hostname=NULL, *sharename;
+
+			pid_t mypid = getpid();
+			srandom(((int)mypid) ^ ((int)time(NULL)));
+
+			asprintf(&myname, "CLIENT%d", i);
+			lp_set_cmdline("netbios name", myname);
+			free(myname);
+
+
+			if (unc_list) {
+				if (!smbcli_parse_unc(unc_list[i % num_unc_names],
+						      NULL, &hostname, &sharename)) {
+					printf("Failed to parse UNC name %s\n",
+					       unc_list[i % num_unc_names]);
+					exit(1);
+				}
+			}
+
+			while (1) {
+				if (hostname) {
+					if (torture_open_connection_share(NULL,
+									  &current_cli,
+									  hostname, 
+									  sharename,
+									  NULL)) {
+						break;
+					}
+				} else if (torture_open_connection(&current_cli)) {
+						break;
+				}
+				if (tries-- == 0) {
+					printf("pid %d failed to start\n", (int)getpid());
+					_exit(1);
+				}
+				msleep(100);	
+			}
+
+			child_status[i] = getpid();
+
+			pause();
+
+			if (child_status[i]) {
+				printf("Child %d failed to start!\n", i);
+				child_status_out[i] = 1;
+				_exit(1);
+			}
+
+			child_status_out[i] = fn(current_cli, i);
+			_exit(0);
+		}
+	}
+
+	do {
+		synccount = 0;
+		for (i=0;i<torture_nprocs;i++) {
+			if (child_status[i]) synccount++;
+		}
+		if (synccount == torture_nprocs) break;
+		msleep(100);
+	} while (timeval_elapsed(&tv) < start_time_limit);
+
+	if (synccount != torture_nprocs) {
+		printf("FAILED TO START %d CLIENTS (started %d)\n", torture_nprocs, synccount);
+		*result = False;
+		return timeval_elapsed(&tv);
+	}
+
+	printf("Starting %d clients\n", torture_nprocs);
+
+	/* start the client load */
+	tv = timeval_current();
+	for (i=0;i<torture_nprocs;i++) {
+		child_status[i] = 0;
+	}
+
+	printf("%d clients started\n", torture_nprocs);
+
+	kill(0, SIGCONT);
+
+	for (i=0;i<torture_nprocs;i++) {
+		int ret;
+		while ((ret=waitpid(0, &status, 0)) == -1 && errno == EINTR) /* noop */ ;
+		if (ret == -1 || WEXITSTATUS(status) != 0) {
+			*result = False;
+		}
+	}
+
+	printf("\n");
+	
+	for (i=0;i<torture_nprocs;i++) {
+		if (!child_status_out[i]) {
+			*result = False;
+		}
+	}
+	return timeval_elapsed(&tv);
+}
+
+
+
+static BOOL wrap_old_torture_multifn(struct torture_context *torture,
+								const void *_fn)
+{
+	BOOL (*fn)(struct smbcli_state *, int ) = _fn;
+	BOOL result;
+
+	torture_create_procs(fn, &result);
+
+	return result;
+}
+
+_PUBLIC_ NTSTATUS register_torture_multi_op(const char *name, 
+											BOOL (*multi_fn)(struct smbcli_state *, int ))
+{
+	struct torture_suite *suite;
+
+	suite = torture_suite_create(talloc_autofree_context(), name);
+
+	torture_suite_add_simple_tcase(suite, name, 
+								   wrap_old_torture_multifn,
+								   multi_fn);
+	torture_register_suite(suite);
+
+	return NT_STATUS_OK;
+}