aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/pidl
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-07-11 08:20:22 -0400
committerMichael Mann <mmann78@netscape.net>2015-07-14 03:45:46 +0000
commit2ebe8792f9999b969581a0d719c50ec108d65568 (patch)
tree0994888990218beebc4801877802e968b8a2f6f2 /epan/dissectors/pidl
parentb19846d40eff42c28f8209e07f9c193736710749 (diff)
Correct eventlog.eventlog_OpenEventLogW.Module dissection by providing lsa_String type in .cnf
There seem to be multiple definitions of an "lsa_String" depending on the DCE/RPC dissector, so change was made just in EventLog. Bug: 10264 Change-Id: I32e97c2a537b01d3bfe9dd03452b8ee1af4d1c2e Reviewed-on: https://code.wireshark.org/review/9598 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/pidl')
-rw-r--r--epan/dissectors/pidl/eventlog.cnf15
1 files changed, 1 insertions, 14 deletions
diff --git a/epan/dissectors/pidl/eventlog.cnf b/epan/dissectors/pidl/eventlog.cnf
index 9645ed1782..1e6690b402 100644
--- a/epan/dissectors/pidl/eventlog.cnf
+++ b/epan/dissectors/pidl/eventlog.cnf
@@ -30,23 +30,10 @@ PARAM_VALUE eventlog_dissect_element_OpenBackupEventLogW_handle_ PIDL_POLHND_OPE
# Policyhandles are closed in these functions
PARAM_VALUE eventlog_dissect_element_CloseEventLog_handle_ PIDL_POLHND_CLOSE
+TYPE lsa_String "offset=dissect_ndr_counted_string(tvb, offset, pinfo, tree, di, drep, @HF@, @PARAM@);" FT_STRING BASE_NONE 0 NULL 4
CODE START
-/* Add this one manually until we can compile LSA */
-static int
-eventlog_dissect_struct_lsa_String(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep, int hf_index,int notused _U_)
-{
- if(di->conformant_run){
- /*just a run to handle conformant arrays, nothing to dissect */
- return offset;
- }
-
- offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, di, drep,
- hf_index, 0);
- return offset;
-}
-
static int
eventlog_dissect_element_ReadEventLogW_data_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep)