Make LSA_SECURITY_DESCRIPTOR dissector call dissect_nt_sec_desc()

instead of just displaying it as some hex string.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4937 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packet-dcerpc-netlogon.c b/packet-dcerpc-netlogon.c
index 370c2470680e463d5efe58283933178341130e47..857e265c9744e8aa20361e3ffa92d5a0be3352b7 100644 (file)
--- a/packet-dcerpc-netlogon.c
+++ b/packet-dcerpc-netlogon.c
@@ -3,7 +3,7 @@
  * Copyright 2001, Tim Potter <tpot@samba.org>
  *  2002 structure and command dissectors by Ronnie Sahlberg
  *
  * Copyright 2001, Tim Potter <tpot@samba.org>
  *  2002 structure and command dissectors by Ronnie Sahlberg
  *

- * $Id: packet-dcerpc-netlogon.c,v 1.6 2002/03/13 10:52:22 sahlberg Exp $
+ * $Id: packet-dcerpc-netlogon.c,v 1.7 2002/03/13 11:19:16 sahlberg Exp $

  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>


@@ -34,6 +34,7 @@
 #include "packet-dcerpc-nt.h"
 #include "packet-dcerpc-netlogon.h"
 #include "smb.h"       /* for "NT_errors[]" */
 #include "packet-dcerpc-nt.h"
 #include "packet-dcerpc-netlogon.h"
 #include "smb.h"       /* for "NT_errors[]" */

+#include "packet-smb-common.h"

 
 static int proto_dcerpc_netlogon = -1;
 static int hf_netlogon_rc = -1;
 
 static int proto_dcerpc_netlogon = -1;
 static int hf_netlogon_rc = -1;


@@ -203,7 +204,7 @@ lsa_dissect_LSA_SECURITY_DESCRIPTOR_data(tvbuff_t *tvb, int offset,
 {
        guint32 len;
        dcerpc_info *di;
 {
        guint32 len;
        dcerpc_info *di;

-
+       

        di=pinfo->private_data;
        if(di->conformant_run){
                /*just a run to handle conformant arrays, nothing to dissect */
        di=pinfo->private_data;
        if(di->conformant_run){
                /*just a run to handle conformant arrays, nothing to dissect */


@@ -212,8 +213,12 @@ lsa_dissect_LSA_SECURITY_DESCRIPTOR_data(tvbuff_t *tvb, int offset,
 
         offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
                                      hf_netlogon_lsa_sd_size, &len);
 
         offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
                                      hf_netlogon_lsa_sd_size, &len);

-       proto_tree_add_item(tree, hf_netlogon_lsa_sd_data, tvb, offset, len, FALSE);
+
+       dissect_nt_sec_desc(tvb, pinfo, offset, tree, len);
+       offset += len;
+/*     proto_tree_add_item(tree, hf_netlogon_lsa_sd_data, tvb, offset, len, FALSE);

        offset += len;
        offset += len;

+*/

 
        return offset;
 }
 
        return offset;
 }