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

diff --git a/packet-dcerpc-efs.c b/packet-dcerpc-efs.c
index a1224ae2694c0b252f4218d6a2c94fa8976ede2f..271e37e7f4ce8959d1b43c3f0b6c1494746d7135 100755 (executable)
--- a/packet-dcerpc-efs.c
+++ b/packet-dcerpc-efs.c
@@ -2,7 +2,7 @@
  * Routines for the efsrpc MSRPC interface\r
  * Copyright 2004 Ronnie Sahlberg, Jean-Baptiste Marchand\r
  *\r
- * $Id: packet-dcerpc-efs.c,v 1.1 2004/04/29 22:40:21 sahlberg Exp $\r
+ * $Id: packet-dcerpc-efs.c,v 1.2 2004/05/19 04:52:31 tpot Exp $\r
  *\r
  * Ethereal - Network traffic analyzer\r
  * By Gerald Combs <gerald@ethereal.com>\r
@@ -317,8 +317,7 @@ efsrpc_dissect_efs_SID_ptr(tvbuff_t *tvb, int offset,
                                     packet_info *pinfo, proto_tree *tree,\r
                                     guint8 *drep)\r
 {\r
-       offset = dissect_ndr_nt_SID(tvb, offset,\r
-               pinfo, tree, drep, -1);\r
+       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);\r
 \r
        return offset;\r
 }\r

diff --git a/packet-dcerpc-lsa.c b/packet-dcerpc-lsa.c
index a81e2dba1b3f69051bf780937437f8f0c926a53a..257ff453a9ce9a1ca0aff6aac11cf81fa0919e49 100644 (file)
--- a/packet-dcerpc-lsa.c
+++ b/packet-dcerpc-lsa.c
@@ -3,7 +3,7 @@
  * Copyright 2001,2003 Tim Potter <tpot@samba.org>
  *  2002  Added LSA command dissectors  Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-lsa.c,v 1.93 2004/03/30 07:39:04 sharpe Exp $
+ * $Id: packet-dcerpc-lsa.c,v 1.94 2004/05/19 04:52:31 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -73,7 +73,6 @@ static int hf_lsa_max_count = -1;
 static int hf_lsa_index = -1;
 static int hf_lsa_fqdomain = -1;
 static int hf_lsa_domain = -1;
-static int hf_lsa_domain_sid = -1;
 static int hf_lsa_acct = -1;
 static int hf_lsa_server_role = -1;
 static int hf_lsa_source = -1;
@@ -794,8 +793,7 @@ lsa_dissect_POLICY_PRIMARY_DOMAIN_INFO(tvbuff_t *tvb, int offset,
                hf_lsa_domain, 0);
 
        /* sid */
-       offset = dissect_ndr_nt_PSID(tvb, offset,
-               pinfo, tree, drep, hf_lsa_domain_sid);
+       offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep);
 
        proto_item_set_len(item, offset-old_offset);
        return offset;
@@ -821,8 +819,7 @@ lsa_dissect_POLICY_ACCOUNT_DOMAIN_INFO(tvbuff_t *tvb, int offset,
                hf_lsa_domain, 0);
 
        /* sid */
-       offset = dissect_ndr_nt_PSID(tvb, offset,
-               pinfo, tree, drep, hf_lsa_domain_sid);
+       offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep);
 
        proto_item_set_len(item, offset-old_offset);
        return offset;
@@ -1036,7 +1033,7 @@ lsa_dissect_POLICY_DNS_DOMAIN_INFO(tvbuff_t *tvb, int offset,
                pinfo, tree, drep);
 
        /* SID pointer */
-       offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep, hf_lsa_domain_sid);
+       offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep);
 
        proto_item_set_len(item, offset-old_offset);
        return offset;
@@ -1370,8 +1367,7 @@ lsa_dissect_LSA_TRUST_INFORMATION(tvbuff_t *tvb, int offset,
                hf_lsa_name, 0);
 
        /* sid */
-       offset = dissect_ndr_nt_PSID(tvb, offset,
-               pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep);
 
        proto_item_set_len(item, offset-old_offset);
        return offset;
