r16331: Split out registering of multi fn tests, fix typo in name of pac suite.

(This used to be commit 9e8574ac6cd38d1ff388f0c9ff37d86b316a431e)

5 files changed, 184 insertions, 182 deletions

diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index ecba5d1cc8..d922d5d1e9 100644
--- a/source4/torture/auth/pac.c
+++ b/source4/torture/auth/pac.c
@@ -663,7 +663,7 @@ static BOOL torture_pac_saved_check(struct torture_context *test,
 
 struct torture_suite *torture_pac(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "AUTH-PAC");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "LOCAL-PAC");
 
 	torture_suite_add_simple_tcase(suite, "self check", 
 								   torture_pac_self_check, NULL);
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 70dab96dfa..b670b8a30a 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -1795,52 +1795,52 @@ static BOOL torture_samba3_errorpaths(struct torture_context *torture)
 
 NTSTATUS torture_base_init(void)
 {
-	register_torture_op("BASE-FDPASS", run_fdpasstest, 0);
-	register_torture_op("BASE-LOCK1",  torture_locktest1,  0);
-	register_torture_op("BASE-LOCK2",  torture_locktest2,  0);
-	register_torture_op("BASE-LOCK3",  torture_locktest3,  0);
-	register_torture_op("BASE-LOCK4",  torture_locktest4,  0);
-	register_torture_op("BASE-LOCK5",  torture_locktest5,  0);
-	register_torture_op("BASE-LOCK6",  torture_locktest6,  0);
-	register_torture_op("BASE-LOCK7",  torture_locktest7,  0);
-	register_torture_op("BASE-UNLINK", torture_unlinktest, 0);
-	register_torture_op("BASE-ATTR",   run_attrtest,   0);
-	register_torture_op("BASE-TRANS2", run_trans2test, 0);
-	register_torture_op("BASE-NEGNOWAIT", run_negprot_nowait, 0);
-	register_torture_op("BASE-DIR1",  torture_dirtest1, 0);
-	register_torture_op("BASE-DIR2",  torture_dirtest2, 0);
-	register_torture_op("BASE-DENY1",  torture_denytest1, 0);
-	register_torture_op("BASE-DENY2",  torture_denytest2, 0);
-	register_torture_op("BASE-DENY3",  torture_denytest3, 0);
-	register_torture_op("BASE-DENYDOS",  torture_denydos_sharing, 0);
-	register_torture_op("BASE-NTDENY1",  NULL, torture_ntdenytest1);
-	register_torture_op("BASE-NTDENY2",  torture_ntdenytest2, 0);
-	register_torture_op("BASE-TCON",  run_tcon_test, 0);
-	register_torture_op("BASE-TCONDEV",  run_tcon_devtype_test, 0);
-	register_torture_op("BASE-VUID", run_vuidtest, 0);
-	register_torture_op("BASE-RW1",  run_readwritetest, 0);
-	register_torture_op("BASE-OPEN", run_opentest, 0);
-	register_torture_op("BASE-DEFER_OPEN", NULL, run_deferopen);
-	register_torture_op("BASE-XCOPY", run_xcopy, 0);
-	register_torture_op("BASE-IOMETER", run_iometer, 0);
-	register_torture_op("BASE-RENAME", torture_test_rename, 0);
-	register_torture_op("BASE-DELETE", torture_test_delete, 0);
-	register_torture_op("BASE-PROPERTIES", torture_test_properties, 0);
-	register_torture_op("BASE-MANGLE", torture_mangle, 0);
-	register_torture_op("BASE-OPENATTR", torture_openattrtest, 0);
-	register_torture_op("BASE-CHARSET", torture_charset, 0);
-	register_torture_op("BASE-CHKPATH",  torture_chkpath_test, 0);
-	register_torture_op("BASE-SECLEAK",  torture_sec_leak, 0);
-	register_torture_op("BASE-DISCONNECT",  torture_disconnect, 0);
-	register_torture_op("BASE-DELAYWRITE", torture_delay_write, 0);
-	register_torture_op("BASE-SAMBA3ERROR", torture_samba3_errorpaths, 0);
-
-	register_torture_op("SCAN-CASETABLE", torture_casetable, 0);
-	register_torture_op("SCAN-UTABLE", torture_utable, 0);
-	register_torture_op("SCAN-SMB", torture_smb_scan, 0);
-	register_torture_op("SCAN-ALIASES", torture_trans2_aliases, 0);
-	register_torture_op("SCAN-TRANS2", torture_trans2_scan, 0);
-	register_torture_op("SCAN-NTTRANS", torture_nttrans_scan, 0);
+	register_torture_op("BASE-FDPASS", run_fdpasstest);
+	register_torture_op("BASE-LOCK1",  torture_locktest1);
+	register_torture_op("BASE-LOCK2",  torture_locktest2);
+	register_torture_op("BASE-LOCK3",  torture_locktest3);
+	register_torture_op("BASE-LOCK4",  torture_locktest4);
+	register_torture_op("BASE-LOCK5",  torture_locktest5);
+	register_torture_op("BASE-LOCK6",  torture_locktest6);
+	register_torture_op("BASE-LOCK7",  torture_locktest7);
+	register_torture_op("BASE-UNLINK", torture_unlinktest);
+	register_torture_op("BASE-ATTR",   run_attrtest);
+	register_torture_op("BASE-TRANS2", run_trans2test);
+	register_torture_op("BASE-NEGNOWAIT", run_negprot_nowait);
+	register_torture_op("BASE-DIR1",  torture_dirtest1);
+	register_torture_op("BASE-DIR2",  torture_dirtest2);
+	register_torture_op("BASE-DENY1",  torture_denytest1);
+	register_torture_op("BASE-DENY2",  torture_denytest2);
+	register_torture_op("BASE-DENY3",  torture_denytest3);
+	register_torture_op("BASE-DENYDOS",  torture_denydos_sharing);
+	register_torture_multi_op("BASE-NTDENY1", torture_ntdenytest1);
+	register_torture_op("BASE-NTDENY2",  torture_ntdenytest2);
+	register_torture_op("BASE-TCON",  run_tcon_test);
+	register_torture_op("BASE-TCONDEV",  run_tcon_devtype_test);
+	register_torture_op("BASE-VUID", run_vuidtest);
+	register_torture_op("BASE-RW1",  run_readwritetest);
+	register_torture_op("BASE-OPEN", run_opentest);
+	register_torture_multi_op("BASE-DEFER_OPEN", run_deferopen);
+	register_torture_op("BASE-XCOPY", run_xcopy);
+	register_torture_op("BASE-IOMETER", run_iometer);
+	register_torture_op("BASE-RENAME", torture_test_rename);
+	register_torture_op("BASE-DELETE", torture_test_delete);
+	register_torture_op("BASE-PROPERTIES", torture_test_properties);
+	register_torture_op("BASE-MANGLE", torture_mangle);
+	register_torture_op("BASE-OPENATTR", torture_openattrtest);
+	register_torture_op("BASE-CHARSET", torture_charset);
+	register_torture_op("BASE-CHKPATH",  torture_chkpath_test);
+	register_torture_op("BASE-SECLEAK",  torture_sec_leak);
+	register_torture_op("BASE-DISCONNECT",  torture_disconnect);
+	register_torture_op("BASE-DELAYWRITE", torture_delay_write);
+	register_torture_op("BASE-SAMBA3ERROR", torture_samba3_errorpaths);
+
+	register_torture_op("SCAN-CASETABLE", torture_casetable);
+	register_torture_op("SCAN-UTABLE", torture_utable);
+	register_torture_op("SCAN-SMB", torture_smb_scan);
+	register_torture_op("SCAN-ALIASES", torture_trans2_aliases);
+	register_torture_op("SCAN-TRANS2", torture_trans2_scan);
+	register_torture_op("SCAN-NTTRANS", torture_nttrans_scan);
 
 	return NT_STATUS_OK;
 }
