osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

the sidtype is a 32bit enum not a standard enum 

svn path=/trunk/; revision=22273
This commit is contained in:
Ronnie Sahlberg 2007-07-09 12:50:57 +00:00
parent 43010b965b
commit 58bc100096
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/dissectors/packet-dcerpc-samr.c
View File

@ -1982,11 +1982,11 @@ samr_dissect_struct_lsa_String(tvbuff_t *tvb _U_, int offset _U_, packet_info *p
int
samr_dissect_enum_lsa_SidType(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_, int hf_index _U_, guint32 *param _U_)
{
guint16 parameter=0;
guint32 parameter=0;
if(param){
parameter=(guint16)*param;
parameter=(guint32)*param;
}
offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_index, &parameter);
if(param){
*param=(guint32)parameter;
}
@ -13512,7 +13512,7 @@ void proto_register_dcerpc_samr(void)
{ &hf_samr_samr_UserInfo11_logon_script,
{ "Logon Script", "samr.samr_UserInfo11.logon_script", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
{ &hf_samr_samr_Types_types,
{ "Types", "samr.samr_Types.types", FT_UINT16, BASE_DEC, VALS(samr_lsa_SidType_vals), 0, "", HFILL }},
{ "Types", "samr.samr_Types.types", FT_UINT32, BASE_DEC, VALS(samr_lsa_SidType_vals), 0, "", HFILL }},
{ &hf_samr_samr_DomInfo2_comment,
{ "Comment", "samr.samr_DomInfo2.comment", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
{ &hf_samr_samr_ChangePasswordUser2_nt_password,
@ -13572,7 +13572,7 @@ void proto_register_dcerpc_samr(void)
{ &hf_samr_samr_DomInfo2_unknown2,
{ "Unknown2", "samr.samr_DomInfo2.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
{ &hf_samr_samr_RidTypeArray_types,
{ "Types", "samr.samr_RidTypeArray.types", FT_UINT16, BASE_DEC, VALS(samr_lsa_SidType_vals), 0, "", HFILL }},
{ "Types", "samr.samr_RidTypeArray.types", FT_UINT32, BASE_DEC, VALS(samr_lsa_SidType_vals), 0, "", HFILL }},
{ &hf_samr_opnum,
{ "Operation", "samr.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
{ &hf_samr_samr_ChangePasswordUser3_server,

2
epan/dissectors/pidl/samr.idl
View File

@ -24,7 +24,7 @@
[string,charset(UTF16)] uint16 *name;
} lsa_String;
typedef enum {
typedef [v1_enum] enum {
SID_NAME_USE_NONE = 0,/* NOTUSED */
SID_NAME_USER = 1, /* user */
SID_NAME_DOM_GRP = 2, /* domain group */