diff options
| author | tpot <tpot@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-05-19 04:52:31 +0000 |
|---|---|---|
| committer | tpot <tpot@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-05-19 04:52:31 +0000 |
| commit | 0b463c9cd8748de4810a94c1f70ce10aa7e536ec (patch) | |
| tree | 73f5a01a8edf362b782e4835cbd55bc77f03e1da /packet-dcerpc-netlogon.c | |
| parent | 17f82cfe80b73eeca44f99df004ccafa482d10e3 (diff) | |
Remove hf argument to common routines for dissecting domain sids. Most
of the callers passed -1 for this parameter anyway.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10919 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-dcerpc-netlogon.c')
| -rw-r--r-- | packet-dcerpc-netlogon.c | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/packet-dcerpc-netlogon.c b/packet-dcerpc-netlogon.c index 5ed317e723..a6edda99ea 100644 --- a/packet-dcerpc-netlogon.c +++ b/packet-dcerpc-netlogon.c @@ -3,7 +3,7 @@ * Copyright 2001,2003 Tim Potter <tpot@samba.org> * 2002 structure and command dissectors by Ronnie Sahlberg * - * $Id: packet-dcerpc-netlogon.c,v 1.105 2004/05/01 00:34:28 sahlberg Exp $ + * $Id: packet-dcerpc-netlogon.c,v 1.106 2004/05/19 04:52:31 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -127,7 +127,6 @@ static int hf_netlogon_group_rid = -1; static int hf_netlogon_logon_srv = -1; static int hf_netlogon_principal = -1; static int hf_netlogon_logon_dom = -1; -static int hf_netlogon_resourcegroupdomainsid = -1; static int hf_netlogon_resourcegroupcount = -1; static int hf_netlogon_downlevel_domain_name = -1; static int hf_netlogon_dns_domain_name = -1; @@ -1224,8 +1223,7 @@ netlogon_dissect_VALIDATION_SAM_INFO(tvbuff_t *tvb, int offset, offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_logon_dom, 0); - offset = dissect_ndr_nt_PSID(tvb, offset, - pinfo, tree, drep, -1); + offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep); for(i=0;i<2;i++){ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1350,8 +1348,7 @@ netlogon_dissect_VALIDATION_SAM_INFO2(tvbuff_t *tvb, int offset, offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_logon_dom, 0); - offset = dissect_ndr_nt_PSID(tvb, offset, - pinfo, tree, drep, -1); + offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep); for(i=0;i<2;i++){ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1489,8 +1486,7 @@ netlogon_dissect_PAC_LOGON_INFO(tvbuff_t *tvb, int offset, offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_logon_dom, 0); - offset = dissect_ndr_nt_PSID(tvb, offset, - pinfo, tree, drep, -1); + offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep); for(i=0;i<2;i++){ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -1511,8 +1507,7 @@ netlogon_dissect_PAC_LOGON_INFO(tvbuff_t *tvb, int offset, dissect_ndr_nt_SID_AND_ATTRIBUTES_ARRAY, NDR_POINTER_UNIQUE, "SID_AND_ATTRIBUTES_ARRAY:", -1); - offset = dissect_ndr_nt_PSID(tvb, offset, - pinfo, tree, drep, hf_netlogon_resourcegroupdomainsid); + offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_resourcegroupcount, &rgc); @@ -2766,8 +2761,7 @@ netlogon_dissect_DELTA_POLICY(tvbuff_t *tvb, int offset, offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_domain_name, 0); - offset = dissect_ndr_nt_PSID(tvb, offset, - pinfo, tree, drep, -1); + offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep); offset = netlogon_dissect_QUOTA_LIMITS(tvb, offset, pinfo, tree, drep); @@ -3456,24 +3450,19 @@ netlogon_dissect_DELTA_ID_UNION(tvbuff_t *tvb, int offset, hf_netlogon_user_rid, NULL); break; case 13: - offset = dissect_ndr_nt_PSID(tvb, offset, - pinfo, tree, drep, -1); + offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep); break; case 14: - offset = dissect_ndr_nt_PSID(tvb, offset, - pinfo, tree, drep, -1); + offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep); break; case 15: - offset = dissect_ndr_nt_PSID(tvb, offset, - pinfo, tree, drep, -1); + offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep); break; case 16: - offset = dissect_ndr_nt_PSID(tvb, offset, - pinfo, tree, drep, -1); + offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep); break; case 17: - offset = dissect_ndr_nt_PSID(tvb, offset, - pinfo, tree, drep, -1); + offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep); break; case 18: offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, @@ -5318,7 +5307,7 @@ netlogon_dissect_DS_DOMAIN_TRUSTS(tvbuff_t *tvb, int offset, hf_netlogon_trust_attribs, &tmp); /* SID pointer */ - offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep, -1); + offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep); /* GUID */ offset = dissect_nt_GUID(tvb, offset, pinfo, tree, drep); @@ -6896,10 +6885,6 @@ static hf_register_info hf[] = { { "Domain", "netlogon.domain", FT_STRING, BASE_NONE, NULL, 0, "Domain", HFILL }}, - { &hf_netlogon_resourcegroupdomainsid, - { "ResourceGroupDomainSID", "netlogon.resourcegroupdomainsid", FT_STRING, BASE_NONE, - NULL, 0, "Resource Group Domain SID", HFILL }}, - { &hf_netlogon_resourcegroupcount, { "ResourceGroup count", "netlogon.resourcegroupcount", FT_UINT32, BASE_DEC, NULL, 0, "Number of Resource Groups", HFILL }}, |