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/librpc | |
| 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/librpc')
| -rw-r--r-- | source4/librpc/idl/dcom.idl | 2 | ||||
| -rw-r--r-- | source4/librpc/idl/orpc.idl | 4 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr_orpc.h (renamed from source4/librpc/ndr/ndr_dcom.h) | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl index 70a56c2ec5..3e4d9d0c2c 100644 --- a/source4/librpc/idl/dcom.idl +++ b/source4/librpc/idl/dcom.idl @@ -270,7 +270,7 @@ object, object ] interface ICoffeeMachine : IUnknown { - [helpstring("method MakeCoffee")] WERROR MakeCoffee(unistr *flavor); + [helpstring("method MakeCoffee")] WERROR MakeCoffee([in] unistr *flavor); } [ diff --git a/source4/librpc/idl/orpc.idl b/source4/librpc/idl/orpc.idl index 8b94059e89..34ef41377b 100644 --- a/source4/librpc/idl/orpc.idl +++ b/source4/librpc/idl/orpc.idl @@ -45,7 +45,7 @@ interface ObjectRpcBaseTypes } COMVERSION; /* enumeration of additional information present in the call packet. */ - typedef enum { + typedef bitmap { ORPCF_NULL = 0x00, /* no additional info in packet */ ORPCF_LOCAL = 0x01, /* call is local to this machine */ ORPCF_RESERVED1 = 0x02, /* reserved for local use */ @@ -130,7 +130,7 @@ interface ObjectRpcBaseTypes /* Flag values for a STDOBJREF (standard part of an OBJREF). */ /* SORF_OXRES1 - SORF_OXRES8 are reserved for the object exporters */ /* use only, object importers must ignore them and must not enforce MBZ. */ - typedef enum { + typedef bitmap { SORF_NULL = 0x0000, /* convenient for initializing SORF */ SORF_OXRES1 = 0x0001, /* reserved for exporter */ SORF_OXRES2 = 0x0020, /* reserved for exporter */ diff --git a/source4/librpc/ndr/ndr_dcom.h b/source4/librpc/ndr/ndr_orpc.h index 06c2681621..d1817969a4 100644 --- a/source4/librpc/ndr/ndr_dcom.h +++ b/source4/librpc/ndr/ndr_orpc.h @@ -20,6 +20,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef __NDR_ORPC_H__ +#define __NDR_ORPC_H__ + struct STRINGARRAY { struct STRINGBINDING **stringbindings; @@ -30,3 +33,5 @@ struct DUALSTRINGARRAY struct STRINGBINDING **stringbindings; struct SECURITYBINDING **securitybindings; }; + +#endif /* __NDR_ORPC_H__ */ |