dcom: Remove remainder of DCOM test client code
authorAndrew Bartlett <abartlet@samba.org>
Wed, 26 Jul 2023 20:17:07 +0000 (08:17 +1200)
committerStefan Metzmacher <metze@samba.org>
Fri, 28 Jul 2023 10:48:32 +0000 (10:48 +0000)
This follows f2416493c0c779356606aebf0aceca8fa416b55c, removing the remaining parts
of our DCOM effort.  This can be resumed at a later time, but for now this is untested
(as we have no server) and just uses build time.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
librpc/wscript_build
selftest/skip
source4/librpc/wscript_build
source4/torture/rpc/oxidresolve.c [deleted file]
source4/torture/rpc/remact.c [deleted file]
source4/torture/rpc/rpc.c
source4/torture/wscript_build

index cd1988033d2953c8512511ac3ead3d8d484650ee..0a2fc9f6b0bbddf23c2f7d1472adc6a8be640006 100644 (file)
@@ -570,16 +570,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_MGMT',
     deps='tevent NDR_MGMT'
     )
 
-bld.SAMBA_SUBSYSTEM('RPC_NDR_OXIDRESOLVER',
-    source='gen_ndr/ndr_oxidresolver_c.c',
-    public_deps='dcerpc-binding NDR_OXIDRESOLVER'
-    )
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_REMACT',
-    source='gen_ndr/ndr_remact_c.c',
-    public_deps='dcerpc-binding NDR_REMACT'
-    )
-
 bld.SAMBA_SUBSYSTEM('RPC_NDR_NTSVCS',
     source='gen_ndr/ndr_ntsvcs_c.c',
     public_deps='dcerpc-binding ndr-standard'
index a8b866636892517179c4d923d08967fce6ea4a34..e808367c00db7e03324b4ac4a06d8f133bc39ba1 100644 (file)
 ^samba4.ntvfs.cifs.*.base.smb
 ^samba4.ntvfs.cifs.*.raw.
 ^samba4.rpc.samsync
-^samba4.rpc.remact                                                     # Not provided by Samba 4
-^samba4.rpc.oxidresolve                                                # Not provided by Samba 4
 ^samba4.rpc.eventlog                                           # Not provided by Samba 4
 ^samba4.rpc.initshutdown                                       # Not provided by Samba 4
 ^samba4.rpc.spoolss                                            # Not provided by Samba 4
index a1c97cbddb3344057290b1b32511935f4e57790a..0210d040fb96abe48e2eede0e2da92071588e595 100644 (file)
@@ -78,8 +78,6 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
                     NDR_MSGSVC
                     NDR_WINSIF
                     NDR_MGMT
-                    NDR_OXIDRESOLVER
-                    NDR_REMACT
                     NDR_WZCSVC
                     NDR_BROWSER
                     NDR_W32TIME
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
deleted file mode 100644 (file)
index 11cd8fe..0000000
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   test suite for oxidresolve operations
-
-   Copyright (C) Jelmer Vernooij 2004
-
-   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 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   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, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.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/torture_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 bool test_RemoteActivation(struct torture_context *tctx,
-                                uint64_t *oxid, struct GUID *oid)
-{
-       struct RemoteActivation r;
-       NTSTATUS status;
-       struct GUID iids[2];
-       uint16_t protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID };
-       struct dcerpc_pipe *p;
-       struct dcerpc_binding_handle *b;
-       struct ORPCTHAT that;
-       struct DUALSTRINGARRAY *pdsaOxidBindings;
-       uint32_t AuthnHint;
-       struct COMVERSION ServerVersion;
-       HRESULT hr;
-       struct MInterfacePointer *ifaces;
-
-       status = torture_rpc_connection(tctx, &p,
-                                       &ndr_table_IRemoteActivation);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               return false;
-       }
-       b = p->binding_handle;
-
-       ZERO_STRUCT(r);
-
-       r.in.this_object.version.MajorVersion = 5;
-       r.in.this_object.version.MinorVersion = 1;
-       r.in.this_object.cid = GUID_random();
-       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;
-       iids[0] = IUnknown_uuid;
-       r.in.pIIDs = iids;
-
-       r.out.that = &that;
-       r.out.pOxid = oxid;
-       r.out.pdsaOxidBindings = &pdsaOxidBindings;
-       r.out.ipidRemUnknown = oid;
-       r.out.AuthnHint = &AuthnHint;
-       r.out.ServerVersion = &ServerVersion;
-       r.out.hr = &hr;
-       r.out.ifaces = &ifaces;
-
-       status = dcerpc_RemoteActivation_r(b, tctx, &r);
-       torture_assert_ntstatus_ok(tctx, status, "RemoteActivation failed");
-       torture_assert_werr_ok(tctx, r.out.result, "RemoteActivation failed");
-       torture_assert_hresult_ok(tctx, *r.out.hr, "RemoteActivation failed");
-       torture_assert_hresult_ok(tctx, r.out.results[0], "RemoteActivation failed");
-
-       return true;
-}
-
-static bool test_SimplePing(struct torture_context *tctx,
-                          struct dcerpc_pipe *p)
-{
-       struct SimplePing r;
-       NTSTATUS status;
-       uint64_t setid;
-       struct dcerpc_binding_handle *b = p->binding_handle;
-
-       r.in.SetId = &setid;
-
-       status = dcerpc_SimplePing_r(b, tctx, &r);
-       torture_assert_ntstatus_ok(tctx, status, "SimplePing");
-       torture_assert_werr_ok(tctx, r.out.result, "SimplePing");
-
-       return true;
-}
-
-static bool test_ComplexPing(struct torture_context *tctx,
-                            struct dcerpc_pipe *p)
-{
-       struct ComplexPing r;
-       NTSTATUS status;
-       uint64_t setid;
-       struct GUID oid;
-       uint64_t oxid;
-       struct dcerpc_binding_handle *b = p->binding_handle;
-
-       if (!test_RemoteActivation(tctx, &oxid, &oid))
-               return false;
-
-       setid = 0;
-       ZERO_STRUCT(r.in);
-
-       r.in.SequenceNum = 0;
-       r.in.SetId = &setid;
-       r.in.cAddToSet = 1;
-       r.in.AddToSet = &oid;
-
-       status = dcerpc_ComplexPing_r(b, tctx, &r);
-       if(NT_STATUS_IS_ERR(status)) {
-               fprintf(stderr, "ComplexPing: %s\n", nt_errstr(status));
-               return 0;
-       }
-
-       if(!W_ERROR_IS_OK(r.out.result)) {
-               fprintf(stderr, "ComplexPing: %s\n", win_errstr(r.out.result));
-               return 0;
-       }
-
-
-
-       return 1;
-}
-
-static bool test_ServerAlive(struct torture_context *tctx,
-                           struct dcerpc_pipe *p)
-{
-       struct ServerAlive r;
-       NTSTATUS status;
-       struct dcerpc_binding_handle *b = p->binding_handle;
-
-       status = dcerpc_ServerAlive_r(b, tctx, &r);
-       torture_assert_ntstatus_ok(tctx, status, "ServerAlive");
-       torture_assert_werr_ok(tctx, r.out.result, "ServerAlive");
-
-       return true;
-}
-
-static bool test_ResolveOxid(struct torture_context *tctx,
-                            struct dcerpc_pipe *p)
-{
-       struct ResolveOxid r;
-       NTSTATUS status;
-       uint16_t protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB };
-       uint64_t oxid;
-       struct GUID oid;
-       struct dcerpc_binding_handle *b = p->binding_handle;
-       struct DUALSTRINGARRAY *ppdsaOxidBindings;
-       struct GUID pipidRemUnknown;
-       uint32_t pAuthnHint;
-
-       if (!test_RemoteActivation(tctx, &oxid, &oid))
-               return false;
-
-       r.in.pOxid = oxid;
-       r.in.cRequestedProtseqs = 2;
-       r.in.arRequestedProtseqs = protseq;
-       r.out.ppdsaOxidBindings = &ppdsaOxidBindings;
-       r.out.pipidRemUnknown = &pipidRemUnknown;
-       r.out.pAuthnHint = &pAuthnHint;
-
-       status = dcerpc_ResolveOxid_r(b, tctx, &r);
-       torture_assert_ntstatus_ok(tctx, status, "ResolveOxid");
-       torture_assert_werr_ok(tctx, r.out.result, "ResolveOxid");
-
-       return true;
-}
-
-static bool test_ResolveOxid2(struct torture_context *tctx,
-                             struct dcerpc_pipe *p)
-{
-       struct ResolveOxid2 r;
-       NTSTATUS status;
-       uint16_t protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB };
-       uint64_t oxid;
-       struct GUID oid;
-       struct dcerpc_binding_handle *b = p->binding_handle;
-       struct DUALSTRINGARRAY *pdsaOxidBindings;
-       struct GUID ipidRemUnknown;
-       uint32_t AuthnHint;
-       struct COMVERSION ComVersion;
-
-       if (!test_RemoteActivation(tctx, &oxid, &oid))
-               return false;
-
-       r.in.pOxid = oxid;
-       r.in.cRequestedProtseqs = 2;
-       r.in.arRequestedProtseqs = protseq;
-       r.out.pdsaOxidBindings = &pdsaOxidBindings;
-       r.out.ipidRemUnknown = &ipidRemUnknown;
-       r.out.AuthnHint = &AuthnHint;
-       r.out.ComVersion = &ComVersion;
-
-       status = dcerpc_ResolveOxid2_r(b, tctx, &r);
-       torture_assert_ntstatus_ok(tctx, status, "ResolveOxid2");
-
-       torture_assert_werr_ok(tctx, r.out.result, "ResolveOxid2");
-
-       torture_comment(tctx, "Remote server versions: %d, %d\n", r.out.ComVersion->MajorVersion, r.out.ComVersion->MinorVersion);
-
-       return true;
-}
-
-static bool test_ServerAlive2(struct torture_context *tctx,
-                            struct dcerpc_pipe *p)
-{
-       struct ServerAlive2 r;
-       NTSTATUS status;
-       struct dcerpc_binding_handle *b = p->binding_handle;
-       struct COMINFO info;
-       struct DUALSTRINGARRAY *dualstring;
-       uint8_t pReserved;
-
-       r.out.info = &info;
-       r.out.dualstring = &dualstring;
-       r.out.pReserved = &pReserved;
-
-       status = dcerpc_ServerAlive2_r(b, tctx, &r);
-       torture_assert_ntstatus_ok(tctx, status, "ServerAlive2");
-       torture_assert_werr_ok(tctx, r.out.result, "ServerAlive2");
-
-       return true;
-}
-
-struct torture_suite *torture_rpc_oxidresolve(TALLOC_CTX *mem_ctx)
-{
-       struct torture_suite *suite = torture_suite_create(mem_ctx, "oxidresolve");
-       struct torture_rpc_tcase *tcase;
-
-       tcase = torture_suite_add_rpc_iface_tcase(suite, "oxidresolver",
-                                         &ndr_table_IOXIDResolver);
-
-       torture_rpc_tcase_add_test(tcase, "ServerAlive", test_ServerAlive);
-
-       torture_rpc_tcase_add_test(tcase, "ServerAlive2", test_ServerAlive2);
-
-       torture_rpc_tcase_add_test(tcase, "ComplexPing", test_ComplexPing);
-
-       torture_rpc_tcase_add_test(tcase, "SimplePing", test_SimplePing);
-
-       torture_rpc_tcase_add_test(tcase, "ResolveOxid", test_ResolveOxid);
-
-       torture_rpc_tcase_add_test(tcase, "ResolveOxid2", test_ResolveOxid2);
-
-       return suite;
-}
diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
deleted file mode 100644 (file)
index 9e9642e..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   test suite for remoteactivation operations
-
-   Copyright (C) Jelmer Vernooij 2004
-
-   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 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   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, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "librpc/gen_ndr/ndr_remact_c.h"
-#include "librpc/gen_ndr/ndr_epmapper_c.h"
-#include "torture/rpc/torture_rpc.h"
-
-#define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9"
-#define DCERPC_IUNKNOWN_UUID "00000000-0000-0000-c000-000000000046"
-#define DCERPC_ICLASSFACTORY_UUID "00000001-0000-0000-c000-000000000046"
-
-static bool test_RemoteActivation(struct torture_context *tctx,
-                                 struct dcerpc_pipe *p)
-{
-       struct RemoteActivation r;
-       NTSTATUS status;
-       struct GUID iids[1];
-       uint16_t protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID };
-       struct dcerpc_binding_handle *b = p->binding_handle;
-       struct ORPCTHAT that;
-       uint64_t pOxid;
-       struct DUALSTRINGARRAY *pdsaOxidBindings;
-       struct GUID ipidRemUnknown;
-       uint32_t AuthnHint;
-       struct COMVERSION ServerVersion;
-       HRESULT hr;
-       struct MInterfacePointer *ifaces;
-
-       ZERO_STRUCT(r);
-
-       r.in.this_object.version.MajorVersion = 5;
-       r.in.this_object.version.MinorVersion = 1;
-       r.in.this_object.cid = GUID_random();
-       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]);
-       r.in.pIIDs = iids;
-
-       r.out.that = &that;
-       r.out.pOxid = &pOxid;
-       r.out.pdsaOxidBindings = &pdsaOxidBindings;
-       r.out.ipidRemUnknown = &ipidRemUnknown;
-       r.out.AuthnHint = &AuthnHint;
-       r.out.ServerVersion = &ServerVersion;
-       r.out.hr = &hr;
-       r.out.ifaces = &ifaces;
-
-       status = dcerpc_RemoteActivation_r(b, tctx, &r);
-       torture_assert_ntstatus_ok(tctx, status, "RemoteActivation");
-
-       torture_assert_werr_ok(tctx, r.out.result, "RemoteActivation");
-
-       torture_assert_hresult_ok(tctx, *r.out.hr, "RemoteActivation");
-
-       torture_assert_hresult_ok(tctx, r.out.results[0], "RemoteActivation");
-
-       GUID_from_string(DCERPC_ICLASSFACTORY_UUID, &iids[0]);
-       r.in.Interfaces = 1;
-       r.in.Mode = MODE_GET_CLASS_OBJECT;
-
-       status = dcerpc_RemoteActivation_r(b, tctx, &r);
-       torture_assert_ntstatus_ok(tctx, status, "RemoteActivation(GetClassObject)");
-
-       torture_assert_werr_ok(tctx, r.out.result, "RemoteActivation(GetClassObject)");
-
-       torture_assert_hresult_ok(tctx, *r.out.hr, "RemoteActivation(GetClassObject)");
-
-       torture_assert_hresult_ok(tctx, r.out.results[0], "RemoteActivation(GetClassObject)");
-
-       return true;
-}
-
-struct torture_suite *torture_rpc_remact(TALLOC_CTX *mem_ctx)
-{
-       struct torture_suite *suite = torture_suite_create(mem_ctx, "remact");
-       struct torture_rpc_tcase *tcase;
-
-       tcase = torture_suite_add_rpc_iface_tcase(suite, "remact", &ndr_table_IRemoteActivation);
-
-       torture_rpc_tcase_add_test(tcase, "RemoteActivation", test_RemoteActivation);
-
-       return suite;
-}
index 773e564c0475a67896e94f42fb874fff5cf624aa..ea214e043c41f19b109949098740e2cedb9a9fdb 100644 (file)
@@ -628,8 +628,6 @@ NTSTATUS torture_rpc_init(TALLOC_CTX *ctx)
        torture_suite_add_suite(suite, torture_rpc_samr_priv(suite));
        torture_suite_add_suite(suite, torture_rpc_epmapper(suite));
        torture_suite_add_suite(suite, torture_rpc_initshutdown(suite));
