aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dcerpc-mapi.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2017-05-03 17:24:41 +0200
committerMichael Mann <mmann78@netscape.net>2017-05-05 21:44:49 +0000
commit5956556aceb1f59387a081a6e8898a7e40730936 (patch)
treea01e11a982d7ce5b22be1a912c7975bf0d6f2c05 /epan/dissectors/packet-dcerpc-mapi.c
parentc1880e3095acd7541076bb89bfae5d5bd348a3d2 (diff)
mapi: fix conflicting entry in its value_string
Field 'Value' (mapi.SPropValue.value) has a conflicting entry in its value_string: 4126 is at indices 24 (PT_MV_STRING8) and 25 (PT_MV_TSTRING)) Field 'Value' (nspi.SPropValue.value) has a conflicting entry in its value_string: 4126 is at indices 24 (PT_MV_STRING8) and 25 (PT_MV_TSTRING)) Change-Id: Icc1060804ced2887a34ffe81cf473fbe8154ce18 Reviewed-on: https://code.wireshark.org/review/21510 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-dcerpc-mapi.c')
-rw-r--r--epan/dissectors/packet-dcerpc-mapi.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c
index 4806da9ae9..c0ecf59f08 100644
--- a/epan/dissectors/packet-dcerpc-mapi.c
+++ b/epan/dissectors/packet-dcerpc-mapi.c
@@ -3777,7 +3777,6 @@ const value_string mapi_property_types_vals[] = {
{ PT_MV_APPTIME, "PT_MV_APPTIME" },
{ PT_MV_I8, "PT_MV_I8" },
{ PT_MV_STRING8, "PT_MV_STRING8" },
- { PT_MV_TSTRING, "PT_MV_TSTRING" },
{ PT_MV_UNICODE, "PT_MV_UNICODE" },
{ PT_MV_SYSTIME, "PT_MV_SYSTIME" },
{ PT_MV_CLSID, "PT_MV_CLSID" },
@@ -8243,7 +8242,6 @@ mapi_dissect_struct_LPSTR(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo
/* IDL: PT_MV_APPTIME=0x1007, */
/* IDL: PT_MV_I8=0x1014, */
/* IDL: PT_MV_STRING8=0x101e, */
-/* IDL: PT_MV_TSTRING=0x101e, */
/* IDL: PT_MV_UNICODE=0x101f, */
/* IDL: PT_MV_SYSTIME=0x1040, */
/* IDL: PT_MV_CLSID=0x1048, */