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

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

2 files changed, 44 insertions, 2 deletions

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;
+}