git add -f bin/default/librpc/gen_ndr/packet-dcerpc-*

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-browser.c b/bin/default/librpc/gen_ndr/packet-dcerpc-browser.c
index 6c78ec2158838efd7f7ca6a7711e898e2353d504..12010ddf63b699b269d39d14537299ae514df984 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-browser.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-browser.c
@@ -73,8 +73,8 @@ static int browser_dissect_element_BrowserrSrvInfoUnion_info100(tvbuff_t *tvb _U
 static int browser_dissect_element_BrowserrSrvInfoUnion_info100_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int browser_dissect_element_BrowserrSrvInfoUnion_info101(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int browser_dissect_element_BrowserrSrvInfoUnion_info101_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int browser_dissect_element_BrowserrSrvInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int browser_dissect_element_BrowserrSrvInfo_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int browser_dissect_element_BrowserrSrvInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int browser_dissect_element_BrowserrSrvInfo_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int browser_dissect_element_BrowserrQueryOtherDomains_server_unc(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int browser_dissect_element_BrowserrQueryOtherDomains_server_unc_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int browser_dissect_element_BrowserrQueryOtherDomains_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -302,7 +302,7 @@ browser_dissect_BrowserrSrvInfoUnion(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-browser_dissect_element_BrowserrSrvInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+browser_dissect_element_BrowserrSrvInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_browser_BrowserrSrvInfo_level, level);
 
@@ -310,7 +310,7 @@ browser_dissect_element_BrowserrSrvInfo_level(tvbuff_t *tvb _U_, int offset _U_,
 }
 
 static int
-browser_dissect_element_BrowserrSrvInfo_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+browser_dissect_element_BrowserrSrvInfo_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = browser_dissect_BrowserrSrvInfoUnion(tvb, offset, pinfo, tree, drep, hf_browser_BrowserrSrvInfo_info, *level);
 
@@ -320,7 +320,7 @@ browser_dissect_element_BrowserrSrvInfo_info(tvbuff_t *tvb _U_, int offset _U_,
 int
 browser_dissect_struct_BrowserrSrvInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-dcerpc.c b/bin/default/librpc/gen_ndr/packet-dcerpc-dcerpc.c
index d8e37532347baa21dcc4fc23ab1192803021920e..b05ef0278b4e0d747e8ffce83aa63e27e5b69372 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-dcerpc.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-dcerpc.c
@@ -281,7 +281,7 @@ static int dcerpc_dissect_element_object_object(tvbuff_t *tvb _U_, int offset _U
 static int dcerpc_dissect_element_request_alloc_hint(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_request_context_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_request_opnum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_request_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
+static int dcerpc_dissect_element_request_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
 static int dcerpc_dissect_element_request__pad(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_request_stub_and_verifier(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_ack_ctx_result(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -302,8 +302,8 @@ static int dcerpc_dissect_element_bind_nak_versions_num_versions(tvbuff_t *tvb _
 static int dcerpc_dissect_element_bind_nak_versions_versions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_bind_nak_versions_versions_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_bind_nak_versions_ctr_v(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_bind_nak_reject_reason(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *reject_reason);
-static int dcerpc_dissect_element_bind_nak_versions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *reject_reason);
+static int dcerpc_dissect_element_bind_nak_reject_reason(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *reject_reason);
+static int dcerpc_dissect_element_bind_nak_versions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *reject_reason);
 static int dcerpc_dissect_element_response_alloc_hint(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_response_context_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_response_cancel_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -464,8 +464,8 @@ static int dcerpc_dissect_element_rts_cmds_ClientAddress(tvbuff_t *tvb _U_, int
 static int dcerpc_dissect_element_rts_cmds_AssociationGroupId(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_rts_cmds_Destination(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_rts_cmds_PingTrafficSentNotify(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_rts_cmd_CommandType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *CommandType);
-static int dcerpc_dissect_element_rts_cmd_Command(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *CommandType);
+static int dcerpc_dissect_element_rts_cmd_CommandType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *CommandType);
+static int dcerpc_dissect_element_rts_cmd_Command(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *CommandType);
 static const true_false_string dcerpc_rts_flags_RTS_FLAG_NONE_tfs = {
    "RTS_FLAG_NONE is SET",
    "RTS_FLAG_NONE is NOT SET",
@@ -558,7 +558,7 @@ static int dcerpc_dissect_element_ncacn_packet_auth_length(tvbuff_t *tvb _U_, in
 static int dcerpc_dissect_element_ncacn_packet_call_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_ncacn_packet_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint8 *ptype);
 static int dcerpc_dissect_element_ncadg_packet_rpc_vers(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_ncadg_packet_ptype(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *ptype);
+static int dcerpc_dissect_element_ncadg_packet_ptype(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint8 *ptype);
 static int dcerpc_dissect_element_ncadg_packet_pfc_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_ncadg_packet_ncadg_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_ncadg_packet_drep(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -577,7 +577,7 @@ static int dcerpc_dissect_element_ncadg_packet_len(tvbuff_t *tvb _U_, int offset
 static int dcerpc_dissect_element_ncadg_packet_fragnum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_ncadg_packet_auth_proto(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dcerpc_dissect_element_ncadg_packet_serial_low(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dcerpc_dissect_element_ncadg_packet_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *ptype);
+static int dcerpc_dissect_element_ncadg_packet_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint8 *ptype);
 
 
 /* IDL: struct { */
@@ -878,7 +878,7 @@ dcerpc_dissect_element_request_opnum(tvbuff_t *tvb _U_, int offset _U_, packet_i
 }
 
 static int
-dcerpc_dissect_element_request_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+dcerpc_dissect_element_request_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = dcerpc_dissect_object(tvb, offset, pinfo, tree, drep, hf_dcerpc_dcerpc_request_object, *);
 
@@ -1260,7 +1260,7 @@ dcerpc_dissect_bind_nak_versions_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_i
 /* IDL: } */
 
 static int
-dcerpc_dissect_element_bind_nak_reject_reason(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *reject_reason)
+dcerpc_dissect_element_bind_nak_reject_reason(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *reject_reason)
 {
        offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_dcerpc_dcerpc_bind_nak_reject_reason, reject_reason);
 
@@ -1268,7 +1268,7 @@ dcerpc_dissect_element_bind_nak_reject_reason(tvbuff_t *tvb _U_, int offset _U_,
 }
 
 static int
-dcerpc_dissect_element_bind_nak_versions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *reject_reason)
+dcerpc_dissect_element_bind_nak_versions(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *reject_reason)
 {
        offset = dcerpc_dissect_bind_nak_versions_ctr(tvb, offset, pinfo, tree, drep, hf_dcerpc_dcerpc_bind_nak_versions, *reject_reason);
 
@@ -1278,7 +1278,7 @@ dcerpc_dissect_element_bind_nak_versions(tvbuff_t *tvb _U_, int offset _U_, pack
 int
 dcerpc_dissect_struct_bind_nak(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g reject_reason;
+       guint16 reject_reason;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -3326,7 +3326,7 @@ dcerpc_dissect_rts_cmds(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U
 /* IDL: } */
 
 static int
-dcerpc_dissect_element_rts_cmd_CommandType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *CommandType)
+dcerpc_dissect_element_rts_cmd_CommandType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *CommandType)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_dcerpc_dcerpc_rts_cmd_CommandType, CommandType);
 
@@ -3334,7 +3334,7 @@ dcerpc_dissect_element_rts_cmd_CommandType(tvbuff_t *tvb _U_, int offset _U_, pa
 }
 
 static int
-dcerpc_dissect_element_rts_cmd_Command(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *CommandType)
+dcerpc_dissect_element_rts_cmd_Command(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *CommandType)
 {
        offset = dcerpc_dissect_rts_cmds(tvb, offset, pinfo, tree, drep, hf_dcerpc_dcerpc_rts_cmd_Command, *CommandType);
 
@@ -3344,7 +3344,7 @@ dcerpc_dissect_element_rts_cmd_Command(tvbuff_t *tvb _U_, int offset _U_, packet
 int
 dcerpc_dissect_struct_rts_cmd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g CommandType;
+       guint32 CommandType;
         Command;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
@@ -4063,7 +4063,7 @@ dcerpc_dissect_element_ncadg_packet_rpc_vers(tvbuff_t *tvb _U_, int offset _U_,
 }
 
 static int
-dcerpc_dissect_element_ncadg_packet_ptype(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *ptype)
+dcerpc_dissect_element_ncadg_packet_ptype(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint8 *ptype)
 {
        offset = PIDL_dissect_uint8(tvb, offset, pinfo, tree, drep, hf_dcerpc_ncadg_packet_ptype, ptype);
 
@@ -4219,7 +4219,7 @@ dcerpc_dissect_element_ncadg_packet_serial_low(tvbuff_t *tvb _U_, int offset _U_
 }
 
 static int
-dcerpc_dissect_element_ncadg_packet_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *ptype)
+dcerpc_dissect_element_ncadg_packet_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint8 *ptype)
 {
        offset = dcerpc_dissect_payload(tvb, offset, pinfo, tree, drep, hf_dcerpc_ncadg_packet_u, *ptype);
 
@@ -4229,7 +4229,7 @@ dcerpc_dissect_element_ncadg_packet_u(tvbuff_t *tvb _U_, int offset _U_, packet_
 int
 dcerpc_dissect_struct_ncadg_packet(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g ptype;
+       guint8 ptype;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-dfs.c b/bin/default/librpc/gen_ndr/packet-dcerpc-dfs.c
index 9e344d546f97c06b0367532934f17db7fe88a04a..15c97396e9cef7fc2cd9b38d916db65f3dcefc88 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-dfs.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-dfs.c
@@ -498,8 +498,8 @@ static int netdfs_dissect_element_dfs_EnumInfo_info200(tvbuff_t *tvb _U_, int of
 static int netdfs_dissect_element_dfs_EnumInfo_info200_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netdfs_dissect_element_dfs_EnumInfo_info300(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netdfs_dissect_element_dfs_EnumInfo_info300_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netdfs_dissect_element_dfs_EnumStruct_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int netdfs_dissect_element_dfs_EnumStruct_e(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int netdfs_dissect_element_dfs_EnumStruct_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int netdfs_dissect_element_dfs_EnumStruct_e(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int netdfs_dissect_element_dfs_UnknownStruct_unknown1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netdfs_dissect_element_dfs_UnknownStruct_unknown2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netdfs_dissect_element_dfs_UnknownStruct_unknown2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3493,7 +3493,7 @@ netdfs_dissect_dfs_EnumInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 /* IDL: } */
 
 static int
-netdfs_dissect_element_dfs_EnumStruct_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+netdfs_dissect_element_dfs_EnumStruct_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_netdfs_dfs_EnumStruct_level, level);
 
@@ -3501,7 +3501,7 @@ netdfs_dissect_element_dfs_EnumStruct_level(tvbuff_t *tvb _U_, int offset _U_, p
 }
 
 static int
-netdfs_dissect_element_dfs_EnumStruct_e(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+netdfs_dissect_element_dfs_EnumStruct_e(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = netdfs_dissect_dfs_EnumInfo(tvb, offset, pinfo, tree, drep, hf_netdfs_dfs_EnumStruct_e, *level);
 
@@ -3511,7 +3511,7 @@ netdfs_dissect_element_dfs_EnumStruct_e(tvbuff_t *tvb _U_, int offset _U_, packe
 int
 netdfs_dissect_struct_dfs_EnumStruct(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
         e;
        proto_item *item = NULL;
        proto_tree *tree = NULL;

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-dfsblobs.c b/bin/default/librpc/gen_ndr/packet-dcerpc-dfsblobs.c
index 2c34f446a05e16938f2edca6d7a5b12cd6e01084..95be91772189622231e2aeccdbbd579080bd19fc 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-dfsblobs.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-dfsblobs.c
@@ -156,18 +156,18 @@ static int dfsblobs_dissect_element_dfs_referral_r1(tvbuff_t *tvb _U_, int offse
 static int dfsblobs_dissect_element_dfs_referral_r2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dfsblobs_dissect_element_dfs_padding_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dfsblobs_dissect_element_dfs_padding_value_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dfsblobs_dissect_element_dfs_referral_v3_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *size);
+static int dfsblobs_dissect_element_dfs_referral_v3_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *size);
 static int dfsblobs_dissect_element_dfs_referral_v3_server_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dfsblobs_dissect_element_dfs_referral_v3_entry_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *entry_flags);
 static int dfsblobs_dissect_element_dfs_referral_v3_ttl(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dfsblobs_dissect_element_dfs_referral_v3_referrals(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
-static int dfsblobs_dissect_element_dfs_referral_v3_service_site_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
+static int dfsblobs_dissect_element_dfs_referral_v3_referrals(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
+static int dfsblobs_dissect_element_dfs_referral_v3_service_site_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
 static int dfsblobs_dissect_element_dfs_referral_version_v1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dfsblobs_dissect_element_dfs_referral_version_v2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dfsblobs_dissect_element_dfs_referral_version_v3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dfsblobs_dissect_element_dfs_referral_version_v4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int dfsblobs_dissect_element_dfs_referral_type_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
-static int dfsblobs_dissect_element_dfs_referral_type_referral(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
+static int dfsblobs_dissect_element_dfs_referral_type_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
+static int dfsblobs_dissect_element_dfs_referral_type_referral(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
 static int dfsblobs_dissect_element_dfs_referral_resp_path_consumed(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dfsblobs_dissect_element_dfs_referral_resp_nb_referrals(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int dfsblobs_dissect_element_dfs_referral_resp_header_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -814,7 +814,7 @@ dfsblobs_dissect_dfs_padding(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
 /* IDL: } */
 
 static int
-dfsblobs_dissect_element_dfs_referral_v3_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *size)
+dfsblobs_dissect_element_dfs_referral_v3_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *size)
 {
        offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_dfsblobs_dfs_referral_v3_size, size);
 
@@ -846,7 +846,7 @@ dfsblobs_dissect_element_dfs_referral_v3_ttl(tvbuff_t *tvb _U_, int offset _U_,
 }
 
 static int
-dfsblobs_dissect_element_dfs_referral_v3_referrals(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+dfsblobs_dissect_element_dfs_referral_v3_referrals(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = dfsblobs_dissect_dfs_referral(tvb, offset, pinfo, tree, drep, hf_dfsblobs_dfs_referral_v3_referrals, *);
 
@@ -854,7 +854,7 @@ dfsblobs_dissect_element_dfs_referral_v3_referrals(tvbuff_t *tvb _U_, int offset
 }
 
 static int
-dfsblobs_dissect_element_dfs_referral_v3_service_site_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+dfsblobs_dissect_element_dfs_referral_v3_service_site_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = dfsblobs_dissect_dfs_padding(tvb, offset, pinfo, tree, drep, hf_dfsblobs_dfs_referral_v3_service_site_guid, *);
 
@@ -864,7 +864,7 @@ dfsblobs_dissect_element_dfs_referral_v3_service_site_guid(tvbuff_t *tvb _U_, in
 int
 dfsblobs_dissect_struct_dfs_referral_v3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g size;
+       guint16 size;
        guint16 entry_flags;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
@@ -989,7 +989,7 @@ dfsblobs_dissect_dfs_referral_version(tvbuff_t *tvb _U_, int offset _U_, packet_
 /* IDL: } */
 
 static int
-dfsblobs_dissect_element_dfs_referral_type_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+dfsblobs_dissect_element_dfs_referral_type_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version)
 {
        offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_dfsblobs_dfs_referral_type_version, version);
 
@@ -997,7 +997,7 @@ dfsblobs_dissect_element_dfs_referral_type_version(tvbuff_t *tvb _U_, int offset
 }
 
 static int
-dfsblobs_dissect_element_dfs_referral_type_referral(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+dfsblobs_dissect_element_dfs_referral_type_referral(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version)
 {
        offset = dfsblobs_dissect_dfs_referral_version(tvb, offset, pinfo, tree, drep, hf_dfsblobs_dfs_referral_type_referral, *version);
 
@@ -1007,7 +1007,7 @@ dfsblobs_dissect_element_dfs_referral_type_referral(tvbuff_t *tvb _U_, int offse
 int
 dfsblobs_dissect_struct_dfs_referral_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g version;
+       guint16 version;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-drsblobs.c b/bin/default/librpc/gen_ndr/packet-dcerpc-drsblobs.c
index 0c3ca580de871fdbf7d5928b03868015665ccb88..0087284e5372b9e10667b8e8d65edb6202cbdf39 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-drsblobs.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-drsblobs.c
@@ -401,9 +401,9 @@ static int drsblobs_dissect_element_replPropertyMetaDataCtr1_reserved(tvbuff_t *
 static int drsblobs_dissect_element_replPropertyMetaDataCtr1_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_replPropertyMetaDataCtr1_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_replPropertyMetaDataCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_replPropertyMetaDataBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
+static int drsblobs_dissect_element_replPropertyMetaDataBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
 static int drsblobs_dissect_element_replPropertyMetaDataBlob_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_replPropertyMetaDataBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
+static int drsblobs_dissect_element_replPropertyMetaDataBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
 static int drsblobs_dissect_element_replUpToDateVectorCtr1_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_replUpToDateVectorCtr1_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_replUpToDateVectorCtr1_cursors(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -414,9 +414,9 @@ static int drsblobs_dissect_element_replUpToDateVectorCtr2_cursors(tvbuff_t *tvb
 static int drsblobs_dissect_element_replUpToDateVectorCtr2_cursors_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_replUpToDateVectorCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_replUpToDateVectorCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_replUpToDateVectorBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
+static int drsblobs_dissect_element_replUpToDateVectorBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
 static int drsblobs_dissect_element_replUpToDateVectorBlob_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_replUpToDateVectorBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
+static int drsblobs_dissect_element_replUpToDateVectorBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
 static int drsblobs_dissect_element_repsFromTo1OtherInfo___dns_name_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_repsFromTo1OtherInfo_dns_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_repsFromTo1OtherInfo_dns_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -462,9 +462,9 @@ static int drsblobs_dissect_element_repsFromTo2_transport_guid(tvbuff_t *tvb _U_
 static int drsblobs_dissect_element_repsFromTo2_unknown1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_repsFromTo_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_repsFromTo_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_repsFromToBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
+static int drsblobs_dissect_element_repsFromToBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
 static int drsblobs_dissect_element_repsFromToBlob_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_repsFromToBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
+static int drsblobs_dissect_element_repsFromToBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
 static int drsblobs_dissect_element_scheduleHeader_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_scheduleHeader_offset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_scheduleSlots_slots(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -480,9 +480,9 @@ static int drsblobs_dissect_element_partialAttributeSetCtr1_count(tvbuff_t *tvb
 static int drsblobs_dissect_element_partialAttributeSetCtr1_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_partialAttributeSetCtr1_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_partialAttributeSetCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_partialAttributeSetBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
+static int drsblobs_dissect_element_partialAttributeSetBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
 static int drsblobs_dissect_element_partialAttributeSetBlob_reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_partialAttributeSetBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
+static int drsblobs_dissect_element_partialAttributeSetBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version);
 static int drsblobs_dissect_element_schemaInfoBlob_marker(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_schemaInfoBlob_revision(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_schemaInfoBlob_invocation_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -507,10 +507,10 @@ static int drsblobs_dissect_element_ldapControlDirSyncBlob_u1(tvbuff_t *tvb _U_,
 static int drsblobs_dissect_element_ldapControlDirSyncBlob_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_ldapControlDirSyncBlob_u2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_ldapControlDirSyncBlob_u3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_ldapControlDirSyncBlob_extra_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *extra_length);
+static int drsblobs_dissect_element_ldapControlDirSyncBlob_extra_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *extra_length);
 static int drsblobs_dissect_element_ldapControlDirSyncBlob_highwatermark(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_ldapControlDirSyncBlob_guid1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_ldapControlDirSyncBlob_extra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *extra_length);
+static int drsblobs_dissect_element_ldapControlDirSyncBlob_extra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *extra_length);
 static int drsblobs_dissect_element_ldapControlDirSyncCookie_msds(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_ldapControlDirSyncCookie_msds_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_ldapControlDirSyncCookie_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -589,9 +589,9 @@ static int drsblobs_dissect_element_package_PrimaryKerberosCtr4_older_keys(tvbuf
 static int drsblobs_dissect_element_package_PrimaryKerberosCtr4_older_keys_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_package_PrimaryKerberosCtr_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_package_PrimaryKerberosCtr_ctr4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_package_PrimaryKerberosBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
+static int drsblobs_dissect_element_package_PrimaryKerberosBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
 static int drsblobs_dissect_element_package_PrimaryKerberosBlob_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsblobs_dissect_element_package_PrimaryKerberosBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
+static int drsblobs_dissect_element_package_PrimaryKerberosBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
 static int drsblobs_dissect_element_package_PrimaryCLEARTEXTBlob_cleartext(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_package_PrimaryWDigestHash_hash(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsblobs_dissect_element_package_PrimaryWDigestHash_hash_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1020,7 +1020,7 @@ drsblobs_dissect_replPropertyMetaDataCtr(tvbuff_t *tvb _U_, int offset _U_, pack
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_replPropertyMetaDataBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+drsblobs_dissect_element_replPropertyMetaDataBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_drsblobs_replPropertyMetaDataBlob_version, version);
 
@@ -1036,7 +1036,7 @@ drsblobs_dissect_element_replPropertyMetaDataBlob_reserved(tvbuff_t *tvb _U_, in
 }
 
 static int
-drsblobs_dissect_element_replPropertyMetaDataBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+drsblobs_dissect_element_replPropertyMetaDataBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version)
 {
        offset = drsblobs_dissect_replPropertyMetaDataCtr(tvb, offset, pinfo, tree, drep, hf_drsblobs_replPropertyMetaDataBlob_ctr, *version);
 
@@ -1046,7 +1046,7 @@ drsblobs_dissect_element_replPropertyMetaDataBlob_ctr(tvbuff_t *tvb _U_, int off
 int
 drsblobs_dissect_struct_replPropertyMetaDataBlob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g version;
+       guint32 version;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -1280,7 +1280,7 @@ drsblobs_dissect_replUpToDateVectorCtr(tvbuff_t *tvb _U_, int offset _U_, packet
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_replUpToDateVectorBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+drsblobs_dissect_element_replUpToDateVectorBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_drsblobs_replUpToDateVectorBlob_version, version);
 
@@ -1296,7 +1296,7 @@ drsblobs_dissect_element_replUpToDateVectorBlob_reserved(tvbuff_t *tvb _U_, int
 }
 
 static int
-drsblobs_dissect_element_replUpToDateVectorBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+drsblobs_dissect_element_replUpToDateVectorBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version)
 {
        offset = drsblobs_dissect_replUpToDateVectorCtr(tvb, offset, pinfo, tree, drep, hf_drsblobs_replUpToDateVectorBlob_ctr, *version);
 
@@ -1306,7 +1306,7 @@ drsblobs_dissect_element_replUpToDateVectorBlob_ctr(tvbuff_t *tvb _U_, int offse
 int
 drsblobs_dissect_struct_replUpToDateVectorBlob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g version;
+       guint32 version;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -1983,7 +1983,7 @@ drsblobs_dissect_repsFromTo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_repsFromToBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+drsblobs_dissect_element_repsFromToBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_drsblobs_repsFromToBlob_version, version);
 
@@ -1999,7 +1999,7 @@ drsblobs_dissect_element_repsFromToBlob_reserved(tvbuff_t *tvb _U_, int offset _
 }
 
 static int
-drsblobs_dissect_element_repsFromToBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+drsblobs_dissect_element_repsFromToBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version)
 {
        offset = drsblobs_dissect_repsFromTo(tvb, offset, pinfo, tree, drep, hf_drsblobs_repsFromToBlob_ctr, *version);
 
@@ -2009,7 +2009,7 @@ drsblobs_dissect_element_repsFromToBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, p
 int
 drsblobs_dissect_struct_repsFromToBlob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g version;
+       guint32 version;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -2351,7 +2351,7 @@ drsblobs_dissect_partialAttributeSetCtr(tvbuff_t *tvb _U_, int offset _U_, packe
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_partialAttributeSetBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+drsblobs_dissect_element_partialAttributeSetBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_drsblobs_partialAttributeSetBlob_version, version);
 
@@ -2367,7 +2367,7 @@ drsblobs_dissect_element_partialAttributeSetBlob_reserved(tvbuff_t *tvb _U_, int
 }
 
 static int
-drsblobs_dissect_element_partialAttributeSetBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+drsblobs_dissect_element_partialAttributeSetBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *version)
 {
        offset = drsblobs_dissect_partialAttributeSetCtr(tvb, offset, pinfo, tree, drep, hf_drsblobs_partialAttributeSetBlob_ctr, *version);
 
@@ -2377,7 +2377,7 @@ drsblobs_dissect_element_partialAttributeSetBlob_ctr(tvbuff_t *tvb _U_, int offs
 int
 drsblobs_dissect_struct_partialAttributeSetBlob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g version;
+       guint32 version;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -2824,7 +2824,7 @@ drsblobs_dissect_element_ldapControlDirSyncBlob_u3(tvbuff_t *tvb _U_, int offset
 }
 
 static int
-drsblobs_dissect_element_ldapControlDirSyncBlob_extra_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *extra_length)
+drsblobs_dissect_element_ldapControlDirSyncBlob_extra_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *extra_length)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_drsblobs_ldapControlDirSyncBlob_extra_length, extra_length);
 
@@ -2848,7 +2848,7 @@ drsblobs_dissect_element_ldapControlDirSyncBlob_guid1(tvbuff_t *tvb _U_, int off
 }
 
 static int
-drsblobs_dissect_element_ldapControlDirSyncBlob_extra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *extra_length)
+drsblobs_dissect_element_ldapControlDirSyncBlob_extra(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *extra_length)
 {
        offset = drsblobs_dissect_ldapControlDirSyncExtra(tvb, offset, pinfo, tree, drep, hf_drsblobs_ldapControlDirSyncBlob_extra, *extra_length);
 
@@ -2858,7 +2858,7 @@ drsblobs_dissect_element_ldapControlDirSyncBlob_extra(tvbuff_t *tvb _U_, int off
 int
 drsblobs_dissect_struct_ldapControlDirSyncBlob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g extra_length;
+       guint32 extra_length;
         extra;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
@@ -4096,7 +4096,7 @@ drsblobs_dissect_package_PrimaryKerberosCtr(tvbuff_t *tvb _U_, int offset _U_, p
 /* IDL: } */
 
 static int
-drsblobs_dissect_element_package_PrimaryKerberosBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+drsblobs_dissect_element_package_PrimaryKerberosBlob_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version)
 {
        offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_drsblobs_package_PrimaryKerberosBlob_version, version);
 
@@ -4112,7 +4112,7 @@ drsblobs_dissect_element_package_PrimaryKerberosBlob_flags(tvbuff_t *tvb _U_, in
 }
 
 static int
-drsblobs_dissect_element_package_PrimaryKerberosBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+drsblobs_dissect_element_package_PrimaryKerberosBlob_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version)
 {
        offset = drsblobs_dissect_package_PrimaryKerberosCtr(tvb, offset, pinfo, tree, drep, hf_drsblobs_package_PrimaryKerberosBlob_ctr, *version);
 
@@ -4122,7 +4122,7 @@ drsblobs_dissect_element_package_PrimaryKerberosBlob_ctr(tvbuff_t *tvb _U_, int
 int
 drsblobs_dissect_struct_package_PrimaryKerberosBlob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g version;
+       guint16 version;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c b/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c
index d830c2d8b39cedea88cb060d1171b5d40c003235..23c0308c8a503b7cb56a9f9b083bc0bb0be36bd2 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-drsuapi.c
@@ -1306,9 +1306,9 @@ static int drsuapi_dissect_element_DsBindInfo_info48(tvbuff_t *tvb _U_, int offs
 static int drsuapi_dissect_element_DsBindInfo_info48_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsBindInfo_Fallback(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsBindInfo_Fallback_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsBindInfoCtr_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *length);
+static int drsuapi_dissect_element_DsBindInfoCtr_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint3264 *length);
 static int drsuapi_dissect_element_DsBindInfoCtr___ndr_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsBindInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *length);
+static int drsuapi_dissect_element_DsBindInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint3264 *length);
 static int drsuapi_dissect_element_DsReplicaObjectIdentifier___ndr_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaObjectIdentifier___ndr_size_sid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsReplicaObjectIdentifier_guid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1682,9 +1682,9 @@ static int drsuapi_dissect_element_DsGetNCChangesCompressedCtr_mszip6(tvbuff_t *
 static int drsuapi_dissect_element_DsGetNCChangesCompressedCtr_xpress1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNCChangesCompressedCtr_xpress6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNCChangesCtr2_mszip1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsGetNCChangesCtr7_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int drsuapi_dissect_element_DsGetNCChangesCtr7_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int drsuapi_dissect_element_DsGetNCChangesCtr7_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint1632 *type);
-static int drsuapi_dissect_element_DsGetNCChangesCtr7_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
+static int drsuapi_dissect_element_DsGetNCChangesCtr7_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
 static int drsuapi_dissect_element_DsGetNCChangesCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNCChangesCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsGetNCChangesCtr_ctr6(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2121,9 +2121,9 @@ static int drsuapi_dissect_element_DsAddEntryCtr2_objects_(tvbuff_t *tvb _U_, in
 static int drsuapi_dissect_element_DsAddEntryCtr2_objects__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntryCtr3_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntryCtr3_id_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int drsuapi_dissect_element_DsAddEntryCtr3_err_ver(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *err_ver);
-static int drsuapi_dissect_element_DsAddEntryCtr3_err_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *err_ver);
-static int drsuapi_dissect_element_DsAddEntryCtr3_err_data_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *err_ver);
+static int drsuapi_dissect_element_DsAddEntryCtr3_err_ver(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *err_ver);
+static int drsuapi_dissect_element_DsAddEntryCtr3_err_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *err_ver);
+static int drsuapi_dissect_element_DsAddEntryCtr3_err_data_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *err_ver);
 static int drsuapi_dissect_element_DsAddEntryCtr3_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntryCtr3_objects(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int drsuapi_dissect_element_DsAddEntryCtr3_objects_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3851,7 +3851,7 @@ drsuapi_dissect_DsBindInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsBindInfoCtr_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *length)
+drsuapi_dissect_element_DsBindInfoCtr_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint3264 *length)
 {
        offset = dissect_ndr_uint3264(tvb, offset, pinfo, tree, drep, hf_drsuapi_drsuapi_DsBindInfoCtr_length, NULL);
 
@@ -3867,7 +3867,7 @@ drsuapi_dissect_element_DsBindInfoCtr___ndr_length(tvbuff_t *tvb _U_, int offset
 }
 
 static int
-drsuapi_dissect_element_DsBindInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *length)
+drsuapi_dissect_element_DsBindInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint3264 *length)
 {
        offset = drsuapi_dissect_DsBindInfo(tvb, offset, pinfo, tree, drep, hf_drsuapi_drsuapi_DsBindInfoCtr_info, *length);
 
@@ -3877,7 +3877,7 @@ drsuapi_dissect_element_DsBindInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, pa
 int
 drsuapi_dissect_struct_DsBindInfoCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g length;
+       guint3264 length;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -7757,7 +7757,7 @@ drsuapi_dissect_struct_DsGetNCChangesCtr2(tvbuff_t *tvb _U_, int offset _U_, pac
 /* IDL: } */
 
 static int
-drsuapi_dissect_element_DsGetNCChangesCtr7_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+drsuapi_dissect_element_DsGetNCChangesCtr7_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_drsuapi_drsuapi_DsGetNCChangesCtr7_level, level);
 
@@ -7773,7 +7773,7 @@ drsuapi_dissect_element_DsGetNCChangesCtr7_type(tvbuff_t *tvb _U_, int offset _U
 }
 
 static int
-drsuapi_dissect_element_DsGetNCChangesCtr7_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+drsuapi_dissect_element_DsGetNCChangesCtr7_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = drsuapi_dissect_DsGetNCChangesCompressedCtr(tvb, offset, pinfo, tree, drep, hf_drsuapi_drsuapi_DsGetNCChangesCtr7_ctr, *);
 
@@ -7783,7 +7783,7 @@ drsuapi_dissect_element_DsGetNCChangesCtr7_ctr(tvbuff_t *tvb _U_, int offset _U_
 int
 drsuapi_dissect_struct_DsGetNCChangesCtr7(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        guint1632 type;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
@@ -13461,7 +13461,7 @@ drsuapi_dissect_element_DsAddEntryCtr3_id_(tvbuff_t *tvb _U_, int offset _U_, pa
 }
 
 static int
-drsuapi_dissect_element_DsAddEntryCtr3_err_ver(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *err_ver)
+drsuapi_dissect_element_DsAddEntryCtr3_err_ver(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *err_ver)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_drsuapi_drsuapi_DsAddEntryCtr3_err_ver, err_ver);
 
@@ -13469,7 +13469,7 @@ drsuapi_dissect_element_DsAddEntryCtr3_err_ver(tvbuff_t *tvb _U_, int offset _U_
 }
 
 static int
-drsuapi_dissect_element_DsAddEntryCtr3_err_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *err_ver)
+drsuapi_dissect_element_DsAddEntryCtr3_err_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *err_ver)
 {
        offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, drsuapi_dissect_element_DsAddEntryCtr3_err_data_, NDR_POINTER_UNIQUE, "Pointer to Err Data (drsuapi_DsAddEntry_ErrData)",hf_drsuapi_drsuapi_DsAddEntryCtr3_err_data);
 
@@ -13477,7 +13477,7 @@ drsuapi_dissect_element_DsAddEntryCtr3_err_data(tvbuff_t *tvb _U_, int offset _U
 }
 
 static int
-drsuapi_dissect_element_DsAddEntryCtr3_err_data_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *err_ver)
+drsuapi_dissect_element_DsAddEntryCtr3_err_data_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *err_ver)
 {
        offset = drsuapi_dissect_DsAddEntry_ErrData(tvb, offset, pinfo, tree, drep, hf_drsuapi_drsuapi_DsAddEntryCtr3_err_data, *err_ver);
 
@@ -13519,7 +13519,7 @@ drsuapi_dissect_element_DsAddEntryCtr3_objects__(tvbuff_t *tvb _U_, int offset _
 int
 drsuapi_dissect_struct_DsAddEntryCtr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g err_ver;
+       guint32 err_ver;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-epmapper.c b/bin/default/librpc/gen_ndr/packet-dcerpc-epmapper.c
index 7609d3c1ce4fdfbea05371daa365a43912c42ed8..574fecacc30d3bf2bfe675059bab9b39c9aefe43 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-epmapper.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-epmapper.c
@@ -239,10 +239,10 @@ static int epmapper_dissect_element_epm_rhs_null(tvbuff_t *tvb _U_, int offset _
 static int epmapper_dissect_element_epm_rhs_unknown(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int epmapper_dissect_element_epm_lhs_protocol(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int epmapper_dissect_element_epm_lhs_lhs_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int epmapper_dissect_element_epm_floor_lhs(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *lhs);
-static int epmapper_dissect_element_epm_floor_lhs_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *lhs);
-static int epmapper_dissect_element_epm_floor_rhs(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
-static int epmapper_dissect_element_epm_floor_rhs_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
+static int epmapper_dissect_element_epm_floor_lhs(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *lhs);
+static int epmapper_dissect_element_epm_floor_lhs_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *lhs);
+static int epmapper_dissect_element_epm_floor_rhs(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
+static int epmapper_dissect_element_epm_floor_rhs_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
 static int epmapper_dissect_element_epm_tower_num_floors(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int epmapper_dissect_element_epm_tower_floors(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int epmapper_dissect_element_epm_tower_floors_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1728,7 +1728,7 @@ epmapper_dissect_struct_epm_lhs(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 /* IDL: } */
 
 static int
-epmapper_dissect_element_epm_floor_lhs(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *lhs)
+epmapper_dissect_element_epm_floor_lhs(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *lhs)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint16 size;
@@ -1749,7 +1749,7 @@ epmapper_dissect_element_epm_floor_lhs(tvbuff_t *tvb _U_, int offset _U_, packet
 }
 
 static int
-epmapper_dissect_element_epm_floor_lhs_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *lhs)
+epmapper_dissect_element_epm_floor_lhs_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *lhs)
 {
        offset = epmapper_dissect_struct_epm_lhs(tvb,offset,pinfo,tree,drep,hf_epmapper_epm_floor_lhs,lhs);
 
@@ -1757,7 +1757,7 @@ epmapper_dissect_element_epm_floor_lhs_(tvbuff_t *tvb _U_, int offset _U_, packe
 }
 
 static int
-epmapper_dissect_element_epm_floor_rhs(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+epmapper_dissect_element_epm_floor_rhs(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint16 size;
@@ -1778,7 +1778,7 @@ epmapper_dissect_element_epm_floor_rhs(tvbuff_t *tvb _U_, int offset _U_, packet
 }
 
 static int
-epmapper_dissect_element_epm_floor_rhs_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+epmapper_dissect_element_epm_floor_rhs_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = epmapper_dissect_epm_rhs(tvb, offset, pinfo, tree, drep, hf_epmapper_epm_floor_rhs, *);
 

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-named_pipe_auth.c b/bin/default/librpc/gen_ndr/packet-dcerpc-named_pipe_auth.c
index d91f31b5acddfd7d5e8cd5bc32638635378b15ee..00e355e0cc771ba5c2adae379fd0e701c01bc6b0 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-named_pipe_auth.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-named_pipe_auth.c
@@ -88,8 +88,8 @@ static int named_pipe_auth_dissect_element_req_info_info4(tvbuff_t *tvb _U_, int
 static int named_pipe_auth_dissect_element_req_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_req_magic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_req_magic_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int named_pipe_auth_dissect_element_req_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int named_pipe_auth_dissect_element_req_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int named_pipe_auth_dissect_element_req_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int named_pipe_auth_dissect_element_req_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int named_pipe_auth_dissect_element_rep_info4_file_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_rep_info4_device_state(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_rep_info4_allocation_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -97,8 +97,8 @@ static int named_pipe_auth_dissect_element_rep_info_info4(tvbuff_t *tvb _U_, int
 static int named_pipe_auth_dissect_element_rep_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_rep_magic(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int named_pipe_auth_dissect_element_rep_magic_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int named_pipe_auth_dissect_element_rep_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int named_pipe_auth_dissect_element_rep_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int named_pipe_auth_dissect_element_rep_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int named_pipe_auth_dissect_element_rep_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int named_pipe_auth_dissect_element_rep_status(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 
 
@@ -339,7 +339,7 @@ named_pipe_auth_dissect_element_req_magic_(tvbuff_t *tvb _U_, int offset _U_,int
 }
 
 static int
-named_pipe_auth_dissect_element_req_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+named_pipe_auth_dissect_element_req_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_named_pipe_auth_named_pipe_auth_req_level, level);
 
@@ -347,7 +347,7 @@ named_pipe_auth_dissect_element_req_level(tvbuff_t *tvb _U_, int offset _U_, pac
 }
 
 static int
-named_pipe_auth_dissect_element_req_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+named_pipe_auth_dissect_element_req_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = named_pipe_auth_dissect_req_info(tvb, offset, pinfo, tree, drep, hf_named_pipe_auth_named_pipe_auth_req_info, *level);
 
@@ -357,7 +357,7 @@ named_pipe_auth_dissect_element_req_info(tvbuff_t *tvb _U_, int offset _U_, pack
 int
 named_pipe_auth_dissect_struct_req(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -534,7 +534,7 @@ named_pipe_auth_dissect_element_rep_magic_(tvbuff_t *tvb _U_, int offset _U_,int
 }
 
 static int
-named_pipe_auth_dissect_element_rep_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+named_pipe_auth_dissect_element_rep_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_named_pipe_auth_named_pipe_auth_rep_level, level);
 
@@ -542,7 +542,7 @@ named_pipe_auth_dissect_element_rep_level(tvbuff_t *tvb _U_, int offset _U_, pac
 }
 
 static int
-named_pipe_auth_dissect_element_rep_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+named_pipe_auth_dissect_element_rep_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = named_pipe_auth_dissect_rep_info(tvb, offset, pinfo, tree, drep, hf_named_pipe_auth_named_pipe_auth_rep_info, *level);
 
@@ -560,7 +560,7 @@ named_pipe_auth_dissect_element_rep_status(tvbuff_t *tvb _U_, int offset _U_, pa
 int
 named_pipe_auth_dissect_struct_rep(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-nbt.c b/bin/default/librpc/gen_ndr/packet-dcerpc-nbt.c
index 992cddfc0801c6eb0afd24a95c4cdd30d0c25403..bde344066b30ab5aa80cc6696f0b21dc275ed6ad 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-nbt.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-nbt.c
@@ -658,8 +658,8 @@ static int nbt_dissect_element_dgram_message_length(tvbuff_t *tvb _U_, int offse
 static int nbt_dissect_element_dgram_message_offset(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_dgram_message_source_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int nbt_dissect_element_dgram_message_dest_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int nbt_dissect_element_dgram_message_dgram_body_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *dgram_body_type);
-static int nbt_dissect_element_dgram_message_body(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *dgram_body_type);
+static int nbt_dissect_element_dgram_message_dgram_body_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dgram_body_type);
+static int nbt_dissect_element_dgram_message_body(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dgram_body_type);
 const value_string nbt_dgram_err_code_vals[] = {
        { DGRAM_ERROR_NAME_NOT_PRESENT, "DGRAM_ERROR_NAME_NOT_PRESENT" },
        { DGRAM_ERROR_INVALID_SOURCE, "DGRAM_ERROR_INVALID_SOURCE" },
@@ -3077,7 +3077,7 @@ nbt_dissect_element_dgram_message_dest_name(tvbuff_t *tvb _U_, int offset _U_, p
 }
 
 static int
-nbt_dissect_element_dgram_message_dgram_body_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *dgram_body_type)
+nbt_dissect_element_dgram_message_dgram_body_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dgram_body_type)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_nbt_dgram_message_dgram_body_type, dgram_body_type);
 
@@ -3085,7 +3085,7 @@ nbt_dissect_element_dgram_message_dgram_body_type(tvbuff_t *tvb _U_, int offset
 }
 
 static int
-nbt_dissect_element_dgram_message_body(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *dgram_body_type)
+nbt_dissect_element_dgram_message_body(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dgram_body_type)
 {
        offset = nbt_dissect_dgram_message_body(tvb, offset, pinfo, tree, drep, hf_nbt_dgram_message_body, *dgram_body_type);
 
@@ -3095,7 +3095,7 @@ nbt_dissect_element_dgram_message_body(tvbuff_t *tvb _U_, int offset _U_, packet
 int
 nbt_dissect_struct_dgram_message(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g dgram_body_type;
+       guint32 dgram_body_type;
         body;
        proto_item *item = NULL;
        proto_tree *tree = NULL;

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-netlogon.c b/bin/default/librpc/gen_ndr/packet-dcerpc-netlogon.c
index ca8bb72536aea355c0abf8e98d2450a4b3c976f1..f03e65c9b499550f67c7cd9de52833c37c58d61a 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-netlogon.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-netlogon.c
@@ -1903,10 +1903,10 @@ static int netlogon_dissect_element_netr_ChangeLogObject_object_name(tvbuff_t *t
 static int netlogon_dissect_element_netr_ChangeLogEntry_serial_number1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_ChangeLogEntry_serial_number2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_ChangeLogEntry_object_rid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_ChangeLogEntry_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *flags);
+static int netlogon_dissect_element_netr_ChangeLogEntry_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *flags);
 static int netlogon_dissect_element_netr_ChangeLogEntry_db_index(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_ChangeLogEntry_delta_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int netlogon_dissect_element_netr_ChangeLogEntry_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
+static int netlogon_dissect_element_netr_ChangeLogEntry_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
 static int netlogon_dissect_element_netr_Blob_length(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_Blob_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int netlogon_dissect_element_netr_Blob_data_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -11036,7 +11036,7 @@ netlogon_dissect_element_netr_ChangeLogEntry_object_rid(tvbuff_t *tvb _U_, int o
 }
 
 static int
-netlogon_dissect_element_netr_ChangeLogEntry_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *flags)
+netlogon_dissect_element_netr_ChangeLogEntry_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *flags)
 {
        offset = netlogon_dissect_bitmap_netr_ChangeLogFlags(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_ChangeLogEntry_flags, flags);
 
@@ -11060,7 +11060,7 @@ netlogon_dissect_element_netr_ChangeLogEntry_delta_type(tvbuff_t *tvb _U_, int o
 }
 
 static int
-netlogon_dissect_element_netr_ChangeLogEntry_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+netlogon_dissect_element_netr_ChangeLogEntry_object(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = netlogon_dissect_netr_ChangeLogObject(tvb, offset, pinfo, tree, drep, hf_netlogon_netr_ChangeLogEntry_object, *);
 

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-ntlmssp.c b/bin/default/librpc/gen_ndr/packet-dcerpc-ntlmssp.c
index 2a2a6c88b6bdf4215a2d79cd6d05aab762dd6325..8f37dff590ec43715ab2828afd48ffc2e3659899 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-ntlmssp.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-ntlmssp.c
@@ -343,7 +343,7 @@ static int ntlmssp_dissect_element_Version_version(tvbuff_t *tvb _U_, int offset
 static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_Signature(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_Signature_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_MessageType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_NegotiateFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *NegotiateFlags);
+static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_NegotiateFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *NegotiateFlags);
 static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_DomainNameLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_DomainNameMaxLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_DomainName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -354,7 +354,7 @@ static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_WorkstationMaxLen(tvbuff_t
 static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_Workstation(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_Workstation_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_Workstation__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
+static int ntlmssp_dissect_element_NEGOTIATE_MESSAGE_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
 const value_string ntlmssp_ntlmssp_AvId_vals[] = {
        { MsvAvEOL, "MsvAvEOL" },
        { MsvAvNbComputerName, "MsvAvNbComputerName" },
@@ -410,7 +410,7 @@ static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_TargetNameMaxLen(tvbuff_t *
 static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_TargetName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_TargetName_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_TargetName__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_NegotiateFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *NegotiateFlags);
+static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_NegotiateFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *NegotiateFlags);
 static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_ServerChallenge(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_ServerChallenge_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_Reserved(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -420,7 +420,7 @@ static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_TargetNameInfoMaxLen(tvbuff
 static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_TargetInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_TargetInfo_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_TargetInfo__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
+static int ntlmssp_dissect_element_CHALLENGE_MESSAGE_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
 static int ntlmssp_dissect_element_LM_RESPONSE_Response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_LM_RESPONSE_Response_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_LMv2_RESPONSE_Response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -450,16 +450,16 @@ static int ntlmssp_dissect_element_MIC_MIC_(tvbuff_t *tvb _U_, int offset _U_,in
 static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_Signature(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_Signature_(tvbuff_t *tvb _U_, int offset _U_,int length _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_MessageType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponseLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *LmChallengeResponseLen);
+static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponseLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *LmChallengeResponseLen);
 static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponseMaxLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *LmChallengeResponseLen);
-static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *LmChallengeResponseLen);
-static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *LmChallengeResponseLen);
-static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponseLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *NtChallengeResponseLen);
+static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *LmChallengeResponseLen);
+static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *LmChallengeResponseLen);
+static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *LmChallengeResponseLen);
+static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponseLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *NtChallengeResponseLen);
 static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponseMaxLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *NtChallengeResponseLen);
-static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *NtChallengeResponseLen);
-static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *NtChallengeResponseLen);
+static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *NtChallengeResponseLen);
+static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *NtChallengeResponseLen);
+static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *NtChallengeResponseLen);
 static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_DomainNameLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_DomainNameMaxLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_DomainName(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -480,8 +480,8 @@ static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_EncryptedRandomSessionKe
 static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_EncryptedRandomSessionKey(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_EncryptedRandomSessionKey_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_EncryptedRandomSessionKey__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NegotiateFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *NegotiateFlags);
-static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
+static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NegotiateFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *NegotiateFlags);
+static int ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
 static int ntlmssp_dissect_element_NTLMSSP_MESSAGE_SIGNATURE_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NTLMSSP_MESSAGE_SIGNATURE_RandomPad(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ntlmssp_dissect_element_NTLMSSP_MESSAGE_SIGNATURE_Checksum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1026,7 +1026,7 @@ ntlmssp_dissect_element_NEGOTIATE_MESSAGE_MessageType(tvbuff_t *tvb _U_, int off
 }
 
 static int
-ntlmssp_dissect_element_NEGOTIATE_MESSAGE_NegotiateFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *NegotiateFlags)
+ntlmssp_dissect_element_NEGOTIATE_MESSAGE_NegotiateFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *NegotiateFlags)
 {
        offset = ntlmssp_dissect_bitmap_NEGOTIATE(tvb, offset, pinfo, tree, drep, hf_ntlmssp_NEGOTIATE_MESSAGE_NegotiateFlags, NegotiateFlags);
 
@@ -1138,7 +1138,7 @@ ntlmssp_dissect_element_NEGOTIATE_MESSAGE_Workstation__(tvbuff_t *tvb _U_, int o
 }
 
 static int
-ntlmssp_dissect_element_NEGOTIATE_MESSAGE_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+ntlmssp_dissect_element_NEGOTIATE_MESSAGE_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = ntlmssp_dissect_Version(tvb, offset, pinfo, tree, drep, hf_ntlmssp_NEGOTIATE_MESSAGE_Version, *);
 
@@ -1791,7 +1791,7 @@ ntlmssp_dissect_element_CHALLENGE_MESSAGE_TargetName__(tvbuff_t *tvb _U_, int of
 }
 
 static int
-ntlmssp_dissect_element_CHALLENGE_MESSAGE_NegotiateFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *NegotiateFlags)
+ntlmssp_dissect_element_CHALLENGE_MESSAGE_NegotiateFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *NegotiateFlags)
 {
        offset = ntlmssp_dissect_bitmap_NEGOTIATE(tvb, offset, pinfo, tree, drep, hf_ntlmssp_CHALLENGE_MESSAGE_NegotiateFlags, NegotiateFlags);
 
@@ -1892,7 +1892,7 @@ ntlmssp_dissect_element_CHALLENGE_MESSAGE_TargetInfo__(tvbuff_t *tvb _U_, int of
 }
 
 static int
-ntlmssp_dissect_element_CHALLENGE_MESSAGE_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+ntlmssp_dissect_element_CHALLENGE_MESSAGE_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = ntlmssp_dissect_Version(tvb, offset, pinfo, tree, drep, hf_ntlmssp_CHALLENGE_MESSAGE_Version, *);
 
@@ -2540,7 +2540,7 @@ ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_MessageType(tvbuff_t *tvb _U_, int
 }
 
 static int
-ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponseLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *LmChallengeResponseLen)
+ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponseLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *LmChallengeResponseLen)
 {
        offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_ntlmssp_AUTHENTICATE_MESSAGE_LmChallengeResponseLen, LmChallengeResponseLen);
 
@@ -2556,7 +2556,7 @@ ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponseMaxLen(tvbuff_t
 }
 
 static int
-ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *LmChallengeResponseLen)
+ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *LmChallengeResponseLen)
 {
        offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse_, , "Pointer to Lmchallengeresponse (ntlmssp_LM_RESPONSE)",hf_ntlmssp_AUTHENTICATE_MESSAGE_LmChallengeResponse);
 
@@ -2564,7 +2564,7 @@ ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse(tvbuff_t *tvb _
 }
 
 static int
-ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *LmChallengeResponseLen)
+ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *LmChallengeResponseLen)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint0 size;
@@ -2585,7 +2585,7 @@ ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse_(tvbuff_t *tvb
 }
 
 static int
-ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *LmChallengeResponseLen)
+ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *LmChallengeResponseLen)
 {
        offset = ntlmssp_dissect_LM_RESPONSE(tvb, offset, pinfo, tree, drep, hf_ntlmssp_AUTHENTICATE_MESSAGE_LmChallengeResponse, *LmChallengeResponseLen);
 
@@ -2593,7 +2593,7 @@ ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_LmChallengeResponse__(tvbuff_t *tvb
 }
 
 static int
-ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponseLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *NtChallengeResponseLen)
+ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponseLen(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *NtChallengeResponseLen)
 {
        offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_ntlmssp_AUTHENTICATE_MESSAGE_NtChallengeResponseLen, NtChallengeResponseLen);
 
@@ -2609,7 +2609,7 @@ ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponseMaxLen(tvbuff_t
 }
 
 static int
-ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *NtChallengeResponseLen)
+ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *NtChallengeResponseLen)
 {
        offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse_, , "Pointer to Ntchallengeresponse (ntlmssp_NTLM_RESPONSE)",hf_ntlmssp_AUTHENTICATE_MESSAGE_NtChallengeResponse);
 
@@ -2617,7 +2617,7 @@ ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse(tvbuff_t *tvb _
 }
 
 static int
-ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *NtChallengeResponseLen)
+ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *NtChallengeResponseLen)
 {
        dcerpc_info *di = (dcerpc_info*)pinfo->private_data;
        guint0 size;
@@ -2638,7 +2638,7 @@ ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse_(tvbuff_t *tvb
 }
 
 static int
-ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *NtChallengeResponseLen)
+ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NtChallengeResponse__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *NtChallengeResponseLen)
 {
        offset = ntlmssp_dissect_NTLM_RESPONSE(tvb, offset, pinfo, tree, drep, hf_ntlmssp_AUTHENTICATE_MESSAGE_NtChallengeResponse, *NtChallengeResponseLen);
 
@@ -2855,7 +2855,7 @@ ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_EncryptedRandomSessionKey__(tvbuff_
 }
 
 static int
-ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NegotiateFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *NegotiateFlags)
+ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NegotiateFlags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *NegotiateFlags)
 {
        offset = ntlmssp_dissect_bitmap_NEGOTIATE(tvb, offset, pinfo, tree, drep, hf_ntlmssp_AUTHENTICATE_MESSAGE_NegotiateFlags, NegotiateFlags);
 
@@ -2863,7 +2863,7 @@ ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_NegotiateFlags(tvbuff_t *tvb _U_, i
 }
 
 static int
-ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_Version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = ntlmssp_dissect_Version(tvb, offset, pinfo, tree, drep, hf_ntlmssp_AUTHENTICATE_MESSAGE_Version, *);
 
@@ -2873,9 +2873,9 @@ ntlmssp_dissect_element_AUTHENTICATE_MESSAGE_Version(tvbuff_t *tvb _U_, int offs
 int
 ntlmssp_dissect_struct_AUTHENTICATE_MESSAGE(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g LmChallengeResponseLen;
+       guint16 LmChallengeResponseLen;
         LmChallengeResponse;
-       g NtChallengeResponseLen;
+       guint16 NtChallengeResponseLen;
         NtChallengeResponse;
         NegotiateFlags;
        proto_item *item = NULL;

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-orpc.c b/bin/default/librpc/gen_ndr/packet-dcerpc-orpc.c
index edbdbb6d693c9fe2f5109c52918a3f056257091e..bf31af8cf04c290d071d0ad5f55e6c020a692c8b 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-orpc.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-orpc.c
@@ -254,9 +254,9 @@ static int ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_standard(tvbuff_t *
 static int ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_handler(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ObjectRpcBaseTypes_dissect_element_OBJREF_Types_u_custom(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ObjectRpcBaseTypes_dissect_element_OBJREF_signature(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ObjectRpcBaseTypes_dissect_element_OBJREF_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *flags);
+static int ObjectRpcBaseTypes_dissect_element_OBJREF_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *flags);
 static int ObjectRpcBaseTypes_dissect_element_OBJREF_iid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int ObjectRpcBaseTypes_dissect_element_OBJREF_u_objref(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *flags);
+static int ObjectRpcBaseTypes_dissect_element_OBJREF_u_objref(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *flags);
 static int ObjectRpcBaseTypes_dissect_element_MInterfacePointer_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ObjectRpcBaseTypes_dissect_element_MInterfacePointer_obj(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int ObjectRpcBaseTypes_dissect_element_MInterfacePointer_obj_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1545,7 +1545,7 @@ ObjectRpcBaseTypes_dissect_element_OBJREF_signature(tvbuff_t *tvb _U_, int offse
 }
 
 static int
-ObjectRpcBaseTypes_dissect_element_OBJREF_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *flags)
+ObjectRpcBaseTypes_dissect_element_OBJREF_flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *flags)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_ObjectRpcBaseTypes_OBJREF_flags, flags);
 
@@ -1561,7 +1561,7 @@ ObjectRpcBaseTypes_dissect_element_OBJREF_iid(tvbuff_t *tvb _U_, int offset _U_,
 }
 
 static int
-ObjectRpcBaseTypes_dissect_element_OBJREF_u_objref(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *flags)
+ObjectRpcBaseTypes_dissect_element_OBJREF_u_objref(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *flags)
 {
        offset = ObjectRpcBaseTypes_dissect_OBJREF_Types(tvb, offset, pinfo, tree, drep, hf_ObjectRpcBaseTypes_OBJREF_u_objref, *flags);
 
@@ -1571,7 +1571,7 @@ ObjectRpcBaseTypes_dissect_element_OBJREF_u_objref(tvbuff_t *tvb _U_, int offset
 int
 ObjectRpcBaseTypes_dissect_struct_OBJREF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g flags;
+       guint32 flags;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-schannel.c b/bin/default/librpc/gen_ndr/packet-dcerpc-schannel.c
index 6056323b85fa4617f3a8660addb3a2413293feef..7b471d76e68e36560eae93801aa22b2de4f73bdb 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-schannel.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-schannel.c
@@ -137,12 +137,12 @@ static int schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_u(tvbuff_t *tvb _U_,
 static int schannel_dissect_element_NL_AUTH_MESSAGE_BUFFER_REPLY_dummy(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int schannel_dissect_element_NL_AUTH_MESSAGE_MessageType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *MessageType);
 static int schannel_dissect_element_NL_AUTH_MESSAGE_Flags(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int schannel_dissect_element_NL_AUTH_MESSAGE_oem_netbios_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
-static int schannel_dissect_element_NL_AUTH_MESSAGE_oem_netbios_computer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
-static int schannel_dissect_element_NL_AUTH_MESSAGE_utf8_dns_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
-static int schannel_dissect_element_NL_AUTH_MESSAGE_utf8_dns_host(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
-static int schannel_dissect_element_NL_AUTH_MESSAGE_utf8_netbios_computer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
-static int schannel_dissect_element_NL_AUTH_MESSAGE_Buffer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
+static int schannel_dissect_element_NL_AUTH_MESSAGE_oem_netbios_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
+static int schannel_dissect_element_NL_AUTH_MESSAGE_oem_netbios_computer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
+static int schannel_dissect_element_NL_AUTH_MESSAGE_utf8_dns_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
+static int schannel_dissect_element_NL_AUTH_MESSAGE_utf8_dns_host(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
+static int schannel_dissect_element_NL_AUTH_MESSAGE_utf8_netbios_computer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
+static int schannel_dissect_element_NL_AUTH_MESSAGE_Buffer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
 const value_string schannel_NL_SIGNATURE_ALGORITHM_vals[] = {
        { NL_SIGN_HMAC_SHA256, "NL_SIGN_HMAC_SHA256" },
        { NL_SIGN_HMAC_MD5, "NL_SIGN_HMAC_MD5" },
@@ -602,7 +602,7 @@ schannel_dissect_element_NL_AUTH_MESSAGE_Flags(tvbuff_t *tvb _U_, int offset _U_
 }
 
 static int
-schannel_dissect_element_NL_AUTH_MESSAGE_oem_netbios_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+schannel_dissect_element_NL_AUTH_MESSAGE_oem_netbios_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = schannel_dissect_NL_AUTH_MESSAGE_BUFFER(tvb, offset, pinfo, tree, drep, hf_schannel_NL_AUTH_MESSAGE_oem_netbios_domain, *);
 
@@ -610,7 +610,7 @@ schannel_dissect_element_NL_AUTH_MESSAGE_oem_netbios_domain(tvbuff_t *tvb _U_, i
 }
 
 static int
-schannel_dissect_element_NL_AUTH_MESSAGE_oem_netbios_computer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+schannel_dissect_element_NL_AUTH_MESSAGE_oem_netbios_computer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = schannel_dissect_NL_AUTH_MESSAGE_BUFFER(tvb, offset, pinfo, tree, drep, hf_schannel_NL_AUTH_MESSAGE_oem_netbios_computer, *);
 
@@ -618,7 +618,7 @@ schannel_dissect_element_NL_AUTH_MESSAGE_oem_netbios_computer(tvbuff_t *tvb _U_,
 }
 
 static int
-schannel_dissect_element_NL_AUTH_MESSAGE_utf8_dns_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+schannel_dissect_element_NL_AUTH_MESSAGE_utf8_dns_domain(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = schannel_dissect_NL_AUTH_MESSAGE_BUFFER(tvb, offset, pinfo, tree, drep, hf_schannel_NL_AUTH_MESSAGE_utf8_dns_domain, *);
 
@@ -626,7 +626,7 @@ schannel_dissect_element_NL_AUTH_MESSAGE_utf8_dns_domain(tvbuff_t *tvb _U_, int
 }
 
 static int
-schannel_dissect_element_NL_AUTH_MESSAGE_utf8_dns_host(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+schannel_dissect_element_NL_AUTH_MESSAGE_utf8_dns_host(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = schannel_dissect_NL_AUTH_MESSAGE_BUFFER(tvb, offset, pinfo, tree, drep, hf_schannel_NL_AUTH_MESSAGE_utf8_dns_host, *);
 
@@ -634,7 +634,7 @@ schannel_dissect_element_NL_AUTH_MESSAGE_utf8_dns_host(tvbuff_t *tvb _U_, int of
 }
 
 static int
-schannel_dissect_element_NL_AUTH_MESSAGE_utf8_netbios_computer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+schannel_dissect_element_NL_AUTH_MESSAGE_utf8_netbios_computer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = schannel_dissect_NL_AUTH_MESSAGE_BUFFER(tvb, offset, pinfo, tree, drep, hf_schannel_NL_AUTH_MESSAGE_utf8_netbios_computer, *);
 
@@ -642,7 +642,7 @@ schannel_dissect_element_NL_AUTH_MESSAGE_utf8_netbios_computer(tvbuff_t *tvb _U_
 }
 
 static int
-schannel_dissect_element_NL_AUTH_MESSAGE_Buffer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+schannel_dissect_element_NL_AUTH_MESSAGE_Buffer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = schannel_dissect_NL_AUTH_MESSAGE_BUFFER_REPLY(tvb, offset, pinfo, tree, drep, hf_schannel_NL_AUTH_MESSAGE_Buffer, *);
 

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c b/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c
index 3223dfac7fbb385d99ec54dfc63cd624cc554e5c..a03868cc381e6ae0daeae512256972eb4e4ce32c 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-spoolss.c
@@ -3088,8 +3088,8 @@ static int spoolss_dissect_element_SetJobInfo_info3(tvbuff_t *tvb _U_, int offse
 static int spoolss_dissect_element_SetJobInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetJobInfo_info4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetJobInfo_info4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_JobInfoContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int spoolss_dissect_element_JobInfoContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int spoolss_dissect_element_JobInfoContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int spoolss_dissect_element_JobInfoContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 const value_string spoolss_spoolss_JobControl_vals[] = {
        { SPOOLSS_JOB_CONTROL_PAUSE, "SPOOLSS_JOB_CONTROL_PAUSE" },
        { SPOOLSS_JOB_CONTROL_RESUME, "SPOOLSS_JOB_CONTROL_RESUME" },
@@ -3224,8 +3224,8 @@ static int spoolss_dissect_element_SetPrinterInfo_info8(tvbuff_t *tvb _U_, int o
 static int spoolss_dissect_element_SetPrinterInfo_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPrinterInfo_info9(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPrinterInfo_info9_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPrinterInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int spoolss_dissect_element_SetPrinterInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int spoolss_dissect_element_SetPrinterInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int spoolss_dissect_element_SetPrinterInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_StringArray__ndr_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_StringArray_string(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddDriverInfo1_driver_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3443,8 +3443,8 @@ static int spoolss_dissect_element_AddDriverInfo_info6(tvbuff_t *tvb _U_, int of
 static int spoolss_dissect_element_AddDriverInfo_info6_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddDriverInfo_info8(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddDriverInfo_info8_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddDriverInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int spoolss_dissect_element_AddDriverInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int spoolss_dissect_element_AddDriverInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int spoolss_dissect_element_AddDriverInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_DriverInfo1_driver_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DriverInfo1_driver_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DriverInfo2_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3658,8 +3658,8 @@ static int spoolss_dissect_element_DocumentInfo1_datatype(tvbuff_t *tvb _U_, int
 static int spoolss_dissect_element_DocumentInfo1_datatype_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_DocumentInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_DocumentInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int spoolss_dissect_element_DocumentInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int spoolss_dissect_element_DocumentInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int spoolss_dissect_element_DocumentInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_OSVersion__ndr_size(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_OSVersion_major(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_OSVersion_minor(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3753,8 +3753,8 @@ static int spoolss_dissect_element_AddFormInfo_info1(tvbuff_t *tvb _U_, int offs
 static int spoolss_dissect_element_AddFormInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddFormInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddFormInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_AddFormInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int spoolss_dissect_element_AddFormInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int spoolss_dissect_element_AddFormInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int spoolss_dissect_element_AddFormInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_PortInfo1_port_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PortInfo1_port_name_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static const true_false_string spoolss_PortType_SPOOLSS_PORT_TYPE_WRITE_tfs = {
@@ -3849,8 +3849,8 @@ static int spoolss_dissect_element_SetPortInfo_info3(tvbuff_t *tvb _U_, int offs
 static int spoolss_dissect_element_SetPortInfo_info3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPortInfo_infoFF(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_SetPortInfo_infoFF_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_SetPortInfoContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int spoolss_dissect_element_SetPortInfoContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int spoolss_dissect_element_SetPortInfoContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int spoolss_dissect_element_SetPortInfoContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_UNIVERSAL_FONT_ID_Checksum(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_UNIVERSAL_FONT_ID_Index(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_UNIVERSAL_FONT_ID_ctr_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -3868,8 +3868,8 @@ static int spoolss_dissect_element_AddMonitorInfo_info1(tvbuff_t *tvb _U_, int o
 static int spoolss_dissect_element_AddMonitorInfo_info1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddMonitorInfo_info2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_AddMonitorInfo_info2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_MonitorContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int spoolss_dissect_element_MonitorContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int spoolss_dissect_element_MonitorContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int spoolss_dissect_element_MonitorContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int spoolss_dissect_element_PrintProcDataTypesInfo1_name_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PrintProcDataTypesInfo1_name_array_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_PrintProcDataTypesInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -4064,7 +4064,7 @@ static int spoolss_dissect_element_NotifyData_devmode(tvbuff_t *tvb _U_, int off
 static int spoolss_dissect_element_NotifyData_time(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_NotifyData_sd(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_Notify_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_Notify_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *);
+static int spoolss_dissect_element_Notify_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *);
 static int spoolss_dissect_element_Notify_variable_type(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *variable_type);
 static int spoolss_dissect_element_Notify_job_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_Notify_data(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *variable_type);
@@ -4115,8 +4115,8 @@ static int spoolss_dissect_element_UserLevel_level2(tvbuff_t *tvb _U_, int offse
 static int spoolss_dissect_element_UserLevel_level2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_UserLevel_level3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_UserLevel_level3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_UserLevelCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int spoolss_dissect_element_UserLevelCtr_user_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int spoolss_dissect_element_UserLevelCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int spoolss_dissect_element_UserLevelCtr_user_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static const true_false_string spoolss_AccessRights_SERVER_ACCESS_ADMINISTER_tfs = {
    "SERVER_ACCESS_ADMINISTER is SET",
    "SERVER_ACCESS_ADMINISTER is NOT SET",
@@ -4266,8 +4266,8 @@ static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData_(tvbuff_t *tvb _U_, int
 static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_RPC_BIDI_DATA_u_sData_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_RPC_BIDI_DATA_u_biData(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int spoolss_dissect_element_RPC_BIDI_DATA_dwBidiType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *dwBidiType);
-static int spoolss_dissect_element_RPC_BIDI_DATA_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *dwBidiType);
+static int spoolss_dissect_element_RPC_BIDI_DATA_dwBidiType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dwBidiType);
+static int spoolss_dissect_element_RPC_BIDI_DATA_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dwBidiType);
 static int spoolss_dissect_element_RPC_BIDI_REQUEST_DATA_dwReqNumber(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_RPC_BIDI_REQUEST_DATA_pSchema(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int spoolss_dissect_element_RPC_BIDI_REQUEST_DATA_pSchema_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -14011,7 +14011,7 @@ spoolss_dissect_SetJobInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 /* IDL: } */
 
 static int
-spoolss_dissect_element_JobInfoContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_JobInfoContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_JobInfoContainer_level, level);
 
@@ -14019,7 +14019,7 @@ spoolss_dissect_element_JobInfoContainer_level(tvbuff_t *tvb _U_, int offset _U_
 }
 
 static int
-spoolss_dissect_element_JobInfoContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_JobInfoContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = spoolss_dissect_SetJobInfo(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_JobInfoContainer_info, *level);
 
@@ -14029,7 +14029,7 @@ spoolss_dissect_element_JobInfoContainer_info(tvbuff_t *tvb _U_, int offset _U_,
 int
 spoolss_dissect_struct_JobInfoContainer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -15696,7 +15696,7 @@ spoolss_dissect_SetPrinterInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 /* IDL: } */
 
 static int
-spoolss_dissect_element_SetPrinterInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_SetPrinterInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_SetPrinterInfoCtr_level, level);
 
@@ -15704,7 +15704,7 @@ spoolss_dissect_element_SetPrinterInfoCtr_level(tvbuff_t *tvb _U_, int offset _U
 }
 
 static int
-spoolss_dissect_element_SetPrinterInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_SetPrinterInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = spoolss_dissect_SetPrinterInfo(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_SetPrinterInfoCtr_info, *level);
 
@@ -15714,7 +15714,7 @@ spoolss_dissect_element_SetPrinterInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_
 int
 spoolss_dissect_struct_SetPrinterInfoCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -17969,7 +17969,7 @@ spoolss_dissect_AddDriverInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 /* IDL: } */
 
 static int
-spoolss_dissect_element_AddDriverInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_AddDriverInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_AddDriverInfoCtr_level, level);
 
@@ -17977,7 +17977,7 @@ spoolss_dissect_element_AddDriverInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_
 }
 
 static int
-spoolss_dissect_element_AddDriverInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_AddDriverInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = spoolss_dissect_AddDriverInfo(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_AddDriverInfoCtr_info, *level);
 
@@ -17987,7 +17987,7 @@ spoolss_dissect_element_AddDriverInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_,
 int
 spoolss_dissect_struct_AddDriverInfoCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -20683,7 +20683,7 @@ spoolss_dissect_DocumentInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
 /* IDL: } */
 
 static int
-spoolss_dissect_element_DocumentInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_DocumentInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_DocumentInfoCtr_level, level);
 
@@ -20691,7 +20691,7 @@ spoolss_dissect_element_DocumentInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_,
 }
 
 static int
-spoolss_dissect_element_DocumentInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_DocumentInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = spoolss_dissect_DocumentInfo(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_DocumentInfoCtr_info, *level);
 
@@ -20701,7 +20701,7 @@ spoolss_dissect_element_DocumentInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_,
 int
 spoolss_dissect_struct_DocumentInfoCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -21998,7 +21998,7 @@ spoolss_dissect_AddFormInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 /* IDL: } */
 
 static int
-spoolss_dissect_element_AddFormInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_AddFormInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_AddFormInfoCtr_level, level);
 
@@ -22006,7 +22006,7 @@ spoolss_dissect_element_AddFormInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_,
 }
 
 static int
-spoolss_dissect_element_AddFormInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_AddFormInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = spoolss_dissect_AddFormInfo(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_AddFormInfoCtr_info, *level);
 
@@ -22016,7 +22016,7 @@ spoolss_dissect_element_AddFormInfoCtr_info(tvbuff_t *tvb _U_, int offset _U_, p
 int
 spoolss_dissect_struct_AddFormInfoCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -23169,7 +23169,7 @@ spoolss_dissect_SetPortInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
 /* IDL: } */
 
 static int
-spoolss_dissect_element_SetPortInfoContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_SetPortInfoContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_SetPortInfoContainer_level, level);
 
@@ -23177,7 +23177,7 @@ spoolss_dissect_element_SetPortInfoContainer_level(tvbuff_t *tvb _U_, int offset
 }
 
 static int
-spoolss_dissect_element_SetPortInfoContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_SetPortInfoContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = spoolss_dissect_SetPrinterInfo(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_SetPortInfoContainer_info, *level);
 
@@ -23187,7 +23187,7 @@ spoolss_dissect_element_SetPortInfoContainer_info(tvbuff_t *tvb _U_, int offset
 int
 spoolss_dissect_struct_SetPortInfoContainer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -23560,7 +23560,7 @@ spoolss_dissect_AddMonitorInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 /* IDL: } */
 
 static int
-spoolss_dissect_element_MonitorContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_MonitorContainer_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_MonitorContainer_level, level);
 
@@ -23568,7 +23568,7 @@ spoolss_dissect_element_MonitorContainer_level(tvbuff_t *tvb _U_, int offset _U_
 }
 
 static int
-spoolss_dissect_element_MonitorContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_MonitorContainer_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = spoolss_dissect_MonitorInfo(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_MonitorContainer_info, *level);
 
@@ -23578,7 +23578,7 @@ spoolss_dissect_element_MonitorContainer_info(tvbuff_t *tvb _U_, int offset _U_,
 int
 spoolss_dissect_struct_MonitorContainer(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -24623,7 +24623,7 @@ spoolss_dissect_element_Notify_type(tvbuff_t *tvb _U_, int offset _U_, packet_in
 }
 
 static int
-spoolss_dissect_element_Notify_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_,  *)
+spoolss_dissect_element_Notify_field(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *)
 {
        offset = spoolss_dissect_Field(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_Notify_field, *);
 
@@ -25318,7 +25318,7 @@ spoolss_dissect_UserLevel(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 /* IDL: } */
 
 static int
-spoolss_dissect_element_UserLevelCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_UserLevelCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_UserLevelCtr_level, level);
 
@@ -25326,7 +25326,7 @@ spoolss_dissect_element_UserLevelCtr_level(tvbuff_t *tvb _U_, int offset _U_, pa
 }
 
 static int
-spoolss_dissect_element_UserLevelCtr_user_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+spoolss_dissect_element_UserLevelCtr_user_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = spoolss_dissect_UserLevel(tvb, offset, pinfo, tree, drep, hf_spoolss_spoolss_UserLevelCtr_user_info, *level);
 
@@ -25336,7 +25336,7 @@ spoolss_dissect_element_UserLevelCtr_user_info(tvbuff_t *tvb _U_, int offset _U_
 int
 spoolss_dissect_struct_UserLevelCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -26625,7 +26625,7 @@ spoolss_dissect_RPC_BIDI_DATA_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *
 /* IDL: } */
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_dwBidiType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *dwBidiType)
+spoolss_dissect_element_RPC_BIDI_DATA_dwBidiType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dwBidiType)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_BIDI_DATA_dwBidiType, dwBidiType);
 
@@ -26633,7 +26633,7 @@ spoolss_dissect_element_RPC_BIDI_DATA_dwBidiType(tvbuff_t *tvb _U_, int offset _
 }
 
 static int
-spoolss_dissect_element_RPC_BIDI_DATA_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *dwBidiType)
+spoolss_dissect_element_RPC_BIDI_DATA_u(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *dwBidiType)
 {
        offset = spoolss_dissect_RPC_BIDI_DATA_u(tvb, offset, pinfo, tree, drep, hf_spoolss_RPC_BIDI_DATA_u, *dwBidiType);
 
@@ -26643,7 +26643,7 @@ spoolss_dissect_element_RPC_BIDI_DATA_u(tvbuff_t *tvb _U_, int offset _U_, packe
 int
 spoolss_dissect_struct_RPC_BIDI_DATA(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g dwBidiType;
+       guint32 dwBidiType;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-srvsvc.c b/bin/default/librpc/gen_ndr/packet-dcerpc-srvsvc.c
index 9a6dda672967760856f1ffed48feee1cbf38faef..bd0801e9d373c311f155761b9d2436fa92881a83 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-srvsvc.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-srvsvc.c
@@ -968,8 +968,8 @@ static int srvsvc_dissect_element_NetCharDevCtr_ctr0(tvbuff_t *tvb _U_, int offs
 static int srvsvc_dissect_element_NetCharDevCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int srvsvc_dissect_element_NetCharDevInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int srvsvc_dissect_element_NetCharDevInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int srvsvc_dissect_element_NetCharDevInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetCharDevQInfo0_device(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevQInfo0_device_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevQCtr0_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -995,8 +995,8 @@ static int srvsvc_dissect_element_NetCharDevQCtr_ctr0(tvbuff_t *tvb _U_, int off
 static int srvsvc_dissect_element_NetCharDevQCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevQCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetCharDevQCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetCharDevQInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int srvsvc_dissect_element_NetCharDevQInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int srvsvc_dissect_element_NetCharDevQInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int srvsvc_dissect_element_NetCharDevQInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetConnInfo0_conn_id(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetConnCtr0_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetConnCtr0_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1019,8 +1019,8 @@ static int srvsvc_dissect_element_NetConnCtr_ctr0(tvbuff_t *tvb _U_, int offset
 static int srvsvc_dissect_element_NetConnCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetConnCtr_ctr1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetConnCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetConnInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int srvsvc_dissect_element_NetConnInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int srvsvc_dissect_element_NetConnInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int srvsvc_dissect_element_NetConnInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetFileInfo2_fid(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetFileCtr2_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetFileCtr2_array(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1045,8 +1045,8 @@ static int srvsvc_dissect_element_NetFileCtr_ctr2(tvbuff_t *tvb _U_, int offset
 static int srvsvc_dissect_element_NetFileCtr_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetFileCtr_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetFileCtr_ctr3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetFileInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int srvsvc_dissect_element_NetFileInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int srvsvc_dissect_element_NetFileInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int srvsvc_dissect_element_NetFileInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetSessInfo0_client(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetSessInfo0_client_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetSessCtr0_count(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -1115,8 +1115,8 @@ static int srvsvc_dissect_element_NetSessCtr_ctr10(tvbuff_t *tvb _U_, int offset
 static int srvsvc_dissect_element_NetSessCtr_ctr10_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetSessCtr_ctr502(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetSessCtr_ctr502_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetSessInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int srvsvc_dissect_element_NetSessInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int srvsvc_dissect_element_NetSessInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int srvsvc_dissect_element_NetSessInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 const value_string srvsvc_srvsvc_ShareType_vals[] = {
        { STYPE_DISKTREE, "STYPE_DISKTREE" },
        { STYPE_DISKTREE_TEMPORARY, "STYPE_DISKTREE_TEMPORARY" },
@@ -1309,8 +1309,8 @@ static int srvsvc_dissect_element_NetShareCtr_ctr1007(tvbuff_t *tvb _U_, int off
 static int srvsvc_dissect_element_NetShareCtr_ctr1007_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetShareCtr_ctr1501(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetShareCtr_ctr1501_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetShareInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int srvsvc_dissect_element_NetShareInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int srvsvc_dissect_element_NetShareInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int srvsvc_dissect_element_NetShareInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 const value_string srvsvc_srvsvc_PlatformId_vals[] = {
        { PLATFORM_ID_DOS, "PLATFORM_ID_DOS" },
        { PLATFORM_ID_OS2, "PLATFORM_ID_OS2" },
@@ -1801,8 +1801,8 @@ static int srvsvc_dissect_element_NetTransportCtr_ctr2(tvbuff_t *tvb _U_, int of
 static int srvsvc_dissect_element_NetTransportCtr_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetTransportCtr_ctr3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetTransportCtr_ctr3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int srvsvc_dissect_element_NetTransportInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int srvsvc_dissect_element_NetTransportInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int srvsvc_dissect_element_NetTransportInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int srvsvc_dissect_element_NetTransportInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int srvsvc_dissect_element_NetRemoteTODInfo_elapsed(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetRemoteTODInfo_msecs(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int srvsvc_dissect_element_NetRemoteTODInfo_hours(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -2613,7 +2613,7 @@ srvsvc_dissect_NetCharDevCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pin
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetCharDevInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+srvsvc_dissect_element_NetCharDevInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_srvsvc_NetCharDevInfoCtr_level, level);
 
@@ -2621,7 +2621,7 @@ srvsvc_dissect_element_NetCharDevInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_
 }
 
 static int
-srvsvc_dissect_element_NetCharDevInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+srvsvc_dissect_element_NetCharDevInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = srvsvc_dissect_NetCharDevCtr(tvb, offset, pinfo, tree, drep, hf_srvsvc_srvsvc_NetCharDevInfoCtr_ctr, *level);
 
@@ -2631,7 +2631,7 @@ srvsvc_dissect_element_NetCharDevInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_,
 int
 srvsvc_dissect_struct_NetCharDevInfoCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -3117,7 +3117,7 @@ srvsvc_dissect_NetCharDevQCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetCharDevQInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+srvsvc_dissect_element_NetCharDevQInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_srvsvc_NetCharDevQInfoCtr_level, level);
 
@@ -3125,7 +3125,7 @@ srvsvc_dissect_element_NetCharDevQInfoCtr_level(tvbuff_t *tvb _U_, int offset _U
 }
 
 static int
-srvsvc_dissect_element_NetCharDevQInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+srvsvc_dissect_element_NetCharDevQInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = srvsvc_dissect_NetCharDevQCtr(tvb, offset, pinfo, tree, drep, hf_srvsvc_srvsvc_NetCharDevQInfoCtr_ctr, *level);
 
@@ -3135,7 +3135,7 @@ srvsvc_dissect_element_NetCharDevQInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_,
 int
 srvsvc_dissect_struct_NetCharDevQInfoCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -3559,7 +3559,7 @@ srvsvc_dissect_NetConnCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetConnInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+srvsvc_dissect_element_NetConnInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_srvsvc_NetConnInfoCtr_level, level);
 
@@ -3567,7 +3567,7 @@ srvsvc_dissect_element_NetConnInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, p
 }
 
 static int
-srvsvc_dissect_element_NetConnInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+srvsvc_dissect_element_NetConnInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = srvsvc_dissect_NetConnCtr(tvb, offset, pinfo, tree, drep, hf_srvsvc_srvsvc_NetConnInfoCtr_ctr, *level);
 
@@ -3577,7 +3577,7 @@ srvsvc_dissect_element_NetConnInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, pac
 int
 srvsvc_dissect_struct_NetConnInfoCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -4052,7 +4052,7 @@ srvsvc_dissect_NetFileCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetFileInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+srvsvc_dissect_element_NetFileInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_srvsvc_NetFileInfoCtr_level, level);
 
@@ -4060,7 +4060,7 @@ srvsvc_dissect_element_NetFileInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, p
 }
 
 static int
-srvsvc_dissect_element_NetFileInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+srvsvc_dissect_element_NetFileInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = srvsvc_dissect_NetFileCtr(tvb, offset, pinfo, tree, drep, hf_srvsvc_srvsvc_NetFileInfoCtr_ctr, *level);
 
@@ -4070,7 +4070,7 @@ srvsvc_dissect_element_NetFileInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, pac
 int
 srvsvc_dissect_struct_NetFileInfoCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -5171,7 +5171,7 @@ srvsvc_dissect_NetSessCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetSessInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+srvsvc_dissect_element_NetSessInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_srvsvc_NetSessInfoCtr_level, level);
 
@@ -5179,7 +5179,7 @@ srvsvc_dissect_element_NetSessInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, p
 }
 
 static int
-srvsvc_dissect_element_NetSessInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+srvsvc_dissect_element_NetSessInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = srvsvc_dissect_NetSessCtr(tvb, offset, pinfo, tree, drep, hf_srvsvc_srvsvc_NetSessInfoCtr_ctr, *level);
 
@@ -5189,7 +5189,7 @@ srvsvc_dissect_element_NetSessInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, pac
 int
 srvsvc_dissect_struct_NetSessInfoCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -7369,7 +7369,7 @@ srvsvc_dissect_NetShareCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetShareInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+srvsvc_dissect_element_NetShareInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_srvsvc_NetShareInfoCtr_level, level);
 
@@ -7377,7 +7377,7 @@ srvsvc_dissect_element_NetShareInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_,
 }
 
 static int
-srvsvc_dissect_element_NetShareInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+srvsvc_dissect_element_NetShareInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = srvsvc_dissect_NetShareCtr(tvb, offset, pinfo, tree, drep, hf_srvsvc_srvsvc_NetShareInfoCtr_ctr, *level);
 
@@ -7387,7 +7387,7 @@ srvsvc_dissect_element_NetShareInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, pa
 int
 srvsvc_dissect_struct_NetShareInfoCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -14931,7 +14931,7 @@ srvsvc_dissect_NetTransportCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
 /* IDL: } */
 
 static int
-srvsvc_dissect_element_NetTransportInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+srvsvc_dissect_element_NetTransportInfoCtr_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_srvsvc_NetTransportInfoCtr_level, level);
 
@@ -14939,7 +14939,7 @@ srvsvc_dissect_element_NetTransportInfoCtr_level(tvbuff_t *tvb _U_, int offset _
 }
 
 static int
-srvsvc_dissect_element_NetTransportInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+srvsvc_dissect_element_NetTransportInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = srvsvc_dissect_NetTransportCtr(tvb, offset, pinfo, tree, drep, hf_srvsvc_srvsvc_NetTransportInfoCtr_ctr, *level);
 
@@ -14949,7 +14949,7 @@ srvsvc_dissect_element_NetTransportInfoCtr_ctr(tvbuff_t *tvb _U_, int offset _U_
 int
 srvsvc_dissect_struct_NetTransportInfoCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-wkssvc.c b/bin/default/librpc/gen_ndr/packet-dcerpc-wkssvc.c
index a36644b1c9847fad98025f96c21b592a3dba3ca3..f23670540d1ee52a556757b00879829a9092e379 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-wkssvc.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-wkssvc.c
@@ -671,8 +671,8 @@ static int wkssvc_dissect_element_NetWkstaEnumUsersCtr_user0(tvbuff_t *tvb _U_,
 static int wkssvc_dissect_element_NetWkstaEnumUsersCtr_user0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaEnumUsersCtr_user1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaEnumUsersCtr_user1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaEnumUsersInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int wkssvc_dissect_element_NetWkstaEnumUsersInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int wkssvc_dissect_element_NetWkstaEnumUsersInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int wkssvc_dissect_element_NetWkstaEnumUsersInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int wkssvc_dissect_element_NetrWkstaUserInfo1101_other_domains(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrWkstaUserInfo1101_other_domains_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrWkstaUserInfo_info0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -694,8 +694,8 @@ static int wkssvc_dissect_element_NetWkstaTransportCtr0_array_(tvbuff_t *tvb _U_
 static int wkssvc_dissect_element_NetWkstaTransportCtr0_array__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaTransportCtr_ctr0(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetWkstaTransportCtr_ctr0_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetWkstaTransportInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int wkssvc_dissect_element_NetWkstaTransportInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int wkssvc_dissect_element_NetWkstaTransportInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int wkssvc_dissect_element_NetWkstaTransportInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int wkssvc_dissect_element_NetrUseInfo3_unknown1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrUseInfo3_unknown1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrUseInfo3_unknown2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -754,8 +754,8 @@ static int wkssvc_dissect_element_NetrUseEnumCtr_ctr1(tvbuff_t *tvb _U_, int off
 static int wkssvc_dissect_element_NetrUseEnumCtr_ctr1_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrUseEnumCtr_ctr2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrUseEnumCtr_ctr2_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int wkssvc_dissect_element_NetrUseEnumInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
-static int wkssvc_dissect_element_NetrUseEnumInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level);
+static int wkssvc_dissect_element_NetrUseEnumInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
+static int wkssvc_dissect_element_NetrUseEnumInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level);
 static int wkssvc_dissect_element_NetrWorkstationStatistics_unknown1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrWorkstationStatistics_unknown2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int wkssvc_dissect_element_NetrWorkstationStatistics_unknown3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -4492,7 +4492,7 @@ wkssvc_dissect_NetWkstaEnumUsersCtr(tvbuff_t *tvb _U_, int offset _U_, packet_in
 /* IDL: } */
 
 static int
-wkssvc_dissect_element_NetWkstaEnumUsersInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+wkssvc_dissect_element_NetWkstaEnumUsersInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_wkssvc_NetWkstaEnumUsersInfo_level, level);
 
@@ -4500,7 +4500,7 @@ wkssvc_dissect_element_NetWkstaEnumUsersInfo_level(tvbuff_t *tvb _U_, int offset
 }
 
 static int
-wkssvc_dissect_element_NetWkstaEnumUsersInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+wkssvc_dissect_element_NetWkstaEnumUsersInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = wkssvc_dissect_NetWkstaEnumUsersCtr(tvb, offset, pinfo, tree, drep, hf_wkssvc_wkssvc_NetWkstaEnumUsersInfo_ctr, *level);
 
@@ -4510,7 +4510,7 @@ wkssvc_dissect_element_NetWkstaEnumUsersInfo_ctr(tvbuff_t *tvb _U_, int offset _
 int
 wkssvc_dissect_struct_NetWkstaEnumUsersInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -4918,7 +4918,7 @@ wkssvc_dissect_NetWkstaTransportCtr(tvbuff_t *tvb _U_, int offset _U_, packet_in
 /* IDL: } */
 
 static int
-wkssvc_dissect_element_NetWkstaTransportInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+wkssvc_dissect_element_NetWkstaTransportInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_wkssvc_NetWkstaTransportInfo_level, level);
 
@@ -4926,7 +4926,7 @@ wkssvc_dissect_element_NetWkstaTransportInfo_level(tvbuff_t *tvb _U_, int offset
 }
 
 static int
-wkssvc_dissect_element_NetWkstaTransportInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+wkssvc_dissect_element_NetWkstaTransportInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = wkssvc_dissect_NetWkstaTransportCtr(tvb, offset, pinfo, tree, drep, hf_wkssvc_wkssvc_NetWkstaTransportInfo_ctr, *level);
 
@@ -4936,7 +4936,7 @@ wkssvc_dissect_element_NetWkstaTransportInfo_ctr(tvbuff_t *tvb _U_, int offset _
 int
 wkssvc_dissect_struct_NetWkstaTransportInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -5864,7 +5864,7 @@ wkssvc_dissect_NetrUseEnumCtr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pi
 /* IDL: } */
 
 static int
-wkssvc_dissect_element_NetrUseEnumInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+wkssvc_dissect_element_NetrUseEnumInfo_level(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = PIDL_dissect_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_wkssvc_NetrUseEnumInfo_level, level);
 
@@ -5872,7 +5872,7 @@ wkssvc_dissect_element_NetrUseEnumInfo_level(tvbuff_t *tvb _U_, int offset _U_,
 }
 
 static int
-wkssvc_dissect_element_NetrUseEnumInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *level)
+wkssvc_dissect_element_NetrUseEnumInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint32 *level)
 {
        offset = wkssvc_dissect_NetrUseEnumCtr(tvb, offset, pinfo, tree, drep, hf_wkssvc_wkssvc_NetrUseEnumInfo_ctr, *level);
 
@@ -5882,7 +5882,7 @@ wkssvc_dissect_element_NetrUseEnumInfo_ctr(tvbuff_t *tvb _U_, int offset _U_, pa
 int
 wkssvc_dissect_struct_NetrUseEnumInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g level;
+       guint32 level;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;

diff --git a/bin/default/librpc/gen_ndr/packet-dcerpc-xattr.c b/bin/default/librpc/gen_ndr/packet-dcerpc-xattr.c
index 2499d857ce6c7e3bb3d3013bfa5ed7ba253e2297..6e99334da731cada740949b70ca765b01a3c5a3f 100644 (file)
--- a/bin/default/librpc/gen_ndr/packet-dcerpc-xattr.c
+++ b/bin/default/librpc/gen_ndr/packet-dcerpc-xattr.c
@@ -187,11 +187,11 @@ static int xattr_dissect_element_DosInfo_compatinfoFFFF(tvbuff_t *tvb _U_, int o
 static int xattr_dissect_element_DosInfo_info1(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int xattr_dissect_element_DosInfo_oldinfo2(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int xattr_dissect_element_DosInfo_info3(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_DosAttrib_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
-static int xattr_dissect_element_DosAttrib_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
+static int xattr_dissect_element_DosAttrib_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
+static int xattr_dissect_element_DosAttrib_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
 static int xattr_dissect_element_DOSATTRIB_attrib_hex(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_DOSATTRIB_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
-static int xattr_dissect_element_DOSATTRIB_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
+static int xattr_dissect_element_DOSATTRIB_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
+static int xattr_dissect_element_DOSATTRIB_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
 static int xattr_dissect_element_EA_name(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int xattr_dissect_element_EA_value(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int xattr_dissect_element_DosEAs_num_eas(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -235,8 +235,8 @@ static int xattr_dissect_element_NTACL_Info_sd_hs3(tvbuff_t *tvb _U_, int offset
 static int xattr_dissect_element_NTACL_Info_sd_hs3_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int xattr_dissect_element_NTACL_Info_sd_hs4(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int xattr_dissect_element_NTACL_Info_sd_hs4_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
-static int xattr_dissect_element_NTACL_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
-static int xattr_dissect_element_NTACL_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version);
+static int xattr_dissect_element_NTACL_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
+static int xattr_dissect_element_NTACL_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version);
 static int xattr_dissect_element_sys_acl_hash_wrapper_acl_as_blob(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int xattr_dissect_element_sys_acl_hash_wrapper_owner(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
 static int xattr_dissect_element_sys_acl_hash_wrapper_group(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_);
@@ -795,7 +795,7 @@ xattr_dissect_DosInfo(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_,
 /* IDL: } */
 
 static int
-xattr_dissect_element_DosAttrib_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+xattr_dissect_element_DosAttrib_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version)
 {
        offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_xattr_xattr_DosAttrib_version, version);
 
@@ -803,7 +803,7 @@ xattr_dissect_element_DosAttrib_version(tvbuff_t *tvb _U_, int offset _U_, packe
 }
 
 static int
-xattr_dissect_element_DosAttrib_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+xattr_dissect_element_DosAttrib_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version)
 {
        offset = xattr_dissect_DosInfo(tvb, offset, pinfo, tree, drep, hf_xattr_xattr_DosAttrib_info, *version);
 
@@ -813,7 +813,7 @@ xattr_dissect_element_DosAttrib_info(tvbuff_t *tvb _U_, int offset _U_, packet_i
 int
 xattr_dissect_struct_DosAttrib(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g version;
+       guint16 version;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -859,7 +859,7 @@ xattr_dissect_element_DOSATTRIB_attrib_hex(tvbuff_t *tvb _U_, int offset _U_, pa
 }
 
 static int
-xattr_dissect_element_DOSATTRIB_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+xattr_dissect_element_DOSATTRIB_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version)
 {
        offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_xattr_xattr_DOSATTRIB_version, version);
 
@@ -867,7 +867,7 @@ xattr_dissect_element_DOSATTRIB_version(tvbuff_t *tvb _U_, int offset _U_, packe
 }
 
 static int
-xattr_dissect_element_DOSATTRIB_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+xattr_dissect_element_DOSATTRIB_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version)
 {
        offset = xattr_dissect_DosInfo(tvb, offset, pinfo, tree, drep, hf_xattr_xattr_DOSATTRIB_info, *version);
 
@@ -877,7 +877,7 @@ xattr_dissect_element_DOSATTRIB_info(tvbuff_t *tvb _U_, int offset _U_, packet_i
 int
 xattr_dissect_struct_DOSATTRIB(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g version;
+       guint16 version;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -1647,7 +1647,7 @@ xattr_dissect_NTACL_Info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _
 /* IDL: } */
 
 static int
-xattr_dissect_element_NTACL_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+xattr_dissect_element_NTACL_version(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version)
 {
        offset = PIDL_dissect_uint16(tvb, offset, pinfo, tree, drep, hf_xattr_xattr_NTACL_version, version);
 
@@ -1655,7 +1655,7 @@ xattr_dissect_element_NTACL_version(tvbuff_t *tvb _U_, int offset _U_, packet_in
 }
 
 static int
-xattr_dissect_element_NTACL_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, g *version)
+xattr_dissect_element_NTACL_info(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, guint16 *version)
 {
        offset = xattr_dissect_NTACL_Info(tvb, offset, pinfo, tree, drep, hf_xattr_xattr_NTACL_info, *version);
 
@@ -1665,7 +1665,7 @@ xattr_dissect_element_NTACL_info(tvbuff_t *tvb _U_, int offset _U_, packet_info
 int
 xattr_dissect_struct_NTACL(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
 {
-       g version;
+       guint16 version;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;