From 0ad7b308a1c602ddab73668952cdf3837623b877 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 27 Dec 2005 17:15:48 +0000 Subject: r12514: Move DCE/RPC interface table to a seperate file Be a bit more strict when checking for duplicate interfaces (This used to be commit b1286a6d27e2b5aa26f288f6aff70601b0d8ae74) --- source4/torture/com/simple.c | 4 ++-- source4/torture/rpc/epmapper.c | 2 +- source4/torture/rpc/oxidresolve.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/torture') diff --git a/source4/torture/com/simple.c b/source4/torture/com/simple.c index de16b113a2..09061422f5 100644 --- a/source4/torture/com/simple.c +++ b/source4/torture/com/simple.c @@ -41,8 +41,8 @@ static BOOL test_readwrite(TALLOC_CTX *mem_ctx, const char *host) com_init_ctx(&ctx, NULL); dcom_client_init(ctx, cmdline_credentials); - GUID_from_string(COM_ISTREAM_UUID, &IID[0]); - GUID_from_string(COM_IUNKNOWN_UUID, &IID[1]); + IID[0] = dcerpc_table_IStream.uuid; + IID[1] = dcerpc_table_IUnknown.uuid; GUID_from_string(CLSID_SIMPLE, &clsid); if (host) { diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c index 9774b9681c..0085751cb7 100644 --- a/source4/torture/rpc/epmapper.c +++ b/source4/torture/rpc/epmapper.c @@ -259,7 +259,7 @@ static BOOL test_InqObject(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) struct epm_InqObject r; r.in.epm_object = talloc(mem_ctx, struct GUID); - GUID_from_string(DCERPC_EPMAPPER_UUID, r.in.epm_object); + *r.in.epm_object = dcerpc_table_epmapper.uuid; status = dcerpc_epm_InqObject(p, mem_ctx, &r); if (NT_STATUS_IS_ERR(status)) { diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c index 61ef9b8ee8..fbdd9ad265 100644 --- a/source4/torture/rpc/oxidresolve.c +++ b/source4/torture/rpc/oxidresolve.c @@ -43,7 +43,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uin r.in.num_protseqs = 3; r.in.protseq = protseq; r.in.Interfaces = 1; - GUID_from_string(DCERPC_IUNKNOWN_UUID, &iids[0]); + iids[0] = dcerpc_table_IUnknown.uuid; r.in.pIIDs = iids; status = dcerpc_RemoteActivation(p, mem_ctx, &r); -- cgit