forked from osmocom/wireshark
Change the interface to dissect_nt_sid so that we can provide a hf field to use
to describe the sid instead of the default smb.sid one svn path=/trunk/; revision=7708
This commit is contained in:
Ronnie Sahlberg
parent
8271c6a106
commit
14f5d761c1
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright 2001,2003 Tim Potter <tpot@samba.org>
|
||||
* 2002 Added all command dissectors Ronnie Sahlberg
|
||||
*
|
||||
* $Id: packet-dcerpc-samr.c,v 1.88 2003/05/21 10:06:29 sahlberg Exp $
|
||||
* $Id: packet-dcerpc-samr.c,v 1.89 2003/05/21 10:16:09 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -490,7 +490,7 @@ dissect_ndr_nt_SID(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
|
||||
hf_samr_count, NULL);
|
||||
|
||||
offset = dissect_nt_sid(tvb, offset, tree, "Domain", &sid_str);
|
||||
offset = dissect_nt_sid(tvb, offset, tree, "Domain", &sid_str, hf_sid);
|
||||
|
||||
dcv->private_data = sid_str;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for SMB packet dissection
|
||||
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
|
||||
*
|
||||
* $Id: packet-smb-common.h,v 1.23 2003/05/15 02:14:00 tpot Exp $
|
||||
* $Id: packet-smb-common.h,v 1.24 2003/05/21 10:16:10 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -56,7 +56,7 @@ const gchar *get_unicode_or_ascii_string(tvbuff_t *tvb, int *offsetp,
|
|||
int dissect_smb_64bit_time(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_date);
|
||||
|
||||
int dissect_nt_sid(tvbuff_t *tvb, int offset, proto_tree *parent_tree,
|
||||
char *name, char **sid_str);
|
||||
char *name, char **sid_str, int hf_sid);
|
||||
|
||||
/*
|
||||
* Stuff for dissecting NT access masks
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for SMB net logon packet dissection
|
||||
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
|
||||
*
|
||||
* $Id: packet-smb-logon.c,v 1.32 2003/05/01 18:11:20 guy Exp $
|
||||
* $Id: packet-smb-logon.c,v 1.33 2003/05/21 10:16:10 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -511,7 +511,7 @@ dissect_announce_change(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|||
|
||||
/* Domain SID */
|
||||
offset = dissect_nt_sid(
|
||||
tvb, offset, tree, "Domain", NULL);
|
||||
tvb, offset, tree, "Domain", NULL, -1);
|
||||
}
|
||||
|
||||
/* NT version */
|
||||
|
|
@ -564,7 +564,7 @@ dissect_smb_sam_logon_req(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre
|
|||
offset = ((offset + 3)/4)*4;
|
||||
|
||||
/* Domain SID */
|
||||
offset = dissect_nt_sid(tvb, offset, tree, "Domain", NULL);
|
||||
offset = dissect_nt_sid(tvb, offset, tree, "Domain", NULL, -1);
|
||||
}
|
||||
|
||||
/* NT version */
|
||||
|
|
|
|||
30
packet-smb.c
30
packet-smb.c
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
|
||||
* 2001 Rewrite by Ronnie Sahlberg and Guy Harris
|
||||
*
|
||||
* $Id: packet-smb.c,v 1.340 2003/05/16 10:24:13 sahlberg Exp $
|
||||
* $Id: packet-smb.c,v 1.341 2003/05/21 10:16:10 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -6998,11 +6998,15 @@ free_g_string(void *arg)
|
|||
}
|
||||
|
||||
/* Dissect a NT SID. Label it with 'name' and return a string version of
|
||||
the SID in the 'sid_str' parameter which must be freed by the caller. */
|
||||
the SID in the 'sid_str' parameter which must be freed by the caller.
|
||||
hf_sid can be -1 if the caller doesnt care what name is used and then
|
||||
"smb.sid" will be the default instead. If the caller wants a more
|
||||
appropriate hf field, it will just pass a FT_STRING hf field here
|
||||
*/
|
||||
|
||||
int
|
||||
dissect_nt_sid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, char *name,
|
||||
char **sid_str)
|
||||
char **sid_str, int hf_sid)
|
||||
{
|
||||
proto_item *item = NULL;
|
||||
proto_tree *tree = NULL;
|
||||
|
|
@ -7020,6 +7024,10 @@ dissect_nt_sid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, char *name,
|
|||
char sid_string[245];
|
||||
char *sid_name;
|
||||
|
||||
if(hf_sid==-1){
|
||||
hf_sid=hf_smb_sid;
|
||||
}
|
||||
|
||||
/* revision of sid */
|
||||
revision = tvb_get_guint8(tvb, offset);
|
||||
rev_offset = offset;
|
||||
|
|
@ -7084,9 +7092,9 @@ dissect_nt_sid(tvbuff_t *tvb, int offset, proto_tree *parent_tree, char *name,
|
|||
|
||||
if(parent_tree){
|
||||
if(sid_name){
|
||||
item = proto_tree_add_string_format(parent_tree, hf_smb_sid, tvb, old_offset, offset-old_offset, sid_string, "%s: %s (%s)", name, sid_string, sid_name);
|
||||
item = proto_tree_add_string_format(parent_tree, hf_sid, tvb, old_offset, offset-old_offset, sid_string, "%s: %s (%s)", name, sid_string, sid_name);
|
||||
} else {
|
||||
item = proto_tree_add_string_format(parent_tree, hf_smb_sid, tvb, old_offset, offset-old_offset, sid_string, "%s: %s", name, sid_string);
|
||||
item = proto_tree_add_string_format(parent_tree, hf_sid, tvb, old_offset, offset-old_offset, sid_string, "%s: %s", name, sid_string);
|
||||
}
|
||||
tree = proto_item_add_subtree(item, ett_smb_sid);
|
||||
}
|
||||
|
|
@ -7540,7 +7548,7 @@ dissect_nt_v2_ace(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
tvb, offset, pinfo, tree, drep, hf_smb_access_mask, ami);
|
||||
|
||||
/* SID */
|
||||
offset = dissect_nt_sid(tvb, offset, tree, "ACE", &sid_str);
|
||||
offset = dissect_nt_sid(tvb, offset, tree, "ACE", &sid_str, -1);
|
||||
|
||||
if (item)
|
||||
proto_item_append_text(
|
||||
|
|
@ -7761,16 +7769,16 @@ dissect_nt_sec_desc(tvbuff_t *tvb, int offset, packet_info *pinfo,
|
|||
/*owner SID*/
|
||||
if(owner_sid_offset){
|
||||
if (len == -1)
|
||||
offset = dissect_nt_sid(tvb, offset, tree, "Owner", NULL);
|
||||
offset = dissect_nt_sid(tvb, offset, tree, "Owner", NULL, -1);
|
||||
else
|
||||
dissect_nt_sid(
|
||||
tvb, old_offset+owner_sid_offset, tree, "Owner", NULL);
|
||||
tvb, old_offset+owner_sid_offset, tree, "Owner", NULL, -1);
|
||||
}
|
||||
|
||||
/*group SID*/
|
||||
if(group_sid_offset){
|
||||
dissect_nt_sid(
|
||||
tvb, old_offset+group_sid_offset, tree, "Group", NULL);
|
||||
tvb, old_offset+group_sid_offset, tree, "Group", NULL, -1);
|
||||
}
|
||||
|
||||
/* sacl */
|
||||
|
|
@ -7832,7 +7840,7 @@ dissect_nt_user_quota(tvbuff_t *tvb, proto_tree *tree, int offset, guint16 *bcp)
|
|||
|
||||
/* SID of the user */
|
||||
old_sid_offset=offset;
|
||||
offset = dissect_nt_sid(tvb, offset, tree, "Quota", NULL);
|
||||
offset = dissect_nt_sid(tvb, offset, tree, "Quota", NULL, -1);
|
||||
*bcp -= (offset-old_sid_offset);
|
||||
|
||||
if(qsize){
|
||||
|
|
@ -7906,7 +7914,7 @@ dissect_nt_trans_data_request(tvbuff_t *tvb, packet_info *pinfo, int offset, pro
|
|||
proto_tree_add_text(tree, tvb, offset, 4, "Length of SID: %d", tvb_get_letohl(tvb, offset));
|
||||
offset +=4;
|
||||
|
||||
offset = dissect_nt_sid(tvb, offset, tree, "Quota", NULL);
|
||||
offset = dissect_nt_sid(tvb, offset, tree, "Quota", NULL, -1);
|
||||
break;
|
||||
case NT_TRANS_SET_USER_QUOTA:
|
||||
offset = dissect_nt_user_quota(tvb, tree, offset, &bcp);
|
||||
|
|
|
|||
Loading…
Reference in New Issue