From 485df40bf96abbd80d69ff2a9fdca86516a4eae7 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 7 Nov 2004 16:47:46 +0000 Subject: r3601: Lots of smaller DCOM updates and fixes. Adds oxid tables, proper use of contexts. (This used to be commit 93eb3cd99c4fb065a69eabcead0c33804259c976) --- source4/librpc/idl/dcom.idl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'source4/librpc/idl/dcom.idl') diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl index 615d812b47..41e2ccb73c 100644 --- a/source4/librpc/idl/dcom.idl +++ b/source4/librpc/idl/dcom.idl @@ -151,19 +151,19 @@ interface ObjectRpcBaseTypes /* DUALSTRINGARRAYS are the return type for arrays of network addresses, */ /* arrays of endpoints and arrays of both used in many ORPC interfaces */ - typedef struct + typedef [public] struct { uint16 wTowerId; /* Cannot be zero. */ - uint16 aNetworkAddr; /* Zero terminated. */ + nstring NetworkAddr; } STRINGBINDING; const uint16 COM_C_AUTHZ_NONE = 0xffff; - typedef struct + typedef [public] struct { uint16 wAuthnSvc; /* Cannot be zero. */ uint16 wAuthzSvc; /* Must not be zero. */ - uint16 aPrincName; /* Zero terminated. */ + nstring PrincName; } SECURITYBINDING; @@ -177,7 +177,6 @@ interface ObjectRpcBaseTypes [size_is(wNumEntries)] uint16 aStringArray[]; } DUALSTRINGARRAY; - /* signature value for OBJREF (object reference, actually the */ /* marshaled form of a COM interface). */ const uint32 OBJREF_SIGNATURE = 0x574f454d; /* 'MEOW' */ @@ -219,14 +218,14 @@ interface ObjectRpcBaseTypes typedef struct { STDOBJREF std; /* standard objref */ - DUALSTRINGARRAY saResAddr; /* resolver address */ + [flag(NDR_REMAINING)] DATA_BLOB saResAddr; /* resolver address */ } u_standard; typedef struct { STDOBJREF std; /* standard objref */ GUID clsid; /* Clsid of handler code */ - DUALSTRINGARRAY saResAddr; /* resolver address */ + [flag(NDR_REMAINING)] DATA_BLOB saResAddr; /* resolver address */ } u_handler; typedef struct -- cgit