From 620d375320e143abcf6775a392f9bde3146f2baa Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 25 Dec 2005 01:33:35 +0000 Subject: r12465: Merge Parse::Pidl::Samba4::NDR::Header into Parse::Pidl::Samba4::NDR::Parser. Small optimization to avoid including NDR headers multiple times (This used to be commit 6967b9884970b6f1d7617196ab024d401628a13c) --- source4/librpc/idl/drsblobs.idl | 4 ++-- source4/librpc/idl/drsuapi.idl | 6 +++--- source4/librpc/idl/spoolss.idl | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source4/librpc') diff --git a/source4/librpc/idl/drsblobs.idl b/source4/librpc/idl/drsblobs.idl index 8c8684969d..c83ce8c799 100644 --- a/source4/librpc/idl/drsblobs.idl +++ b/source4/librpc/idl/drsblobs.idl @@ -83,11 +83,11 @@ interface drsblobs { * w2k uses version 1 * w2k3 uses version 1 */ - typedef [gensize] struct { + typedef [public,gensize] struct { asclstr dns_name; } repsFromTo1OtherInfo; - typedef [gensize,flag(NDR_PAHEX)] struct { + typedef [public,gensize,flag(NDR_PAHEX)] struct { /* this includes the 8 bytes of the repsFromToBlob header */ [value(ndr_size_repsFromTo1(r, ndr->flags)+8)] uint32 blobsize; uint32 consecutive_sync_failures; diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl index c03892d5dc..ff76e65e51 100644 --- a/source4/librpc/idl/drsuapi.idl +++ b/source4/librpc/idl/drsuapi.idl @@ -119,7 +119,7 @@ interface drsuapi /*****************/ /* Function 0x02 */ - typedef [gensize] struct { + typedef [public,gensize] struct { [value(ndr_size_drsuapi_DsReplicaObjectIdentifier(r, ndr->flags)-4)] uint32 __ndr_size; [value(ndr_length_dom_sid(&r->sid))] uint32 __ndr_size_sid; GUID guid; @@ -441,7 +441,7 @@ interface drsuapi } drsuapi_DsAttributeValueCtrUnicodeString; /* DN String values */ - typedef [gensize] struct { + typedef [public,gensize] struct { [value(ndr_size_drsuapi_DsReplicaObjectIdentifier3(r, ndr->flags))] uint32 __ndr_size; [value(ndr_length_dom_sid(&r->sid))] uint32 __ndr_size_sid; GUID guid; @@ -582,7 +582,7 @@ interface drsuapi drsuapi_DsReplicaMetaDataCtr *meta_data_ctr; } drsuapi_DsReplicaObjectListItemEx; - typedef [gensize] struct { + typedef [public,gensize] struct { GUID guid1; GUID guid2; drsuapi_DsReplicaObjectIdentifier *naming_context; diff --git a/source4/librpc/idl/spoolss.idl b/source4/librpc/idl/spoolss.idl index e1cd336287..bb01185474 100644 --- a/source4/librpc/idl/spoolss.idl +++ b/source4/librpc/idl/spoolss.idl @@ -56,7 +56,7 @@ uint32 unknown29; } spoolss_PrinterInfo0; - typedef [gensize] struct { + typedef [public,gensize] struct { string32 devicename; uint16 specversion; uint16 driverversion; @@ -752,7 +752,7 @@ SPOOLSS_PRINTER_DATA_TYPE_STRING_ARRAY = 7 } spoolss_PrinterDataType; - typedef [nodiscriminant,gensize] union { + typedef [nodiscriminant,public,gensize] union { [case(SPOOLSS_PRINTER_DATA_TYPE_NULL)]; [case(SPOOLSS_PRINTER_DATA_TYPE_STRING)] nstring string; [case(SPOOLSS_PRINTER_DATA_TYPE_BINARY),flag(NDR_REMAINING)] DATA_BLOB binary; -- cgit