diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
| commit | c3af1555bb4c1eb47d86a0576d3dd7944572e6f5 (patch) | |
| tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-dcerpc-nt.c | |
| parent | 8210e1b06b7f866f3bc60e22b8fb54a12adba06c (diff) | |
From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-dcerpc-nt.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-nt.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index c9135c11d7..1de4013472 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -1664,12 +1664,12 @@ void dcerpc_smb_init(int proto_dcerpc) { &hf_nt_policy_open_frame, { "Frame handle opened", "dcerpc.nt.open_frame", FT_FRAMENUM, BASE_NONE, NULL, 0x0, - "Frame handle opened", HFILL }}, + NULL, HFILL }}, { &hf_nt_policy_close_frame, { "Frame handle closed", "dcerpc.nt.close_frame", FT_FRAMENUM, BASE_NONE, NULL, 0x0, - "Frame handle closed", HFILL }}, + NULL, HFILL }}, /* ACBs */ @@ -1705,22 +1705,22 @@ void dcerpc_smb_init(int proto_dcerpc) { &hf_nt_acb_mns, { "MNS logon user account", "dcerpc.nt.acb.mns", FT_BOOLEAN, 32, TFS(&tfs_nt_acb_mns), 0x0020, - "MNS logon user account", HFILL }}, + NULL, HFILL }}, { &hf_nt_acb_domtrust, { "Interdomain trust account", "dcerpc.nt.acb.domtrust", FT_BOOLEAN, 32, TFS(&tfs_nt_acb_domtrust), 0x0040, - "Interdomain trust account", HFILL }}, + NULL, HFILL }}, { &hf_nt_acb_wstrust, { "Workstation trust account", "dcerpc.nt.acb.wstrust", FT_BOOLEAN, 32, TFS(&tfs_nt_acb_wstrust), 0x0080, - "Workstation trust account", HFILL }}, + NULL, HFILL }}, { &hf_nt_acb_svrtrust, { "Server trust account", "dcerpc.nt.acb.svrtrust", FT_BOOLEAN, 32, TFS(&tfs_nt_acb_svrtrust), 0x0100, - "Server trust account", HFILL }}, + NULL, HFILL }}, { &hf_nt_acb_pwnoexp, { "Password expires", "dcerpc.nt.acb.pwnoexp", FT_BOOLEAN, 32, @@ -1754,14 +1754,13 @@ void dcerpc_smb_init(int proto_dcerpc) { &hf_logonhours_unknown_char, { "Unknown char", "dcerpc.nt.unknown.char", FT_UINT8, BASE_HEX, NULL, 0x0, - "Unknown char. If you know what this is, contact " - "wireshark developers.", HFILL }}, + "Unknown char. If you know what this is, contact wireshark developers.", HFILL }}, /* Misc */ { &hf_nt_attrib, { "Attributes", "dcerpc.nt.attr", - FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, }; static gint *ett[] = { |