r1818: _really_ fixed epmapper this time, it was using more than one old rpc interface method.

(This used to be commit ec41c73ae136bffea4285ade8be322b3c4cf3629)

1 files changed, 17 insertions, 22 deletions

diff --git a/source4/librpc/idl/epmapper.idl b/source4/librpc/idl/epmapper.idl
index 07508b7840..6a58dcfd7a 100644
--- a/source4/librpc/idl/epmapper.idl
+++ b/source4/librpc/idl/epmapper.idl
@@ -26,6 +26,8 @@ interface epmapper
 	*/
 
 	const int EPMAPPER_STATUS_NO_MORE_ENTRIES = 0x16c9a0d6;
+	const int EPMAPPER_STATUS_NO_MEMORY = 0x16C9A012;
+	const int EPMAPPER_STATUS_OK = 0;
 
 
 	/* this guid indicates NDR encoding in a protocol tower */
@@ -106,24 +108,22 @@ interface epmapper
     
 	/**********************/
 	/* Function 0x0       */
-	void epm_Insert(
+	error_status_t epm_Insert(
 		[in]    uint32          num_ents,
 		[in,size_is(num_ents)]  epm_entry_t         entries[],
-		[in]    uint32    replace,
-		[out]   error_status_t  status
+		[in]    uint32    replace
 		);
     
 	/**********************/
 	/* Function 0x1       */
-	void epm_Delete(
+	error_status_t epm_Delete(
 		[in]     uint32          num_ents,
-		[in, size_is(num_ents)]  epm_entry_t entries[],
-		[out]    error_status_t  status
+		[in, size_is(num_ents)]  epm_entry_t entries[]
 		);
     
 	/**********************/
 	/* Function 0x02      */
-	void epm_Lookup(
+	error_status_t epm_Lookup(
 		[in]            uint32          inquiry_type,
 		[in]            GUID            *object,
 		[in]            rpc_if_id_t     *interface_id,
@@ -131,8 +131,7 @@ interface epmapper
 		[in,out,ref]    policy_handle   *entry_handle,
 		[in]            uint32          max_ents,
 		[out]           uint32          num_ents,
-		[out, length_is(num_ents), size_is(max_ents)]  epm_entry_t entries[],
-		[out]           error_status_t  status
+		[out, length_is(num_ents), size_is(max_ents)]  epm_entry_t entries[]
 		);
 
 
@@ -143,42 +142,38 @@ interface epmapper
 		epm_twr_t *twr;
 	} epm_twr_p_t;
 
-	void epm_Map(
+	error_status_t epm_Map(
 		[in]            GUID            *object,
 		[in]            epm_twr_t       *map_tower,
 		[in,out,ref]    policy_handle   *entry_handle,
 		[in]            uint32          max_towers,
 		[out]           uint32          num_towers,
-		[out, length_is(num_towers), size_is(max_towers)]  epm_twr_p_t towers[],
-		[out]           error_status_t  status
+		[out, length_is(num_towers), size_is(max_towers)]  epm_twr_p_t towers[]
 		);
     
 
 	/**********************/
 	/* Function 0x04      */
-	void epm_LookupHandleFree(
-		[in,out,ref]    policy_handle *entry_handle,
-		[out]           error_status_t status
+	error_status_t epm_LookupHandleFree(
+		[in,out,ref]    policy_handle *entry_handle
 		);
     
 	/**********************/
 	/* Function 0x05      */
-	void epm_InqObject(
-		[out]           GUID        *epm_object,
-		[out]           error_status_t   status
+	error_status_t epm_InqObject(
+		[out]           GUID        *epm_object
 		);
     
 
 	/**********************/
 	/* Function 0x06      */
-	void epm_MgmtDelete(
+	error_status_t epm_MgmtDelete(
 		[in]            uint32   object_speced,
 		[in]            GUID     *object,
-		[in]            epm_twr_t    *tower,
-		[out]           error_status_t   status
+		[in]            epm_twr_t    *tower
 		);
 
 	/**********************/
 	/* Function 0x07      */
-	void epm_MapAuth();
+	error_status_t epm_MapAuth();
 }