r24557: rename 'dcerpc_table_' -> 'ndr_table_'

[nivanova/samba-autobuild/.git] / source4 / torture / rpc / oxidresolve.c

diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index 3b0269891cbf5362a3f1983e2906b49c3b9747fc..b849681cc25d366025d00a7dc838faba1696be24 100644 (file)
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -6,7 +6,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,15 +15,21 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_oxidresolver.h"
-#include "librpc/gen_ndr/ndr_remact.h"
-#include "librpc/gen_ndr/ndr_epmapper.h"
-#include "librpc/gen_ndr/com_dcom.h"
+#include "torture/torture.h"
+#include "librpc/gen_ndr/ndr_oxidresolver_c.h"
+#include "librpc/gen_ndr/ndr_remact_c.h"
+#include "librpc/gen_ndr/epmapper.h"
+#include "torture/rpc/rpc.h"
+
+#define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9"
+
+const struct GUID IUnknown_uuid = {
+       0x00000000,0x0000,0x0000,{0xc0,0x00},{0x00,0x00,0x00,0x00,0x00,0x46}
+};
 
 static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint64_t *oxid, struct GUID *oid)
 {
@@ -36,13 +42,15 @@ 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;
        r.in.Interfaces = 1;
-       GUID_from_string(DCERPC_IUNKNOWN_UUID, &iids[0]);
+       iids[0] = IUnknown_uuid;
        r.in.pIIDs = iids;
+       r.out.pOxid = oxid;
+       r.out.ipidRemUnknown = oid;
 
        status = dcerpc_RemoteActivation(p, mem_ctx, &r);
        if(NT_STATUS_IS_ERR(status)) {
@@ -55,8 +63,8 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uin
                return 0;
        }
 
-       if(!W_ERROR_IS_OK(r.out.hr)) {
-               fprintf(stderr, "RemoteActivation: %s\n", win_errstr(r.out.hr));
+       if(!W_ERROR_IS_OK(*r.out.hr)) {
+               fprintf(stderr, "RemoteActivation: %s\n", win_errstr(*r.out.hr));
                return 0;
        }
 
@@ -65,8 +73,6 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uin
                return 0;
        }
 
-       *oid = r.out.ipidRemUnknown;
-       *oxid = r.out.pOxid;
 
        return 1;
 }
@@ -185,7 +191,7 @@ static int test_ResolveOxid2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint64_
                return 0;
        }
        
-       printf("Remote server versions: %d, %d\n", r.out.ComVersion.MajorVersion, r.out.ComVersion.MinorVersion);
+       printf("Remote server versions: %d, %d\n", r.out.ComVersion->MajorVersion, r.out.ComVersion->MinorVersion);
 
        return 1;
 }
@@ -211,7 +217,7 @@ static int test_ServerAlive2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        return 1;
 }
 
-BOOL torture_rpc_oxidresolve(void)
+BOOL torture_rpc_oxidresolve(struct torture_context *torture)
 {
         NTSTATUS status;
        struct dcerpc_pipe *p, *premact;
@@ -225,9 +231,7 @@ BOOL torture_rpc_oxidresolve(void)
 
        status = torture_rpc_connection(mem_ctx, 
                                        &premact, 
-                                       DCERPC_IREMOTEACTIVATION_NAME, 
-                                       DCERPC_IREMOTEACTIVATION_UUID, 
-                                       DCERPC_IREMOTEACTIVATION_VERSION);                                                              
+                                       &ndr_table_IRemoteActivation);
                        
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(mem_ctx);
@@ -236,9 +240,7 @@ BOOL torture_rpc_oxidresolve(void)
 
        status = torture_rpc_connection(mem_ctx, 
                                        &p, 
-                                       DCERPC_IOXIDRESOLVER_NAME, 
-                                       DCERPC_IOXIDRESOLVER_UUID, 
-                                       DCERPC_IOXIDRESOLVER_VERSION);
+                                       &ndr_table_IOXIDResolver);
 
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(mem_ctx);