diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-09-27 22:06:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:59:24 -0500 |
| commit | 322d1ccd9f40b838911a7c076ebf3fb754b2550c (patch) | |
| tree | 8c72313208124a33ff50358e099dad953c5f232e /source4/librpc | |
| parent | fc3c05e63f4fedb1532e86d9421490fda6435c79 (diff) | |
| download | samba-322d1ccd9f40b838911a7c076ebf3fb754b2550c.tar.gz samba-322d1ccd9f40b838911a7c076ebf3fb754b2550c.tar.bz2 samba-322d1ccd9f40b838911a7c076ebf3fb754b2550c.zip | |
r2699: Correct handle ServerAlive() and ServerAlive2() + add torture tests
(This used to be commit 9e74144aa8e5f9a8b6e3d5293833c4afeebeddb0)
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/idl/dcom.idl | 20 | ||||
| -rw-r--r-- | source4/librpc/idl/oxidresolver.idl | 9 |
2 files changed, 13 insertions, 16 deletions
diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl index df0bcbc80e..46a5122299 100644 --- a/source4/librpc/idl/dcom.idl +++ b/source4/librpc/idl/dcom.idl @@ -275,7 +275,7 @@ interface IUnknown /* Returns the interface with the specified IID if implemented by this object */ HRESULT QueryInterface([in] IID *riid - /*FIXME, [out] void **data*/); + /*FIXME, [out] void **data*/); /*****************/ /* Function 0x01 */ @@ -293,11 +293,15 @@ interface IUnknown pointer_default(unique) ] interface IClassFactory : IUnknown { - HRESULT CreateInstance(); + HRESULT CreateInstance(/*FIXME[in] IUnknown *pUnknown, + [in] IID *riid, + [out, iid_is(riid)] void **ppv*/); HRESULT RemoteCreateInstance(); - HRESULT LockServer(); + /* Set lock to TRUE when you want to do a lock + and set it to FALSE when you want to unlock */ + HRESULT LockServer([in] uint8 lock); HRESULT RemoteLockServer(); } @@ -451,16 +455,6 @@ interface ISystemActivator : IUnknown } -// Service Control Manager - -[ - uuid(), - version(2.0) -] interface SCM -{ - void SCM_Dummy(); -} - [ object, uuid(00000136-0000-0000-C000-000000000046) diff --git a/source4/librpc/idl/oxidresolver.idl b/source4/librpc/idl/oxidresolver.idl index 57c5cd439f..61e3049a10 100644 --- a/source4/librpc/idl/oxidresolver.idl +++ b/source4/librpc/idl/oxidresolver.idl @@ -86,10 +86,13 @@ interface IOXIDResolver [out, ref] uint32 *pAuthnHint, [out, ref] COMVERSION *pComVersion ); + typedef struct { + COMVERSION version; + uint32 unknown1; + } COMINFO; [idempotent] WERROR ServerAlive2 ( - [out] COMVERSION version, - [out] uint8 unknown1[4], + [out] COMINFO info, [out] DUALSTRINGARRAY dualstring, - [out] uint8 unknown2[5]); + [out] uint8 unknown2[3]); } |