diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2006-05-25 19:34:05 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:08:37 -0500 |
commit | aecb20a2646520d04e09fe37ea10cd5cc0a93f7b (patch) | |
tree | 01679a2dfaf8900a8b0cf0c54fbc83bf9044f718 /source4/torture | |
parent | 64fe1e92a5477ff24878985854d7dbb768382c7d (diff) | |
download | samba-aecb20a2646520d04e09fe37ea10cd5cc0a93f7b.tar.gz samba-aecb20a2646520d04e09fe37ea10cd5cc0a93f7b.tar.bz2 samba-aecb20a2646520d04e09fe37ea10cd5cc0a93f7b.zip |
r15892: Remove the COM management code - DCOM should be
based on Mono and its' COM support and utilize Samba's DCE/RPC + ORPC code
instead of having our own COM implementation in Samba, which is too much
work to implement and harder to code (C).
This only removes some of the code that I started working on to implement
the bits of COM I thought were needed to support DCOM from just Samba. This
code has never functioned properly, contains a couple of nasty hacks and
there should be no reason to pick it up again later, the processes are all
documented in the DCOM whitepaper.
This does NOT remove the marshalling code for the ORPC code or the torture
code that tested some of the ORPC code.
(This used to be commit 11df14219bf0b35329b293cae3234e064aabde54)
Diffstat (limited to 'source4/torture')
-rw-r--r-- | source4/torture/com/simple.c | 104 | ||||
-rw-r--r-- | source4/torture/config.mk | 10 | ||||
-rw-r--r-- | source4/torture/torture.c | 1 |
3 files changed, 0 insertions, 115 deletions
diff --git a/source4/torture/com/simple.c b/source4/torture/com/simple.c deleted file mode 100644 index 82aab476be..0000000000 --- a/source4/torture/com/simple.c +++ /dev/null @@ -1,104 +0,0 @@ -/* - Unix SMB/CIFS implementation. - run the "simple" example (D)COM program - - 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 2 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, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#include "includes.h" -#include "lib/com/com.h" -#include "lib/com/dcom/dcom.h" -#include "librpc/gen_ndr/com_dcom.h" -#include "lib/cmdline/popt_common.h" -#include "librpc/rpc/dcerpc.h" -#include "torture/torture.h" - -#define DEFAULT_TRANS 4096 - -static BOOL test_readwrite(TALLOC_CTX *mem_ctx, const char *host) -{ - BOOL ret = True; - struct GUID IID[2]; - struct GUID clsid; - WERROR error; - struct IUnknown *interfaces[3]; - WERROR results[2]; - struct com_context *ctx; - uint8_t test_data[5]; - int i; - - com_init(); - - com_init_ctx(&ctx, NULL); - dcom_client_init(ctx, cmdline_credentials); - - IID[0] = dcerpc_table_IStream.syntax_id.uuid; - IID[1] = dcerpc_table_IUnknown.syntax_id.uuid; - GUID_from_string(CLSID_SIMPLE, &clsid); - - if (host) { - error = dcom_create_object(ctx, &clsid, - host, 2, IID, - (struct IUnknown ***)&interfaces, - results); - } else { - error = com_create_object(ctx, &clsid, 2, IID, interfaces, results); - } - - if (!W_ERROR_IS_OK(error)) { - printf("(d)com_create_object failed - %s\n", win_errstr(error)); - return False; - } - - error = IStream_Read((struct IStream *)interfaces[0], mem_ctx, NULL, 20, 20, 30); - if (!W_ERROR_IS_OK(error)) { - printf("IStream::Read() failed - %s\n", win_errstr(error)); - ret = False; - } - - for (i = 0; i < 5; i++) { - test_data[i] = i+1; - } - - error = IStream_Write((struct IStream *)interfaces[0], mem_ctx, test_data, 5, NULL); - if (!W_ERROR_IS_OK(error)) { - printf("IStream::Write() failed - %s\n", win_errstr(error)); - ret = False; - } - - IUnknown_Release((struct IUnknown *)interfaces[1], mem_ctx); - - return True; -} - -BOOL torture_com_simple(struct torture_context *torture) -{ - BOOL ret = True; - TALLOC_CTX *mem_ctx = talloc_init("torture_dcom_simple"); - const char *host = lp_parm_string(-1, "dcom", "host"); - - ret &= test_readwrite(mem_ctx, host); - - talloc_free(mem_ctx); - - return ret; -} - -NTSTATUS torture_com_init(void) -{ - return register_torture_op("COM-SIMPLE", torture_com_simple, 0); -} diff --git a/source4/torture/config.mk b/source4/torture/config.mk index c674cd82f1..818778e479 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -97,16 +97,6 @@ PUBLIC_DEPENDENCIES = \ include smb2/config.mk -[MODULE::torture_com] -INIT_FUNCTION = torture_com_init -SUBSYSTEM = torture -PRIVATE_PROTO_HEADER = \ - com/proto.h -OBJ_FILES = \ - com/simple.o -PUBLIC_DEPENDENCIES = \ - com dcom POPT_CREDENTIALS - [MODULE::torture_rpc] # TORTURE_NET and TORTURE_NBT use functions from torture_rpc... OUTPUT_TYPE = INTEGRATED diff --git a/source4/torture/torture.c b/source4/torture/torture.c index b7cb74480c..fb4985fe1e 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -42,7 +42,6 @@ #include "torture/local/proto.h" #include "torture/nbench/proto.h" #include "torture/ldap/proto.h" -#include "torture/com/proto.h" #include "torture/nbt/proto.h" #include "torture/libnet/proto.h" #include "torture/util.h" |