diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-01-31 09:43:07 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-01-31 09:43:07 +0000 |
| commit | d3beff7c6af2cef07e098ef1f1fa3116f279c371 (patch) | |
| tree | 3ce26404ab3bcf860da5c73356ae14ab710c7ed0 /epan | |
| parent | 262d2b36c8c8fb0a82ae542d611dd5f5ce6babf2 (diff) | |
call dissect_ndr_uuit_t directly and avoid a dependency on packet-dcerpc-netlogon
svn path=/trunk/; revision=13214
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-lsa-ds.c | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-dcerpc-nt.h | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dcerpc-lsa-ds.c b/epan/dissectors/packet-dcerpc-lsa-ds.c index c5ee6d320c..740027c46c 100644 --- a/epan/dissectors/packet-dcerpc-lsa-ds.c +++ b/epan/dissectors/packet-dcerpc-lsa-ds.c @@ -55,6 +55,7 @@ static int proto_dcerpc_lsa_ds = -1; static int hf_lsa_ds_opnum = -1; +static int hf_lsa_ds_guid = -1; static int hf_lsa_ds_dominfo_level = -1; static int hf_lsa_ds_machine_role = -1; static int hf_lsa_ds_dominfo_flags = -1; @@ -107,7 +108,7 @@ lsa_ds_dissect_DSROLE_BASIC_INFO(tvbuff_t *tvb, int offset, hf_lsa_ds_dominfo_forest_name, 0); /* GUID */ - offset = dissect_nt_GUID(tvb, offset, pinfo, tree, drep); + offset = dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_lsa_ds_guid, NULL); proto_item_set_len(item, offset-old_offset); return offset; @@ -293,6 +294,10 @@ proto_register_dcerpc_lsa_ds(void) { "DNS name", "lsa_ds.dominfo.dnsname", FT_STRING, BASE_NONE, NULL, 0x0, "DNS Domain Name", HFILL}}, + { &hf_lsa_ds_guid, + { "GUID", "lsa_ds.guid", FT_STRING, BASE_NONE, + NULL, 0x0, "", HFILL}}, + { &hf_lsa_ds_dominfo_forest_name, { "Forest name", "lsa_ds.dominfo.forest", FT_STRING, BASE_NONE, NULL, 0x0, "DNS Forest Name", HFILL}}, diff --git a/epan/dissectors/packet-dcerpc-nt.h b/epan/dissectors/packet-dcerpc-nt.h index 3a41cfd244..b48f1a4025 100644 --- a/epan/dissectors/packet-dcerpc-nt.h +++ b/epan/dissectors/packet-dcerpc-nt.h @@ -181,11 +181,6 @@ dissect_nt_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo, gboolean is_open, gboolean is_close); int -dissect_nt_GUID(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, - guint8 *drep); - -int dissect_nt_LUID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep); |