summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-02-21 13:13:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:10:50 -0500
commita62ade362ff6b4fdf949b31d99199e509cb8d643 (patch)
tree7175a3e2f6e79bd51e4e68d8aa2026bf357a7be8 /source4/torture
parent600c49e772bea70682dc6ef9f6f961c94faed457 (diff)
downloadsamba-a62ade362ff6b4fdf949b31d99199e509cb8d643.tar.gz
samba-a62ade362ff6b4fdf949b31d99199e509cb8d643.tar.bz2
samba-a62ade362ff6b4fdf949b31d99199e509cb8d643.zip
r5487: - Allow disabling modules
- Disable all current DCOM functionality (I hope to commit a large bunch of COM and DCOM changes later today) - Make remact and oxidresolver depend on orpc rather then dcom (This used to be commit f298f2a5478a905fe385b8d68318db92ee984374)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/config.mk4
-rw-r--r--source4/torture/torture.c13
2 files changed, 2 insertions, 15 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 7b61fb9a9a..2a81ac1c7c 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -106,7 +106,8 @@ REQUIRED_SUBSYSTEMS = \
RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL \
RPC_NDR_MGMT RPC_NDR_NETLOGON RPC_NDR_ATSVC RPC_NDR_DRSUAPI \
RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_SPOOLSS \
- RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP
+ RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
+ RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER
# End SUBSYSTEM TORTURE_RPC
#################################
@@ -190,7 +191,6 @@ REQUIRED_SUBSYSTEMS = \
TORTURE_BASIC \
TORTURE_RAW \
TORTURE_RPC \
- TORTURE_DCOM \
TORTURE_RAP \
TORTURE_AUTH \
TORTURE_LOCAL \
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 9a1256fc35..ac9af7ed4b 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -123,16 +123,6 @@ BOOL torture_close_connection(struct smbcli_state *c)
return ret;
}
-/* initialise a DCOM context */
-NTSTATUS torture_dcom_init(struct dcom_context **ctx)
-{
- dcom_init(ctx, lp_parm_string(-1, "torture", "userdomain"),
- lp_parm_string(-1, "torture", "username"),
- lp_parm_string(-1, "torture", "password"));
-
- return NT_STATUS_OK;
-}
-
/* open a rpc connection to the chosen binding string */
NTSTATUS torture_rpc_connection(struct dcerpc_pipe **p,
const char *pipe_name,
@@ -2417,9 +2407,6 @@ static struct {
{"RPC-DSSETUP", torture_rpc_dssetup, 0},
{"RPC-ALTERCONTEXT", torture_rpc_alter_context, 0},
- /* Distributed COM testers */
- {"DCOM-SIMPLE", torture_dcom_simple, 0},
-
/* local (no server) testers */
{"LOCAL-NTLMSSP", torture_ntlmssp_self_check, 0},
{"LOCAL-ICONV", torture_local_iconv, 0},