diff options
| author | Tim Potter <tpot@samba.org> | 2002-08-22 01:13:13 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-08-22 01:13:13 +0000 |
| commit | 50b37822a0fa2efecdddd695e2b08a148aece7fd (patch) | |
| tree | 285a7efcdc25f48252bede231d1ce7fe0d553ad7 /packet-dcerpc-nt.c | |
| parent | e09e2a27545931584f230bf856ad3654ffbd4130 (diff) | |
Some cleanups and fixes from Guy:
- combine proto_tree_add_text() and proto_tree_append_text() calls in the
access mask dissector
- make the specific access bits dissector functions return void instead of
an offset
I think Samba has the create user reply wrong. There is perhaps a uint32
marked as unknown that shouldn't be there. Removing this parses all the
captures I have.
svn path=/trunk/; revision=6057
Diffstat (limited to 'packet-dcerpc-nt.c')
| -rw-r--r-- | packet-dcerpc-nt.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/packet-dcerpc-nt.c b/packet-dcerpc-nt.c index d0f251aa91..31c04ee7cf 100644 --- a/packet-dcerpc-nt.c +++ b/packet-dcerpc-nt.c @@ -2,7 +2,7 @@ * Routines for DCERPC over SMB packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-nt.c,v 1.43 2002/08/21 21:29:22 tpot Exp $ + * $Id: packet-dcerpc-nt.c,v 1.44 2002/08/22 01:13:12 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -929,9 +929,8 @@ dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* Generic access rights */ item = proto_tree_add_text(subtree, tvb, offset - 4, 4, - "Generic rights"); - - proto_item_append_text(item, ": 0x%08x", access & GENERIC_RIGHTS_MASK); + "Generic rights: 0x%08x", + access & GENERIC_RIGHTS_MASK); generic = proto_item_add_subtree(item, ett_nt_access_mask_generic); @@ -966,9 +965,8 @@ dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* Standard access rights */ item = proto_tree_add_text(subtree, tvb, offset - 4, 4, - "Standard rights"); - - proto_item_append_text(item, ": 0x%08x", access & STANDARD_RIGHTS_MASK); + "Standard rights: 0x%08x", + access & STANDARD_RIGHTS_MASK); standard = proto_item_add_subtree(item, ett_nt_access_mask_standard); @@ -997,17 +995,13 @@ dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo, boring fashion. */ item = proto_tree_add_text(subtree, tvb, offset - 4, 4, - "Specific rights"); - - proto_item_append_text(item, ": 0x%08x", access & SPECIFIC_RIGHTS_MASK); + "Specific rights: 0x%08x", + access & SPECIFIC_RIGHTS_MASK); specific = proto_item_add_subtree(item, ett_nt_access_mask_specific); if (specific_rights_fn) { - - offset = specific_rights_fn( - tvb, offset - 4, specific, access); - + specific_rights_fn(tvb, offset - 4, specific, access); return offset; } |