r5775: Remove some unused functions (unions are no longer as special as they used...

[samba.git] / source4 / torture / rpc / oxidresolve.c

diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index 6164825af73dc2f89f8df7e86689a4e7e558aa36..2caf3512d5525f46f6d42f8cb9b6eb6ff5027f74 100644 (file)
--- 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)
 {
@@ -235,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))