From dd2aefd56b0968da8b1c4d055bc8c2f30382fb23 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 6 Mar 2005 22:37:31 +0000 Subject: r5675: - More DCOM bug fixes - Keep COM and DCOM more seperated (This used to be commit f694f484c422d0c86beb58e8f62f134f8676d5e1) --- source4/torture/com/simple.c | 1 - source4/torture/rpc/oxidresolve.c | 5 +---- source4/torture/rpc/remact.c | 5 +---- 3 files changed, 2 insertions(+), 9 deletions(-) (limited to 'source4/torture') diff --git a/source4/torture/com/simple.c b/source4/torture/com/simple.c index 32b269f475..4eceb6a948 100644 --- a/source4/torture/com/simple.c +++ b/source4/torture/com/simple.c @@ -23,7 +23,6 @@ #include "lib/com/com.h" #include "librpc/gen_ndr/com_dcom.h" -#define CLSID_SIMPLE "5e9ddec7-5767-11cf-beab-00aa006c3606" #define DEFAULT_TRANS 4096 static BOOL test_readwrite(TALLOC_CTX *mem_ctx, const char *host) diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c index 6164825af7..3ff90e3a01 100644 --- a/source4/torture/rpc/oxidresolve.c +++ b/source4/torture/rpc/oxidresolve.c @@ -23,10 +23,7 @@ #include "librpc/gen_ndr/ndr_oxidresolver.h" #include "librpc/gen_ndr/ndr_remact.h" #include "librpc/gen_ndr/ndr_epmapper.h" - -#define CLSID_TEST "00000316-0000-0000-C000-000000000046" -#define CLSID_SIMPLE "5e9ddec7-5767-11cf-beab-00aa006c3606" -#define CLSID_COFFEEMACHINE "DB7C21F8-FE33-4C11-AEA5-CEB56F076FBB" +#include "librpc/gen_ndr/com_dcom.h" static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint64_t *oxid, struct GUID *oid) { diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c index 9db1e4f164..83a8811787 100644 --- a/source4/torture/rpc/remact.c +++ b/source4/torture/rpc/remact.c @@ -22,10 +22,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_remact.h" #include "librpc/gen_ndr/ndr_epmapper.h" - -#define CLSID_TEST "00000316-0000-0000-C000-000000000046" -#define CLSID_SIMPLE "5e9ddec7-5767-11cf-beab-00aa006c3606" -#define CLSID_COFFEEMACHINE "DB7C21F8-FE33-4C11-AEA5-CEB56F076FBB" +#include "librpc/gen_ndr/com_dcom.h" static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) { -- cgit