diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2008-10-03 02:39:17 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2008-10-03 02:39:17 +0000 |
| commit | 48cabe4f20f98ae09dedfcaf4e390b32a9b1c3c9 (patch) | |
| tree | 5bb8b3e2d27d129f064cdac166de2aab5c9fb33f /epan/dissectors/pidl | |
| parent | 2a4ddda66a6e8d680111474ab1e5fc700bfdda7d (diff) | |
SAMR updates
svn path=/trunk/; revision=26340
Diffstat (limited to 'epan/dissectors/pidl')
| -rw-r--r-- | epan/dissectors/pidl/samr.cnf | 14 | ||||
| -rw-r--r-- | epan/dissectors/pidl/samr.idl | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/epan/dissectors/pidl/samr.cnf b/epan/dissectors/pidl/samr.cnf index d63c1b94c7..1679fe625d 100644 --- a/epan/dissectors/pidl/samr.cnf +++ b/epan/dissectors/pidl/samr.cnf @@ -1,7 +1,3 @@ -IMPORT security_secinfo offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_samr_sec_info, NULL); -HF_FIELD hf_samr_sec_info "SecInfo" "samr.sec_info" FT_UINT32 BASE_HEX NULL 0 "" "" "" - - # # policyhandle tracking # This block is to specify where a policyhandle is opened and where it is @@ -169,6 +165,7 @@ TYPE dom_sid2 "offset=cnf_dissect_dom_sid2(tvb, offset, pinfo, tree, drep);" FT_ TYPE lsa_SidArray "offset=cnf_dissect_lsa_SidArray(tvb, offset, pinfo, tree, drep);" FT_NONE BASE_NONE 0 NULL 4 +TYPE security_secinfo "offset=cnf_dissect_samr_security_secinfo(tvb, offset, pinfo, tree, drep);" FT_NONE BASE_NONE 0 NULL 4 # # ConnectX access masks @@ -507,4 +504,13 @@ cnf_dissect_lsa_SidArray(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr return offset; } + +static int +cnf_dissect_samr_security_secinfo(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint8 *drep _U_) +{ + offset = dissect_nt_security_information(tvb, offset, tree); + + return offset; +} + CODE END diff --git a/epan/dissectors/pidl/samr.idl b/epan/dissectors/pidl/samr.idl index 5828151c5f..8784c24e38 100644 --- a/epan/dissectors/pidl/samr.idl +++ b/epan/dissectors/pidl/samr.idl @@ -1310,7 +1310,7 @@ /* Function 0x3e */ NTSTATUS samr_Connect4( [in,unique,string,charset(UTF16)] uint16 *system_name, - [in] uint32 unknown, + [in] samr_ConnectRevision revision, [in] samr_ServerAccessMask access_mask, [out,ref] policy_handle *connect_handle ); |