summaryrefslogtreecommitdiff
path: root/source4/librpc
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-10-31 18:37:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:07 -0500
commitad4c40b9278522e36c3d50d80658f03d9f8da805 (patch)
treec9527207c274cdb35fc1521facd32e1c8fb51316 /source4/librpc
parentb33f17e11b801a002829a98bcac2c70d64f9c950 (diff)
downloadsamba-ad4c40b9278522e36c3d50d80658f03d9f8da805.tar.gz
samba-ad4c40b9278522e36c3d50d80658f03d9f8da805.tar.bz2
samba-ad4c40b9278522e36c3d50d80658f03d9f8da805.zip
r3413: RemoteActivation updates and fixes
Add torture test for RemoteActivation The request is now send correctly and we get back a valid response from Windows but r->in.Interfaces is set to 0 somewhere while parsing the response... (This used to be commit cabec03422f0c7140b56b2d5c4ec8ca663b406fc)
Diffstat (limited to 'source4/librpc')
-rw-r--r--source4/librpc/idl/dcom.idl10
-rw-r--r--source4/librpc/idl/remact.idl28
2 files changed, 15 insertions, 23 deletions
diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl
index d51d9ccaa3..864a764705 100644
--- a/source4/librpc/idl/dcom.idl
+++ b/source4/librpc/idl/dcom.idl
@@ -480,16 +480,6 @@ object,
}
[
-object,
- uuid("330E9E75-DF48-11CF-8E2C-00A0C90DC94B"),
- pointer_default(unique)
- ]
- interface IDcomEchoServ : IDispatch
-{
- HRESULT EchoPlusOne([in] uint32 x, [out] uint32 *y);
-}
-
-[
object,
uuid("00000003-0000-0000-C000-000000000046")
] interface IMarshal : IUnknown
diff --git a/source4/librpc/idl/remact.idl b/source4/librpc/idl/remact.idl
index 1756ed3c8b..b9e73a2b14 100644
--- a/source4/librpc/idl/remact.idl
+++ b/source4/librpc/idl/remact.idl
@@ -14,17 +14,19 @@
]
interface IRemoteActivation
{
- typedef struct {
- /* Looks very much like a protocol tower to me, but it appears
- to be aligned differently then it is in epmapper -jelmer
- */
- uint8 FIXME[12];
- } floor_tmp;
+ typedef enum
+ {
+ RPC_C_IMP_LEVEL_DEFAULT = 0,
+ RPC_C_IMP_LEVEL_ANONYMOUS = 1,
+ RPC_C_IMP_LEVEL_IDENTIFY = 2,
+ RPC_C_IMP_LEVEL_IMPERSONATE = 3,
+ RPC_C_IMP_LEVEL_DELEGATE = 4
+ } imp_levels;
const uint32 MODE_GET_CLASS_OBJECT = 0xffffffff;
- HRESULT RemoteActivation (
- [in] ORPCTHIS ORPCthis,
- [out] ORPCTHAT ORPCthat,
+ WERROR RemoteActivation (
+ [in] ORPCTHIS this,
+ [out] ORPCTHAT that,
[in] GUID Clsid,
[in, unique] unistr *pwszObjectName,
[in, unique] MInterfacePointer *pObjectStorage,
@@ -33,13 +35,13 @@ interface IRemoteActivation
[in] uint32 Interfaces,
[in, unique,size_is(Interfaces)] GUID *pIIDs,
[in] uint16 num_protseqs,
- [in, size_is(num_protseqs)] floor_tmp protseq[],
+ [in, size_is(num_protseqs)] uint16 protseq[],
[out] HYPER_T pOxid,
[out] DUALSTRINGARRAY *pdsaOxidBindings,
[out] IPID ipidRemUnknown,
- [out] uint32 pAuthnHint,
- [out] COMVERSION pServerVersion,
- [out] HRESULT phr,
+ [out] uint32 AuthnHint,
+ [out] COMVERSION ServerVersion,
+ [out] HRESULT hr,
[out,size_is(Interfaces)] MInterfacePointer ifaces[],
[out,size_is(Interfaces)] HRESULT results[]
);