summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-11-04 23:57:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:29 -0500
commit96ffc6d945e9318f749796e63a76e6b52a289daa (patch)
tree4ee787ef00096e6bee3b5580194b79099293f363
parentb2617daeb658af9959ea71432d87fa4273b7f1a4 (diff)
downloadsamba-96ffc6d945e9318f749796e63a76e6b52a289daa.tar.gz
samba-96ffc6d945e9318f749796e63a76e6b52a289daa.tar.bz2
samba-96ffc6d945e9318f749796e63a76e6b52a289daa.zip
r3536: Some minor IDL updates/fixes/additions
(This used to be commit 6fab01df000a126d2d01c41ead952d027f755309)
-rw-r--r--source4/librpc/idl/dcerpc.idl1
-rw-r--r--source4/librpc/idl/dcom.idl30
2 files changed, 17 insertions, 14 deletions
diff --git a/source4/librpc/idl/dcerpc.idl b/source4/librpc/idl/dcerpc.idl
index 758cf45616..cd87539589 100644
--- a/source4/librpc/idl/dcerpc.idl
+++ b/source4/librpc/idl/dcerpc.idl
@@ -113,6 +113,7 @@ interface dcerpc
const uint8 DCERPC_AUTH_TYPE_SCHANNEL = 68;
const uint8 DCERPC_AUTH_TYPE_MSMQ = 100;
+ const uint8 DCERPC_AUTH_LEVEL_DEFAULT = DCERPC_AUTH_LEVEL_CONNECT;
const uint8 DCERPC_AUTH_LEVEL_NONE = 1;
const uint8 DCERPC_AUTH_LEVEL_CONNECT = 2;
const uint8 DCERPC_AUTH_LEVEL_CALL = 3;
diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl
index 9d37e5bc44..615d812b47 100644
--- a/source4/librpc/idl/dcom.idl
+++ b/source4/librpc/idl/dcom.idl
@@ -365,11 +365,19 @@ interface IRemUnknown : IUnknown
object
] interface IClassActivator : IUnknown
{
- void RemoteGetClassObject([in] GUID clsid,
- [in] uint32 context,
- [in] LCID locale,
- [in] GUID iid,
- [out, iid_is(iid)] MInterfacePointer data);
+ void GetClassObject([in] GUID clsid,
+ [in] uint32 context,
+ [in] LCID locale,
+ [in] GUID iid,
+ [out, iid_is(iid)] MInterfacePointer data);
+}
+
+[
+ uuid("00000136-0000-0000-c000-000000000046"),
+ object
+] interface ISCMLocalActivator : IClassActivator
+{
+ WERROR ISCMLocalActivator_CreateInstance( );
}
/* Looks like this is the equivalent of .NET's
@@ -380,7 +388,7 @@ interface IRemUnknown : IUnknown
]
interface ISystemActivator : IClassActivator
{
- WERROR ISystemActivatorRemoteCreateInstance([in] HYPER_T unknown1, /* IPID ? */
+ WERROR ISystemActivatorRemoteCreateInstance([in] HYPER_T unknown1, /* OXID ? */
[in] MInterfacePointer iface,
[in] HYPER_T unknown2,
[out] uint32 unknown3,
@@ -411,9 +419,8 @@ interface IRemUnknown2 : IRemUnknown
[
object,
uuid("00000136-0000-0000-C000-000000000046")
- ] interface ISCMActivator : IUnknown
+ ] interface ISCMActivator : IClassActivator
{
- WERROR SCMActivator_GetClassObject();
WERROR SCMActivator_CreateInstance();
}
@@ -428,11 +435,6 @@ object,
[out] uint16 *pctinfo);
typedef struct {
- uint8 FIXME;
- } ITypeInfo;
-
- typedef struct {
- ITypeInfo *pTInfo;
} REF_ITypeInfo;
/*****************/
@@ -480,6 +482,7 @@ object,
[
object,
+ local,
uuid("00000003-0000-0000-C000-000000000046")
] interface IMarshal : IUnknown
{
@@ -487,7 +490,6 @@ object,
WERROR UnMarshalInterface();
}
-
[
uuid(DB7C21F8-FE33-4C11-AEA5-CEB56F076FBB),
helpstring("CoffeeMachine Class")