-       torture_suite_add_suite(suite, torture_rpc_oxidresolve(suite));
-       torture_suite_add_suite(suite, torture_rpc_remact(suite));
        torture_suite_add_simple_test(suite, "mgmt", torture_rpc_mgmt);
        torture_suite_add_simple_test(suite, "scanner", torture_rpc_scanner);
        torture_suite_add_simple_test(suite, "countcalls", torture_rpc_countcalls);
index d870a3ab807641666b01c5cbdf0b23cce2953e58..3c4cefad1a59a056894682fd94d758eab74547f4 100644 (file)
@@ -113,8 +113,6 @@ bld.SAMBA_MODULE('torture_rpc',
                         rpc/epmapper.c
                         rpc/winreg.c
                         rpc/initshutdown.c
-                        rpc/oxidresolve.c
-                        rpc/remact.c
                         rpc/mgmt.c
                         rpc/scanner.c
                         rpc/countcalls.c
@@ -153,7 +151,6 @@ bld.SAMBA_MODULE('torture_rpc',
                       dcerpc-samr
                       RPC_NDR_WINREG
                       RPC_NDR_INITSHUTDOWN
-                      RPC_NDR_OXIDRESOLVER
                       RPC_NDR_EVENTLOG
                       RPC_NDR_ECHO
                       RPC_NDR_SVCCTL
@@ -168,8 +165,6 @@ bld.SAMBA_MODULE('torture_rpc',
                       RPC_NDR_SRVSVC
                       RPC_NDR_WKSSVC
                       RPC_NDR_DSSETUP
-                      RPC_NDR_REMACT
-                      RPC_NDR_OXIDRESOLVER
                       RPC_NDR_NTSVCS
                       %s
                       LIBCLI_AUTH