diff --git a/source4/torture/libnet/libnet.c b/source4/torture/libnet/libnet.c
index 0632b6cdf8..85708e492e 100644
--- a/source4/torture/libnet/libnet.c
+++ b/source4/torture/libnet/libnet.c
@@ -24,23 +24,23 @@
 
 NTSTATUS torture_net_init(void)
 {
-	register_torture_op("NET-USERINFO", torture_userinfo, 0);
-	register_torture_op("NET-USERADD", torture_useradd, 0);
-	register_torture_op("NET-USERDEL", torture_userdel, 0);
-	register_torture_op("NET-USERMOD", torture_usermod, 0);
-	register_torture_op("NET-DOMOPEN", torture_domainopen, 0);
-	register_torture_op("NET-API-LOOKUP", torture_lookup, 0);
-	register_torture_op("NET-API-LOOKUPHOST", torture_lookup_host, 0);
-	register_torture_op("NET-API-LOOKUPPDC", torture_lookup_pdc, 0);
-	register_torture_op("NET-API-CREATEUSER", torture_createuser, 0);
-	register_torture_op("NET-API-DELETEUSER", torture_deleteuser, 0);
-	register_torture_op("NET-API-RPCCONN-BIND", torture_rpc_connect_binding, 0);
-	register_torture_op("NET-API-RPCCONN-SRV", torture_rpc_connect_srv, 0);
-	register_torture_op("NET-API-RPCCONN-PDC", torture_rpc_connect_pdc, 0);
-	register_torture_op("NET-API-RPCCONN-DC", torture_rpc_connect_dc, 0);
-	register_torture_op("NET-API-RPCCONN-DCINFO", torture_rpc_connect_dc_info, 0);
-	register_torture_op("NET-API-LISTSHARES", torture_listshares, 0);
-	register_torture_op("NET-API-DELSHARE", torture_delshare, 0);
+	register_torture_op("NET-USERINFO", torture_userinfo);
+	register_torture_op("NET-USERADD", torture_useradd);
+	register_torture_op("NET-USERDEL", torture_userdel);
+	register_torture_op("NET-USERMOD", torture_usermod);
+	register_torture_op("NET-DOMOPEN", torture_domainopen);
+	register_torture_op("NET-API-LOOKUP", torture_lookup);
+	register_torture_op("NET-API-LOOKUPHOST", torture_lookup_host);
+	register_torture_op("NET-API-LOOKUPPDC", torture_lookup_pdc);
+	register_torture_op("NET-API-CREATEUSER", torture_createuser);
+	register_torture_op("NET-API-DELETEUSER", torture_deleteuser);
+	register_torture_op("NET-API-RPCCONN-BIND", torture_rpc_connect_binding);
+	register_torture_op("NET-API-RPCCONN-SRV", torture_rpc_connect_srv);
+	register_torture_op("NET-API-RPCCONN-PDC", torture_rpc_connect_pdc);
+	register_torture_op("NET-API-RPCCONN-DC", torture_rpc_connect_dc);
+	register_torture_op("NET-API-RPCCONN-DCINFO", torture_rpc_connect_dc_info);
+	register_torture_op("NET-API-LISTSHARES", torture_listshares);
+	register_torture_op("NET-API-DELSHARE", torture_delshare);
 
 	return NT_STATUS_OK;
 }
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index c828971cde..58a880f8e4 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -95,46 +95,46 @@ NTSTATUS torture_rpc_init(void)
 
 	dcerpc_table_init();
 
