r8559: Couple of (D)COM updates:

 - Fixes annoying array-of-pointers bug in pidl.
 - No longer "inherit" alignment thru subcontexts
 - Use "Image Object" as example DCOM object, rather then the "My Computer" object, which is built-in and can't be accessed remotely as far as I can see
(This used to be commit bd706d496405d274b68c1ee560211837a8e63009)

2 files changed, 8 insertions, 5 deletions

diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index 3b0269891c..8bb1a7ae0a 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -25,6 +25,8 @@
 #include "librpc/gen_ndr/ndr_epmapper.h"
 #include "librpc/gen_ndr/com_dcom.h"
 
+#define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9"
+
 static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint64_t *oxid, struct GUID *oid)
 {
 	struct RemoteActivation r;
@@ -36,7 +38,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uin
 	r.in.this.version.MajorVersion = 5;
 	r.in.this.version.MinorVersion = 1;
 	r.in.this.cid = GUID_random();
-	GUID_from_string(CLSID_SIMPLE, &r.in.Clsid);
+	GUID_from_string(CLSID_IMAGEDOC, &r.in.Clsid);
 	r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY;
 	r.in.num_protseqs = 3;
 	r.in.protseq = protseq;
diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
index 1d145dd1cb..bbda197854 100644
--- a/source4/torture/rpc/remact.c
+++ b/source4/torture/rpc/remact.c
@@ -24,24 +24,25 @@
 #include "librpc/gen_ndr/ndr_epmapper.h"
 #include "librpc/gen_ndr/com_dcom.h"
 
+#define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9"
+
 static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
 	struct RemoteActivation r;
 	NTSTATUS status;
-	struct GUID iids[2];
+	struct GUID iids[1];
 	uint16_t protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID };
 
 	ZERO_STRUCT(r.in);
 	r.in.this.version.MajorVersion = 5;
 	r.in.this.version.MinorVersion = 1;
 	r.in.this.cid = GUID_random();
-	GUID_from_string(CLSID_SIMPLE, &r.in.Clsid);
+	GUID_from_string(CLSID_IMAGEDOC, &r.in.Clsid);
 	r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY;
 	r.in.num_protseqs = 3;
 	r.in.protseq = protseq;
-	r.in.Interfaces = 2;
+	r.in.Interfaces = 1;
 	GUID_from_string(DCERPC_IUNKNOWN_UUID, &iids[0]);
-	GUID_from_string(DCERPC_ISTREAM_UUID, &iids[1]);
 	r.in.pIIDs = iids;
 
 	status = dcerpc_RemoteActivation(p, mem_ctx, &r);