diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-03-06 21:43:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:10:59 -0500 |
| commit | 77ec3f684dc8563965ae5118ef5549925ea81d0f (patch) | |
| tree | 6069494061404ddf873fdfcdfe82d86267c2e1b3 /source4/torture | |
| parent | ffae01d432c715961c44e499258ee2a9f7e3d5f1 (diff) | |
| download | samba-77ec3f684dc8563965ae5118ef5549925ea81d0f.tar.gz samba-77ec3f684dc8563965ae5118ef5549925ea81d0f.tar.bz2 samba-77ec3f684dc8563965ae5118ef5549925ea81d0f.zip | |
r5674: - Re-enable DCOM support.
- Always put IID in vtables (useful for asserts)
- Add table to keep track of DCOM proxy classes
- Bunch of smaller bug fixes
(This used to be commit 26d5a0b92c66bc86d0c26f687f83fa712342ac32)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/com/simple.c | 15 | ||||
| -rw-r--r-- | source4/torture/config.mk | 6 |
2 files changed, 12 insertions, 9 deletions
diff --git a/source4/torture/com/simple.c b/source4/torture/com/simple.c index 369b03f151..32b269f475 100644 --- a/source4/torture/com/simple.c +++ b/source4/torture/com/simple.c @@ -44,12 +44,15 @@ static BOOL test_readwrite(TALLOC_CTX *mem_ctx, const char *host) GUID_from_string(COM_ISTREAM_UUID, &IID[0]); GUID_from_string(COM_IUNKNOWN_UUID, &IID[1]); GUID_from_string(CLSID_SIMPLE, &clsid); -/* error = dcom_create_object(ctx, &clsid, + + if (host) { + error = dcom_create_object(ctx, &clsid, host, 2, IID, &interfaces, - results);*/ - - error = com_create_object(ctx, &clsid, 2, IID, interfaces, results); + 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)); @@ -83,9 +86,9 @@ BOOL torture_com_simple(void) { 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, NULL); - ret &= test_readwrite(mem_ctx, lp_parm_string(-1, "torture", "dcomhost")); + ret &= test_readwrite(mem_ctx, host); talloc_free(mem_ctx); diff --git a/source4/torture/config.mk b/source4/torture/config.mk index 7519a03ac3..f46d964777 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -58,13 +58,13 @@ REQUIRED_SUBSYSTEMS = \ ################################# ################################# -# Start SUBSYSTEM TORTURE_DCOM +# Start SUBSYSTEM TORTURE_COM [SUBSYSTEM::TORTURE_COM] ADD_OBJ_FILES = \ torture/com/simple.o REQUIRED_SUBSYSTEMS = \ - LIBCOM -# End SUBSYSTEM TORTURE_DCOM + LIBCOM LIBDCOM +# End SUBSYSTEM TORTURE_COM ################################# ################################# |