diff options
author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2007-07-09 13:05:52 +0000 |
---|---|---|
committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2007-07-09 13:05:52 +0000 |
commit | b363b1664d13b28fbce3d410b174de41a8146433 (patch) | |
tree | 65a5868f41973339fd0a0680a36d3831953ecded /epan/dissectors/pidl | |
parent | 58bc1000962671d3aea51b82d0bbfc6f69fa0970 (diff) |
dissect lsa_Strings correctly in the samr dissector
svn path=/trunk/; revision=22274
Diffstat (limited to 'epan/dissectors/pidl')
-rw-r--r-- | epan/dissectors/pidl/samr.cnf | 10 | ||||
-rw-r--r-- | epan/dissectors/pidl/samr.idl | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/epan/dissectors/pidl/samr.cnf b/epan/dissectors/pidl/samr.cnf index 356f1363e7..bbc1e8b793 100644 --- a/epan/dissectors/pidl/samr.cnf +++ b/epan/dissectors/pidl/samr.cnf @@ -167,8 +167,6 @@ 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 lsa_Strings "offset=cnf_dissect_lsa_Strings(tvb, offset, pinfo, tree, drep);" FT_NONE BASE_NONE 0 NULL 4 - # # ConnectX access masks @@ -478,12 +476,4 @@ cnf_dissect_lsa_SidArray(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr return offset; } -static int -cnf_dissect_lsa_Strings(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, guint8 *drep _U_) -{ - /*XXX*/ - - return offset; -} - CODE END diff --git a/epan/dissectors/pidl/samr.idl b/epan/dissectors/pidl/samr.idl index 00f8324e15..eea39fb673 100644 --- a/epan/dissectors/pidl/samr.idl +++ b/epan/dissectors/pidl/samr.idl @@ -24,6 +24,12 @@ [string,charset(UTF16)] uint16 *name; } lsa_String; + typedef [public] struct { + uint32 count; + [size_is(count)] lsa_String *names; + } lsa_Strings; + + typedef [v1_enum] enum { SID_NAME_USE_NONE = 0,/* NOTUSED */ SID_NAME_USER = 1, /* user */ |