diff options
| -rw-r--r-- | epan/dissectors/packet-dcerpc-samr.c | 7 | ||||
| -rw-r--r-- | epan/dissectors/pidl/samr.cnf | 1 | ||||
| -rw-r--r-- | epan/dissectors/pidl/samr.idl | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c index 5c22f451fe..4f46497fe4 100644 --- a/epan/dissectors/packet-dcerpc-samr.c +++ b/epan/dissectors/packet-dcerpc-samr.c @@ -480,6 +480,7 @@ static gint hf_samr_samr_UserInfo5_home_drive = -1; static gint hf_samr_samr_RemoveMemberFromForeignDomain_sid = -1; static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_FORCE_PWD_CHANGE = -1; static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_LAST_LOGOFF = -1; +static gint hf_samr_samr_RidWithAttributeArray_rids = -1; static gint hf_samr_samr_Password_hash = -1; static gint hf_samr_samr_FieldsPresent_SAMR_FIELD_OWF_PWD = -1; static gint hf_samr_samr_UserInfo_info25 = -1; @@ -7378,7 +7379,7 @@ samr_dissect_element_RidWithAttributeArray_count(tvbuff_t *tvb _U_, int offset _ static int samr_dissect_element_RidWithAttributeArray_rids(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_) { - offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_element_RidWithAttributeArray_rids_, NDR_POINTER_UNIQUE, "Pointer to Rids (samr_RidWithAttribute)",hf_samr_rid); + offset = dissect_ndr_embedded_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_element_RidWithAttributeArray_rids_, NDR_POINTER_UNIQUE, "Pointer to Rids (samr_RidWithAttribute)",hf_samr_samr_RidWithAttributeArray_rids); return offset; } @@ -7394,7 +7395,7 @@ samr_dissect_element_RidWithAttributeArray_rids_(tvbuff_t *tvb _U_, int offset _ static int samr_dissect_element_RidWithAttributeArray_rids__(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_) { - offset = samr_dissect_struct_RidWithAttribute(tvb,offset,pinfo,tree,drep,hf_samr_rid,0); + offset = samr_dissect_struct_RidWithAttribute(tvb,offset,pinfo,tree,drep,hf_samr_samr_RidWithAttributeArray_rids,0); return offset; } @@ -16048,6 +16049,8 @@ void proto_register_dcerpc_samr(void) { "Samr Field Force Pwd Change", "samr.samr_FieldsPresent.SAMR_FIELD_FORCE_PWD_CHANGE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_FORCE_PWD_CHANGE_tfs), ( 0x00020000 ), NULL, HFILL }}, { &hf_samr_samr_FieldsPresent_SAMR_FIELD_LAST_LOGOFF, { "Samr Field Last Logoff", "samr.samr_FieldsPresent.SAMR_FIELD_LAST_LOGOFF", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_LAST_LOGOFF_tfs), ( 0x00001000 ), NULL, HFILL }}, + { &hf_samr_samr_RidWithAttributeArray_rids, + { "Rids", "samr.samr_RidWithAttributeArray.rids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_Password_hash, { "Hash", "samr.samr_Password.hash", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_samr_samr_FieldsPresent_SAMR_FIELD_OWF_PWD, diff --git a/epan/dissectors/pidl/samr.cnf b/epan/dissectors/pidl/samr.cnf index 883b7aaf51..bdcd28ae4f 100644 --- a/epan/dissectors/pidl/samr.cnf +++ b/epan/dissectors/pidl/samr.cnf @@ -133,7 +133,6 @@ HF_RENAME hf_samr_samr_UserInfo3_rid hf_samr_rid HF_RENAME hf_samr_samr_UserInfo5_rid hf_samr_rid HF_RENAME hf_samr_samr_UserInfo21_rid hf_samr_rid HF_RENAME hf_samr_samr_RidWithAttribute_rid hf_samr_rid -HF_RENAME hf_samr_samr_RidWithAttributeArray_rids hf_samr_rid HF_RENAME hf_samr_samr_DispEntryGeneral_rid hf_samr_rid HF_RENAME hf_samr_samr_DispEntryFull_rid hf_samr_rid HF_RENAME hf_samr_samr_DispEntryFullGroup_rid hf_samr_rid diff --git a/epan/dissectors/pidl/samr.idl b/epan/dissectors/pidl/samr.idl index ca15e60e76..9488c65e22 100644 --- a/epan/dissectors/pidl/samr.idl +++ b/epan/dissectors/pidl/samr.idl @@ -137,9 +137,9 @@ SAMR_GROUP_ACCESS_REMOVE_MEMBER = 0x00000008, SAMR_GROUP_ACCESS_GET_MEMBERS = 0x00000010 } samr_GroupAccessMask; - // these bits are invalid and return ACCESS_DENIED + /* these bits are invalid and return ACCESS_DENIED */ const int SAMR_GROUP_ACCESS_MASK_INVALID = 0x0000ffe0; - // generic access + /* generic access */ const int SAMR_GROUP_ACCESS_ALL_ACCESS = 0x000f001f; const int SAMR_GROUP_ACCESS_ALL_READ = 0x00020010; const int SAMR_GROUP_ACCESS_ALL_WRITE = 0x0002000e; |