r5775: Remove some unused functions (unions are no longer as special as they used to be)

Add oxid mapping table support in DCOM
(This used to be commit e193555f0eec2dda8c8760e9668181200fef0a1e)

2 files changed, 10 insertions, 6 deletions

diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index 3ff90e3a01..2caf3512d5 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -232,24 +232,28 @@ BOOL torture_rpc_oxidresolve(void)
 		return False;
 	}
 
-	status = dcerpc_secondary_connection(premact, &p, 
+	status = torture_rpc_connection(&p, 
 					DCERPC_IOXIDRESOLVER_NAME, 
 					DCERPC_IOXIDRESOLVER_UUID, 
 					DCERPC_IOXIDRESOLVER_VERSION);
 
-	if(!test_RemoteActivation(premact, mem_ctx, &oxid, &oid))
+	if (!NT_STATUS_IS_OK(status)) {
 		return False;
+	}
 
 	if(!test_ServerAlive(p, mem_ctx))
 		ret = False;
 
-	if(!test_ComplexPing(p, mem_ctx, &setid, oid))
+	if(!test_ServerAlive2(p, mem_ctx))
 		ret = False;
 
-	if(!test_SimplePing(p, mem_ctx, setid))
+	if(!test_RemoteActivation(premact, mem_ctx, &oxid, &oid))
+		return False;
+
+	if(!test_ComplexPing(p, mem_ctx, &setid, oid))
 		ret = False;
 
-	if(!test_ServerAlive2(p, mem_ctx))
+	if(!test_SimplePing(p, mem_ctx, setid))
 		ret = False;
 
 	if(!test_ResolveOxid(p, mem_ctx, oxid))
diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
index 83a8811787..a8dff5f50b 100644
--- a/source4/torture/rpc/remact.c
+++ b/source4/torture/rpc/remact.c
@@ -86,7 +86,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	}
 
 	if(!W_ERROR_IS_OK(r.out.results[0])) {
-		printf("RemoteActivation: %s\n", win_errstr(r.out.results[0]));
+		printf("RemoteActivation(GetClassObject): %s\n", win_errstr(r.out.results[0]));
 		return 0;
 	}