-	register_torture_op("RPC-LSA", torture_rpc_lsa, 0);
-	register_torture_op("RPC-LSALOOKUP", torture_rpc_lsa_lookup, 0);
-	register_torture_op("RPC-SECRETS", torture_rpc_lsa_secrets, 0);
-	register_torture_op("RPC-ECHO", torture_rpc_echo, 0);
-	register_torture_op("RPC-DFS", torture_rpc_dfs, 0);
-	register_torture_op("RPC-SPOOLSS", torture_rpc_spoolss, 0);
-	register_torture_op("RPC-SAMR", torture_rpc_samr, 0);
-	register_torture_op("RPC-UNIXINFO", torture_rpc_unixinfo, 0);
-	register_torture_op("RPC-NETLOGON", torture_rpc_netlogon, 0);
-	register_torture_op("RPC-SAMLOGON", torture_rpc_samlogon, 0);
-	register_torture_op("RPC-SAMSYNC", torture_rpc_samsync, 0);
-	register_torture_op("RPC-SCHANNEL", torture_rpc_schannel, 0);
-	register_torture_op("RPC-WKSSVC", torture_rpc_wkssvc, 0);
-	register_torture_op("RPC-SRVSVC", torture_rpc_srvsvc, 0);
-	register_torture_op("RPC-SVCCTL", torture_rpc_svcctl, 0);
-	register_torture_op("RPC-ATSVC", torture_rpc_atsvc, 0);
-	register_torture_op("RPC-EVENTLOG", torture_rpc_eventlog, 0);
-	register_torture_op("RPC-EPMAPPER", torture_rpc_epmapper, 0);
-	register_torture_op("RPC-WINREG", torture_rpc_winreg, 0);
-	register_torture_op("RPC-INITSHUTDOWN", torture_rpc_initshutdown, 0);
-	register_torture_op("RPC-OXIDRESOLVE", torture_rpc_oxidresolve, 0);
-	register_torture_op("RPC-REMACT", torture_rpc_remact, 0);
-	register_torture_op("RPC-MGMT", torture_rpc_mgmt, 0);
-	register_torture_op("RPC-SCANNER", torture_rpc_scanner, 0);
-	register_torture_op("RPC-AUTOIDL", torture_rpc_autoidl, 0);
-	register_torture_op("RPC-COUNTCALLS", torture_rpc_countcalls, 0);
-	register_torture_op("RPC-MULTIBIND", torture_multi_bind, 0);
-	register_torture_op("RPC-AUTHCONTEXT", torture_bind_authcontext, 0);
-	register_torture_op("RPC-BINDSAMBA3", torture_bind_samba3, 0);
-	register_torture_op("RPC-NETLOGSAMBA3", torture_netlogon_samba3, 0);
-	register_torture_op("RPC-SAMBA3SESSIONKEY", torture_samba3_sessionkey, 0);
-	register_torture_op("RPC-DRSUAPI", torture_rpc_drsuapi, 0);
-	register_torture_op("RPC-CRACKNAMES", torture_rpc_drsuapi_cracknames, 0);
-	register_torture_op("RPC-ROT", torture_rpc_rot, 0);
-	register_torture_op("RPC-DSSETUP", torture_rpc_dssetup, 0);
-	register_torture_op("RPC-ALTERCONTEXT", torture_rpc_alter_context, 0);
-	register_torture_op("RPC-JOIN", torture_rpc_join, 0);
-	register_torture_op("RPC-DSSYNC", torture_rpc_dssync, 0);
-	register_torture_op("BENCH-RPC", torture_bench_rpc, 0);
-	register_torture_op("RPC-ASYNCBIND", torture_async_bind, 0);
+	register_torture_op("RPC-LSA", torture_rpc_lsa);
+	register_torture_op("RPC-LSALOOKUP", torture_rpc_lsa_lookup);
+	register_torture_op("RPC-SECRETS", torture_rpc_lsa_secrets);
+	register_torture_op("RPC-ECHO", torture_rpc_echo);
+	register_torture_op("RPC-DFS", torture_rpc_dfs);
+	register_torture_op("RPC-SPOOLSS", torture_rpc_spoolss);
+	register_torture_op("RPC-SAMR", torture_rpc_samr);
+	register_torture_op("RPC-UNIXINFO", torture_rpc_unixinfo);
+	register_torture_op("RPC-NETLOGON", torture_rpc_netlogon);
+	register_torture_op("RPC-SAMLOGON", torture_rpc_samlogon);
+	register_torture_op("RPC-SAMSYNC", torture_rpc_samsync);
+	register_torture_op("RPC-SCHANNEL", torture_rpc_schannel);
+	register_torture_op("RPC-WKSSVC", torture_rpc_wkssvc);
+	register_torture_op("RPC-SRVSVC", torture_rpc_srvsvc);
+	register_torture_op("RPC-SVCCTL", torture_rpc_svcctl);
+	register_torture_op("RPC-ATSVC", torture_rpc_atsvc);
+	register_torture_op("RPC-EVENTLOG", torture_rpc_eventlog);
+	register_torture_op("RPC-EPMAPPER", torture_rpc_epmapper);
+	register_torture_op("RPC-WINREG", torture_rpc_winreg);
+	register_torture_op("RPC-INITSHUTDOWN", torture_rpc_initshutdown);
+	register_torture_op("RPC-OXIDRESOLVE", torture_rpc_oxidresolve);
+	register_torture_op("RPC-REMACT", torture_rpc_remact);
+	register_torture_op("RPC-MGMT", torture_rpc_mgmt);
+	register_torture_op("RPC-SCANNER", torture_rpc_scanner);
+	register_torture_op("RPC-AUTOIDL", torture_rpc_autoidl);
+	register_torture_op("RPC-COUNTCALLS", torture_rpc_countcalls);
+	register_torture_op("RPC-MULTIBIND", torture_multi_bind);
+	register_torture_op("RPC-AUTHCONTEXT", torture_bind_authcontext);
+	register_torture_op("RPC-BINDSAMBA3", torture_bind_samba3);
+	register_torture_op("RPC-NETLOGSAMBA3", torture_netlogon_samba3);
+	register_torture_op("RPC-SAMBA3SESSIONKEY", torture_samba3_sessionkey);
+	register_torture_op("RPC-DRSUAPI", torture_rpc_drsuapi);
+	register_torture_op("RPC-CRACKNAMES", torture_rpc_drsuapi_cracknames);
+	register_torture_op("RPC-ROT", torture_rpc_rot);
+	register_torture_op("RPC-DSSETUP", torture_rpc_dssetup);
+	register_torture_op("RPC-ALTERCONTEXT", torture_rpc_alter_context);
+	register_torture_op("RPC-JOIN", torture_rpc_join);
+	register_torture_op("RPC-DSSYNC", torture_rpc_dssync);
+	register_torture_op("BENCH-RPC", torture_bench_rpc);
+	register_torture_op("RPC-ASYNCBIND", torture_async_bind);
 
 	return NT_STATUS_OK;
 }
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 51308ef824..a33ac55c02 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -577,83 +577,80 @@ double torture_create_procs(BOOL (*fn)(struct smbcli_state *, int), BOOL *result
 static struct {
 	const char *name;
 	BOOL (*fn)(struct torture_context *);
-	BOOL (*multi_fn)(struct smbcli_state *, int );
 } builtin_torture_ops[] = {
 	/* benchmarking tests */
-	{"BENCH-HOLDCON",  torture_holdcon, 0},
-	{"BENCH-NBENCH",  torture_nbench, 0},
-	{"BENCH-TORTURE", NULL, run_torture},
-	{"BENCH-NBT",     torture_bench_nbt, 0},
-	{"BENCH-WINS",    torture_bench_wins, 0},
-	{"BENCH-CLDAP",   torture_bench_cldap, 0},
-	{"BENCH-OPLOCK",   torture_bench_oplock, 0},
+	{"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, 0},
-	{"RAW-QFILEINFO", torture_raw_qfileinfo, 0},
-	{"RAW-SFILEINFO", torture_raw_sfileinfo, 0},
-	{"RAW-SFILEINFO-BUG", torture_raw_sfileinfo_bug, 0},
-	{"RAW-SEARCH", torture_raw_search, 0},
-	{"RAW-CLOSE", torture_raw_close, 0},
-	{"RAW-OPEN", torture_raw_open, 0},
-	{"RAW-MKDIR", torture_raw_mkdir, 0},
-	{"RAW-OPLOCK", torture_raw_oplock, 0},
-	{"RAW-NOTIFY", torture_raw_notify, 0},
-	{"RAW-MUX", torture_raw_mux, 0},
-	{"RAW-IOCTL", torture_raw_ioctl, 0},
-	{"RAW-CHKPATH", torture_raw_chkpath, 0},
-	{"RAW-UNLINK", torture_raw_unlink, 0},
-	{"RAW-READ", torture_raw_read, 0},
-	{"RAW-WRITE", torture_raw_write, 0},
-	{"RAW-LOCK", torture_raw_lock, 0},
-	{"RAW-CONTEXT", torture_raw_context, 0},
-	{"RAW-RENAME", torture_raw_rename, 0},
-	{"RAW-SEEK", torture_raw_seek, 0},
-	{"RAW-EAS", torture_raw_eas, 0},
-	{"RAW-STREAMS", torture_raw_streams, 0},
-	{"RAW-ACLS", torture_raw_acls, 0},
-	{"RAW-COMPOSITE", torture_raw_composite, 0},
-	{"RAW-SAMBA3HIDE", torture_samba3_hide, 0},
+	{"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, 0},
-	{"SMB2-SCAN", torture_smb2_scan, 0},
-	{"SMB2-SCANGETINFO", torture_smb2_getinfo_scan, 0},
-	{"SMB2-SCANSETINFO", torture_smb2_setinfo_scan, 0},
-	{"SMB2-SCANFIND", torture_smb2_find_scan, 0},
-	{"SMB2-GETINFO", torture_smb2_getinfo, 0},
-	{"SMB2-SETINFO", torture_smb2_setinfo, 0},
-	{"SMB2-FIND", torture_smb2_find, 0},
-	{"SMB2-LOCK", torture_smb2_lock, 0},
+	{"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, 0},
+	{"RAP-BASIC", torture_rap_basic},
 
 	/* protocol scanners */
-	{"SCAN-MAXFID", NULL, run_maxfidtest},
-	{"SCAN-PIPE_NUMBER", run_pipe_number, 0},
-	{"SCAN-IOCTL",  torture_ioctl_test, 0},
-	{"SCAN-RAP",  torture_rap_scan, 0},
-	{"SCAN-EAMAX", torture_max_eas, 0},
+	{"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, 0},
+	{"LOCAL-TALLOC", torture_local_talloc},
 
 	/* ldap testers */
-	{"LDAP-BASIC", torture_ldap_basic, 0},
-	{"LDAP-SCHEMA", torture_ldap_schema, 0},
-	{"LDAP-CLDAP", torture_cldap, 0},
+	{"LDAP-BASIC", torture_ldap_basic},
+	{"LDAP-SCHEMA", torture_ldap_schema},
+	{"LDAP-CLDAP", torture_cldap},
 
 	/* nbt tests */
-	{"NBT-REGISTER", torture_nbt_register, 0},
-	{"NBT-WINS", torture_nbt_wins, 0},
-	{"NBT-DGRAM", torture_nbt_dgram, 0},
-	{"NBT-BROWSE", torture_nbt_browse, 0},
-	{"NBT-WINSREPLICATION-SIMPLE", torture_nbt_winsreplication_simple, 0},
-	{"NBT-WINSREPLICATION-REPLICA", torture_nbt_winsreplication_replica, 0},
-	{"NBT-WINSREPLICATION-OWNED", torture_nbt_winsreplication_owned, 0},
+	{"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, 0}
+	{NULL, NULL}
 };
 
 /* ignore me */ static struct torture_suite *
@@ -682,10 +679,13 @@ 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++) {
-		register_torture_op(builtin_torture_ops[i].name, 
-							builtin_torture_ops[i].fn, 
-							builtin_torture_ops[i].multi_fn);
+		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++)
@@ -738,28 +738,30 @@ static BOOL wrap_old_torture_multifn(struct torture_context *torture,
 	return result;
 }
 
-_PUBLIC_ NTSTATUS register_torture_op(const char *name, BOOL (*fn)(struct torture_context *), BOOL (*multi_fn)(struct smbcli_state *, int ))
+_PUBLIC_ NTSTATUS register_torture_multi_op(const char *name, 
+											BOOL (*multi_fn)(struct smbcli_state *, int ))
 {
 	struct torture_suite *suite;
 
-	if (fn != NULL) {
-		suite = torture_suite_create(talloc_autofree_context(), name);
+	suite = torture_suite_create(talloc_autofree_context(), name);
 
-		torture_suite_add_simple_tcase(suite, name, 
-									   wrap_old_torture_fn,
-									   fn);
-		torture_register_suite(suite);
-	}
+	torture_suite_add_simple_tcase(suite, name, 
+								   wrap_old_torture_multifn,
+								   multi_fn);
+	torture_register_suite(suite);
 
-	if (multi_fn != NULL) {
-		suite = torture_suite_create(talloc_autofree_context(), name);
+	return NT_STATUS_OK;
+}
 
-		torture_suite_add_simple_tcase(suite, name, 
-									   wrap_old_torture_multifn,
-									   multi_fn);
-		torture_register_suite(suite);
-	}
+_PUBLIC_ NTSTATUS register_torture_op(const char *name, BOOL (*fn)(struct torture_context *))
+{
+	struct torture_suite *suite;
+	suite = torture_suite_create(talloc_autofree_context(), name);
 
+	torture_suite_add_simple_tcase(suite, name, 
+								   wrap_old_torture_fn,
+								   fn);
+	torture_register_suite(suite);
 
 	return NT_STATUS_OK;
 }