summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-05-25 15:56:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:15 -0500
commit59e739a2f9f4b10f5f6184ef397f034d09959f26 (patch)
tree47ccef9f0650fccdcd2dd30651098c671aee7d3e
parent735e64cff9e5312d1f0f4d536c4d41f67d9c4e4c (diff)
downloadsamba-59e739a2f9f4b10f5f6184ef397f034d09959f26.tar.gz
samba-59e739a2f9f4b10f5f6184ef397f034d09959f26.tar.bz2
samba-59e739a2f9f4b10f5f6184ef397f034d09959f26.zip
r882: - create TORTURE_AUTH SUBSYSTEM
- fix the build because of the missing torture/ntlmssp.c - this file should go into torture/auth/ ! metze (This used to be commit ad662fddcd1082d040b7c06ce809e0b4c441c1df)
-rw-r--r--source4/torture/config.m42
-rw-r--r--source4/torture/config.mk14
-rw-r--r--source4/torture/torture.c2
3 files changed, 15 insertions, 3 deletions
diff --git a/source4/torture/config.m4 b/source4/torture/config.m4
index fb0df317b8..dcbed9f598 100644
--- a/source4/torture/config.m4
+++ b/source4/torture/config.m4
@@ -6,6 +6,8 @@ SMB_SUBSYSTEM_MK(TORTURE_RAW,torture/config.mk)
SMB_SUBSYSTEM_MK(TORTURE_RPC,torture/config.mk)
+SMB_SUBSYSTEM_MK(TORTURE_AUTH,torture/config.mk)
+
SMB_SUBSYSTEM_MK(TORTURE_NBENCH,torture/config.mk)
SMB_BINARY_MK(smbtorture,torture/config.mk)
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 6231941715..febe02500c 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -68,6 +68,16 @@ REQUIRED_SUBSYSTEMS = \
#################################
#################################
+# Start SUBSYSTEM TORTURE_AUTH
+[SUBSYSTEM::TORTURE_AUTH]
+#ADD_OBJ_FILES = \
+# torture/auth/ntlmssp.o
+REQUIRED_SUBSYSTEMS = \
+ LIBSMB
+# End SUBSYSTEM TORTURE_AUTH
+#################################
+
+#################################
# Start SUBSYSTEM TORTURE_NBENCH
[SUBSYSTEM::TORTURE_NBENCH]
ADD_OBJ_FILES = \
@@ -81,12 +91,12 @@ ADD_OBJ_FILES = \
[BINARY::smbtorture]
OBJ_FILES = \
torture/torture.o \
- torture/torture_util.o \
- torture/ntlmssp.o
+ torture/torture_util.o
REQUIRED_SUBSYSTEMS = \
TORTURE_BASIC \
TORTURE_RAW \
TORTURE_RPC \
+ TORTURE_AUTH \
TORTURE_NBENCH \
CONFIG \
LIBCMDLINE \
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index ef6a0c2ed8..e1e00cb829 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -4140,7 +4140,7 @@ static struct {
{"RPC-MGMT", torture_rpc_mgmt, 0},
{"RPC-SCANNER", torture_rpc_scanner, 0},
{"RPC-AUTOIDL", torture_rpc_autoidl, 0},
- {"NTLMSSP-SELFCHECK", torture_ntlmssp_self_check, 0},
+/* {"NTLMSSP-SELFCHECK", torture_ntlmssp_self_check, 0},*/
{NULL, NULL, 0}};