1 files changed, 19 insertions, 23 deletions

diff --git a/source4/librpc/idl/oxidresolver.idl b/source4/librpc/idl/oxidresolver.idl
index 4e33b5a639..611144e40b 100644
--- a/source4/librpc/idl/oxidresolver.idl
+++ b/source4/librpc/idl/oxidresolver.idl
@@ -29,17 +29,13 @@ interface IOXIDResolver
 	/* Method to get the protocol sequences, string bindings */
 	/* and machine id for an object server given its OXID. */
 
-	typedef [public] struct {
-		DUALSTRINGARRAY *ppdsaOxidBindings;
-	} ppdsaOxidBindingsArray;
-
 	[idempotent] WERROR ResolveOxid (
-		 [in] OXID *pOxid,
+		 [in] OXID pOxid,
 		 [in] uint16 cRequestedProtseqs,
 		 [in, size_is(cRequestedProtseqs)] uint16 arRequestedProtseqs[],
-		 [out, ref] ppdsaOxidBindingsArray *ppdsaOxidBindings,
-		 [out, ref] IPID *pipidRemUnknown,
-		 [out, ref] uint32 *pAuthnHint
+		 [out] DUALSTRINGARRAY *ppdsaOxidBindings,
+		 [out] IPID pipidRemUnknown,
+		 [out] uint32 pAuthnHint
 			 );
 
 	/* Simple ping is used to ping a Set. Client machines use this */
@@ -55,15 +51,16 @@ interface IOXIDResolver
 	/* whole set can subsequently be pinged using SimplePing, */
 	/* thus reducing network traffic. */
 	[idempotent] WERROR ComplexPing (
-		[in, out, ref] SETID *SetId, /* In of 0 on first call for new set. */
-		 [in] uint16 SequenceNum,
-		 [in] uint16 cAddToSet,
-		 [in] uint16 cDelFromSet,
+		[in] SETID *SetId, /* In of 0 on first call for new set. */
+		[out] SETID SetId,
+		[in] uint16 SequenceNum,
+		[in] uint16 cAddToSet,
+		[in] uint16 cDelFromSet,
 		/* add these OIDs to the set */
-		 [in, size_is(cAddToSet)] OID AddToSet[],
+		[in, size_is(cAddToSet)] OID AddToSet[],
 		/*remove these OIDs from the set */
-		 [in, size_is(cDelFromSet)] OID DelFromSet[],
-		[out] uint16 pPingBackoffFactor/* 2^factor = multipler */
+		[in, size_is(cDelFromSet)] OID DelFromSet[],
+		[out] uint16 PingBackoffFactor/* 2^factor = multipler */
 			 );
 
 	/* In some cases the client maybe unsure that a particular */
@@ -79,16 +76,15 @@ interface IOXIDResolver
 	/* version 5.2 and above. Looks like that means 
 	 * Windows 2003/XP and above */
 	[idempotent] WERROR ResolveOxid2 (
-											  [in] OXID *pOxid,
+											  [in] OXID pOxid,
 											  [in] uint16 cRequestedProtseqs,
-											  [in, size_is(cRequestedProtseqs)]
-											  uint16 arRequestedProtseqs[],
-											  [out, ref] ppdsaOxidBindingsArray *ppdsaOxidBindings,
-											  [out, ref] IPID *pipidRemUnknown,
-											  [out, ref] uint32 *pAuthnHint,
-											  [out, ref] COMVERSION *pComVersion
+											  [in, size_is(cRequestedProtseqs)] uint16 arRequestedProtseqs[],
+											  [out] DUALSTRINGARRAY *pdsaOxidBindings,
+											  [out] IPID ipidRemUnknown,
+											  [out] uint32 AuthnHint,
+											  [out] COMVERSION ComVersion
 											 );
-											 typedef struct {
+	typedef struct {
 		COMVERSION version;
 	  	uint32 unknown1;
 	} COMINFO;