Update generated DCE/RPC dissectors.

Now all generated dissectors can successfully compile.

Change-Id: I74728926915d5a9f1694cc49c753b80f213df767
Reviewed-on: https://code.wireshark.org/review/2598
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 29 insertions, 33 deletions

diff --git a/epan/dissectors/packet-dcerpc-rfr.c b/epan/dissectors/packet-dcerpc-rfr.c
index e9fd722f9c..86d184a5ea 100644
--- a/epan/dissectors/packet-dcerpc-rfr.c
+++ b/epan/dissectors/packet-dcerpc-rfr.c
@@ -1,16 +1,15 @@
 /* DO NOT EDIT
-	This filter was automatically generated
-	from rfr.idl and rfr.cnf.
+	This file was automatically generated by Pidl
+	from rfr/rfr.idl and rfr/rfr.cnf.
 
-	Pidl is a perl based IDL compiler for DCE/RPC idl files. 
+	Pidl is a perl based IDL compiler for DCE/RPC idl files.
 	It is maintained by the Samba team, not the Wireshark team.
-	Instructions on how to download and install Pidl can be 
+	Instructions on how to download and install Pidl can be
 	found at http://wiki.wireshark.org/Pidl
 */
 
 
 #include "config.h"
-
 #ifdef _MSC_VER
 #pragma warning(disable:4005)
 #pragma warning(disable:4013)
@@ -27,24 +26,21 @@
 #include "packet-windows-common.h"
 #include "packet-dcerpc-rfr.h"
 
-void proto_register_dcerpc_rfr(void);
-void proto_reg_handoff_dcerpc_rfr(void);
-
 /* Ett declarations */
 static gint ett_dcerpc_rfr = -1;
 
 
 /* Header field declarations */
-static gint hf_rfr_MAPISTATUS_status = -1;
-static gint hf_rfr_RfrGetFQDNFromLegacyDN_ulFlags = -1;
 static gint hf_rfr_RfrGetFQDNFromLegacyDN_szMailboxServerDN = -1;
-static gint hf_rfr_opnum = -1;
-static gint hf_rfr_RfrGetNewDSA_ulFlags = -1;
 static gint hf_rfr_RfrGetFQDNFromLegacyDN_cbMailboxServerDN = -1;
+static gint hf_rfr_RfrGetFQDNFromLegacyDN_ppszServerFQDN = -1;
+static gint hf_rfr_RfrGetFQDNFromLegacyDN_ulFlags = -1;
 static gint hf_rfr_RfrGetNewDSA_pUserDN = -1;
 static gint hf_rfr_RfrGetNewDSA_ppszUnused = -1;
+static gint hf_rfr_opnum = -1;
+static gint hf_rfr_MAPISTATUS_status = -1;
 static gint hf_rfr_RfrGetNewDSA_ppszServer = -1;
-static gint hf_rfr_RfrGetFQDNFromLegacyDN_ppszServerFQDN = -1;
+static gint hf_rfr_RfrGetNewDSA_ulFlags = -1;
 
 static gint proto_dcerpc_rfr = -1;
 /* Version information */
@@ -319,9 +315,9 @@ rfr_dissect_element_RfrGetNewDSA_ppszServer__(tvbuff_t *tvb _U_, int offset _U_,
 
 /* IDL: MAPISTATUS RfrGetNewDSA( */
 /* IDL: [in] uint32 ulFlags, */
-/* IDL: [ref] [in] [charset(DOS)] uint8 *pUserDN, */
+/* IDL: [ref] [charset(DOS)] [in] uint8 *pUserDN, */
 /* IDL: [out] [unique(1)] [in] [charset(DOS)] uint8 **ppszUnused, */
-/* IDL: [out] [unique(1)] [in] [charset(DOS)] uint8 **ppszServer */
+/* IDL: [charset(DOS)] [in] [out] [unique(1)] uint8 **ppszServer */
 /* IDL: ); */
 
 static int
@@ -404,7 +400,7 @@ rfr_dissect_element_RfrGetFQDNFromLegacyDN_ppszServerFQDN(tvbuff_t *tvb _U_, int
 static int
 rfr_dissect_element_RfrGetFQDNFromLegacyDN_ppszServerFQDN_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
-	offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, di, drep, rfr_dissect_element_RfrGetFQDNFromLegacyDN_ppszServerFQDN__, NDR_POINTER_REF, "Pointer to Ppszserverfqdn (uint8)",hf_rfr_RfrGetFQDNFromLegacyDN_ppszServerFQDN);
+	offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, di, drep, rfr_dissect_element_RfrGetFQDNFromLegacyDN_ppszServerFQDN__, NDR_POINTER_UNIQUE, "Pointer to Ppszserverfqdn (uint8)",hf_rfr_RfrGetFQDNFromLegacyDN_ppszServerFQDN);
 
 	return offset;
 }