@@ -1460,8 +1456,7 @@ lsa_dissect_LSA_TRUST_INFORMATION_EX(tvbuff_t *tvb, int offset,
                hf_lsa_flat_name, 0);
 
        /* sid */
-       offset = dissect_ndr_nt_PSID(tvb, offset,
-               pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep);
 
        /* direction */
         offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
@@ -1726,8 +1721,7 @@ lsa_dissect_lsarclearauditlog_rqst(tvbuff_t *tvb, int offset,
        offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
                        hf_lsa_hnd, NULL, NULL, FALSE, FALSE);
 
-       offset = dissect_ndr_nt_SID(tvb, offset,
-               pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
 
        /* unknown */
         offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
@@ -1807,8 +1801,7 @@ lsa_dissect_lsaropentrusteddomain_rqst(tvbuff_t *tvb, int offset,
        offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
                        hf_lsa_hnd, NULL, NULL, FALSE, FALSE);
 
-       offset = dissect_ndr_nt_SID(tvb, offset,
-               pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
 
        offset = lsa_dissect_ACCESS_MASK(tvb, offset,
                pinfo, tree, drep);
@@ -1838,8 +1831,7 @@ lsa_dissect_lsardeletetrusteddomain_rqst(tvbuff_t *tvb, int offset,
        offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
                        hf_lsa_hnd, NULL, NULL, FALSE, FALSE);
 
-       offset = dissect_ndr_nt_SID(tvb, offset,
-               pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
 
        return offset;
 }
@@ -2291,8 +2283,7 @@ lsa_dissect_LSA_TRUSTED_DOMAIN(tvbuff_t *tvb, int offset,
                hf_lsa_domain, 0);
 
        /* sid */
-       offset = dissect_ndr_nt_PSID(tvb, offset,
-               pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep);
 
        proto_item_set_len(item, offset-old_offset);
        return offset;
@@ -2554,8 +2545,7 @@ lsa_dissect_lsaropenaccount_rqst(tvbuff_t *tvb, int offset,
                        hf_lsa_hnd, NULL, NULL, FALSE, FALSE);
 
        /* [in, ref] SID *account */
-       offset = dissect_ndr_nt_SID(tvb, offset,
-               pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
 
        /* [in] ACCESS_MASK access */
        offset = lsa_dissect_ACCESS_MASK(tvb, offset,
@@ -2920,8 +2910,7 @@ lsa_dissect_lsarenumerateaccountrights_rqst(tvbuff_t *tvb, int offset,
                        hf_lsa_hnd, NULL, NULL, FALSE, FALSE);
 
        /* [in, ref] SID *account */
-       offset = dissect_ndr_nt_SID(tvb, offset,
-               pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
 
        return offset;
 }
@@ -2951,8 +2940,7 @@ lsa_dissect_lsaraddaccountrights_rqst(tvbuff_t *tvb, int offset,
                        hf_lsa_hnd, NULL, NULL, FALSE, FALSE);
 
        /* [in, ref] SID *account */
-       offset = dissect_ndr_nt_SID(tvb, offset,
-               pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
 
        /* [in, ref] LSA_UNICODE_STRING_ARRAY *rights */
        offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
@@ -2982,8 +2970,7 @@ lsa_dissect_lsarremoveaccountrights_rqst(tvbuff_t *tvb, int offset,
                        hf_lsa_hnd, NULL, NULL, FALSE, FALSE);
 
        /* [in, ref] SID *account */
-       offset = dissect_ndr_nt_SID(tvb, offset,
-               pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
 
        /* remove all */
        offset = dissect_ndr_uint8 (tvb, offset, pinfo, tree, drep,
@@ -3091,8 +3078,7 @@ lsa_dissect_lsarquerytrusteddomaininfo_rqst(tvbuff_t *tvb, int offset,
                        hf_lsa_hnd, NULL, NULL, FALSE, FALSE);
 
        /* [in, ref] SID *sid */
-       offset = dissect_ndr_nt_SID(tvb, offset,
-               pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
 
        /* [in] TRUSTED_INFORMATION_CLASS level */
         offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
@@ -3162,8 +3148,7 @@ lsa_dissect_lsarsettrusteddomaininfo_rqst(tvbuff_t *tvb, int offset,
                        hf_lsa_hnd, NULL, NULL, FALSE, FALSE);
 
        /* [in, ref] SID *sid */
-       offset = dissect_ndr_nt_SID(tvb, offset,
-               pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
 
        /* [in] TRUSTED_INFORMATION_CLASS level */
         offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep,
@@ -3373,8 +3358,7 @@ lsa_dissect_lsarcreateaccount_rqst(tvbuff_t *tvb, int offset,
        offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
                        hf_lsa_hnd, NULL, NULL, FALSE, FALSE);
 
-       offset = dissect_ndr_nt_SID(tvb, offset,
-               pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
 
        offset = lsa_dissect_ACCESS_MASK(tvb, offset,
                pinfo, tree, drep);
@@ -4222,10 +4206,6 @@ proto_register_dcerpc_lsa(void)
                { "Domain", "lsa.domain", FT_STRING, BASE_NONE,
                NULL, 0x0, "Domain", HFILL }},
 
-       { &hf_lsa_domain_sid,
-               { "Domain SID", "lsa.domain_sid", FT_STRING, BASE_NONE,
-               NULL, 0x0, "The Domain SID", HFILL }},
-
        { &hf_lsa_acct,
                { "Account", "lsa.acct", FT_STRING, BASE_NONE,
                NULL, 0x0, "Account", HFILL }},

diff --git a/packet-dcerpc-netlogon.c b/packet-dcerpc-netlogon.c
index 5ed317e723856db3726e5dba27967fc628ceb839..a6edda99ea1562c68424fb8081e825ade663a08f 100644 (file)
--- 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 }},

diff --git a/packet-dcerpc-nt.c b/packet-dcerpc-nt.c
index 2d9f69381d92866ae1dd2e4f3eacd699f302f8ff..12d2d20509f723cac9465255fa89c2848dcfa41f 100644 (file)
--- a/packet-dcerpc-nt.c
+++ b/packet-dcerpc-nt.c
@@ -2,7 +2,7 @@
  * Routines for DCERPC over SMB packet disassembly
  * Copyright 2001-2003, Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-nt.c,v 1.79 2004/05/15 10:05:09 tpot Exp $
+ * $Id: packet-dcerpc-nt.c,v 1.80 2004/05/19 04:52:31 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1011,11 +1011,12 @@ int dissect_ndr_str_pointer_item(tvbuff_t *tvb, gint offset,
 
 /* SID dissection routines */
 
-static int hf_nt_count= -1;
+static int hf_nt_count = -1;
+static int hf_nt_domain_sid = -1;
 
 int
 dissect_ndr_nt_SID(tvbuff_t *tvb, int offset, packet_info *pinfo, 
-                  proto_tree *tree, guint8 *drep, int hf_sid)
+                  proto_tree *tree, guint8 *drep)
 {
        dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
        dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -1038,7 +1039,8 @@ dissect_ndr_nt_SID(tvbuff_t *tvb, int offset, packet_info *pinfo,
        offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
                        hf_nt_count, NULL);
 
-       offset = dissect_nt_sid(tvb, offset, tree, name, &sid_str, hf_sid);
+       offset = dissect_nt_sid(tvb, offset, tree, name, &sid_str, 
+                               hf_nt_domain_sid);
 
        /* dcv can be null, for example when this ndr structure is embedded
         * inside non-dcerpc pdus, i.e. kerberos PAC structure
@@ -1054,9 +1056,8 @@ static int
 dissect_ndr_nt_SID_hf_through_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, 
                   proto_tree *tree, guint8 *drep)
 {
-       dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
+       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
 
-       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep, di->hf_index);
        return offset;
 }
 
@@ -1065,7 +1066,7 @@ static gint ett_nt_sid_pointer = -1;
 int
 dissect_ndr_nt_PSID(tvbuff_t *tvb, int offset,
                    packet_info *pinfo, proto_tree *parent_tree,
-                   guint8 *drep, int hf_sid)
+                   guint8 *drep)
 {
        proto_item *item=NULL;
        proto_tree *tree=NULL;
@@ -1079,7 +1080,7 @@ dissect_ndr_nt_PSID(tvbuff_t *tvb, int offset,
 
        offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
                        dissect_ndr_nt_SID_hf_through_ptr, NDR_POINTER_UNIQUE,
-                       "SID pointer", hf_sid);
+                       "SID pointer", hf_nt_domain_sid);
 
        proto_item_set_len(item, offset-old_offset);
        return offset;
@@ -1264,7 +1265,7 @@ dissect_ndr_nt_PSID_no_hf(tvbuff_t *tvb, int offset,
                              packet_info *pinfo, proto_tree *parent_tree,
                              guint8 *drep)
 {
-       offset=dissect_ndr_nt_PSID(tvb, offset, pinfo, parent_tree, drep, -1);
+       offset=dissect_ndr_nt_PSID(tvb, offset, pinfo, parent_tree, drep);
        return offset;
 }
 
@@ -1324,7 +1325,7 @@ dissect_ndr_nt_SID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset,
                tree = proto_item_add_subtree(item, ett_nt_sid_and_attributes);
        }
 
-       offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_PSID(tvb, offset, pinfo, tree, drep);
 
         offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
                                      hf_nt_attrib, NULL);
@@ -1453,6 +1454,11 @@ void dcerpc_smb_init(int proto_dcerpc)
 
                /* SIDs */
 
+               { &hf_nt_domain_sid,
+                 { "Domain SID", "nt.domain_sid", 
+                   FT_STRING, BASE_NONE, NULL, 0x0, 
+                   "The Domain SID", HFILL }},
+
                { &hf_nt_count,
                  { "Count", "nt.count", 
                    FT_UINT32, BASE_DEC, NULL, 0x0, 

diff --git a/packet-dcerpc-nt.h b/packet-dcerpc-nt.h
index 2506739cea1e7f183e7f1d639a776e5c73efc597..c6457814ad61b63705236b0a5c2a9d4904551ff8 100644 (file)
--- a/packet-dcerpc-nt.h
+++ b/packet-dcerpc-nt.h
@@ -2,7 +2,7 @@
  * Routines for DCERPC over SMB packet disassembly
  * Copyright 2001-2003 Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-nt.h,v 1.49 2004/01/19 20:10:35 jmayer Exp $
+ * $Id: packet-dcerpc-nt.h,v 1.50 2004/05/19 04:52:31 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -90,12 +90,12 @@ dissect_ndr_nt_LOGON_HOURS(tvbuff_t *tvb, int offset,
                        guint8 *drep);
 int
 dissect_ndr_nt_SID(tvbuff_t *tvb, int offset,
-                       packet_info *pinfo, proto_tree *tree,
-                       guint8 *drep, int hf_sid);
+                  packet_info *pinfo, proto_tree *tree,
+                  guint8 *drep);
 int
 dissect_ndr_nt_PSID(tvbuff_t *tvb, int offset,
-                             packet_info *pinfo, proto_tree *parent_tree,
-                             guint8 *drep, int hf_sid);
+                   packet_info *pinfo, proto_tree *parent_tree,
+                   guint8 *drep);
 int
 dissect_ndr_nt_PSID_ARRAY(tvbuff_t *tvb, int offset,
                        packet_info *pinfo, proto_tree *parent_tree,

diff --git a/packet-dcerpc-samr.c b/packet-dcerpc-samr.c
index 3d79c497eac4273cb2542cd9bed17b00ff0cc7b8..fb1831bcedb38f5a66ec471125eaba2fa415dad6 100644 (file)
--- a/packet-dcerpc-samr.c
+++ b/packet-dcerpc-samr.c
@@ -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.106 2004/05/15 10:05:09 tpot Exp $
+ * $Id: packet-dcerpc-samr.c,v 1.107 2004/05/19 04:52:30 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -454,7 +454,7 @@ static int
 dissect_ndr_nt_SID_no_hf(tvbuff_t *tvb, int offset, packet_info *pinfo, 
                   proto_tree *tree, guint8 *drep)
 {
-       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep, -1);
+       offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep);
        return offset;
 }