@@ -422,8 +418,8 @@ rfr_dissect_element_RfrGetFQDNFromLegacyDN_ppszServerFQDN__(tvbuff_t *tvb _U_, i
 
 /* IDL: MAPISTATUS RfrGetFQDNFromLegacyDN( */
 /* IDL: [in] uint32 ulFlags, */
-/* IDL: [in] [range(10 1024)] uint32 cbMailboxServerDN, */
-/* IDL: [ref] [in] [charset(DOS)] [size_is(cbMailboxServerDN)] uint8 *szMailboxServerDN, */
+/* IDL: [range(10,1024)] [in] uint32 cbMailboxServerDN, */
+/* IDL: [size_is(cbMailboxServerDN)] [in] [ref] [charset(DOS)] uint8 *szMailboxServerDN, */
 /* IDL: [out] [ref] [charset(DOS)] uint8 **ppszServerFQDN */
 /* IDL: ); */
 
@@ -468,26 +464,26 @@ static dcerpc_sub_dissector rfr_dissectors[] = {
 void proto_register_dcerpc_rfr(void)
 {
 	static hf_register_info hf[] = {
-	{ &hf_rfr_MAPISTATUS_status, 
-	  { "MAPISTATUS", "rfr.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(rfr_MAPISTATUS_vals), 0, NULL, HFILL }},
-	{ &hf_rfr_RfrGetFQDNFromLegacyDN_ulFlags, 
-	  { "Ulflags", "rfr.RfrGetFQDNFromLegacyDN.ulFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_rfr_RfrGetFQDNFromLegacyDN_szMailboxServerDN, 
+	{ &hf_rfr_RfrGetFQDNFromLegacyDN_szMailboxServerDN,
 	  { "Szmailboxserverdn", "rfr.RfrGetFQDNFromLegacyDN.szMailboxServerDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_rfr_opnum, 
-	  { "Operation", "rfr.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_rfr_RfrGetNewDSA_ulFlags, 
-	  { "Ulflags", "rfr.RfrGetNewDSA.ulFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_rfr_RfrGetFQDNFromLegacyDN_cbMailboxServerDN, 
+	{ &hf_rfr_RfrGetFQDNFromLegacyDN_cbMailboxServerDN,
 	  { "Cbmailboxserverdn", "rfr.RfrGetFQDNFromLegacyDN.cbMailboxServerDN", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
-	{ &hf_rfr_RfrGetNewDSA_pUserDN, 
+	{ &hf_rfr_RfrGetFQDNFromLegacyDN_ppszServerFQDN,
+	  { "Ppszserverfqdn", "rfr.RfrGetFQDNFromLegacyDN.ppszServerFQDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_rfr_RfrGetFQDNFromLegacyDN_ulFlags,
+	  { "Ulflags", "rfr.RfrGetFQDNFromLegacyDN.ulFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_rfr_RfrGetNewDSA_pUserDN,
 	  { "Puserdn", "rfr.RfrGetNewDSA.pUserDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_rfr_RfrGetNewDSA_ppszUnused, 
+	{ &hf_rfr_RfrGetNewDSA_ppszUnused,
 	  { "Ppszunused", "rfr.RfrGetNewDSA.ppszUnused", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_rfr_RfrGetNewDSA_ppszServer, 
+	{ &hf_rfr_opnum,
+	  { "Operation", "rfr.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+	{ &hf_rfr_MAPISTATUS_status,
+	  { "MAPISTATUS", "rfr.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(rfr_MAPISTATUS_vals), 0, NULL, HFILL }},
+	{ &hf_rfr_RfrGetNewDSA_ppszServer,
 	  { "Ppszserver", "rfr.RfrGetNewDSA.ppszServer", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-	{ &hf_rfr_RfrGetFQDNFromLegacyDN_ppszServerFQDN, 
-	  { "Ppszserverfqdn", "rfr.RfrGetFQDNFromLegacyDN.ppszServerFQDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+	{ &hf_rfr_RfrGetNewDSA_ulFlags,
+	  { "Ulflags", "rfr.RfrGetNewDSA.ulFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	};