diff options
-rw-r--r-- | AUTHORS | 4 | ||||
-rw-r--r-- | doc/ethereal.pod.template | 1 | ||||
-rw-r--r-- | packet-dcerpc-lsa.c | 18 | ||||
-rw-r--r-- | packet-dcerpc-lsa.h | 4 |
4 files changed, 17 insertions, 10 deletions
@@ -1336,6 +1336,10 @@ Prabhakar Krishnan <Prabhakar.Krishnan[AT]netapp.com> { response } +Jim McDonough <jmcd[AT]us.ibm.com> { + Support for LsaQueryInformationPolicy2 in the LSA dissector +} + Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template index dc87e0bfd1..befe3dbe83 100644 --- a/doc/ethereal.pod.template +++ b/doc/ethereal.pod.template @@ -1462,6 +1462,7 @@ B<http://www.ethereal.com>. Liviu Daia <Liviu.Daia[AT]imar.ro> Richard Urwin <rurwin[AT]schenck.co.uk> Prabhakar Krishnan <Prabhakar.Krishnan[AT]netapp.com> + Jim McDonough <jmcd[AT]us.ibm.com> Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/packet-dcerpc-lsa.c b/packet-dcerpc-lsa.c index 454c35f843..3441aead0f 100644 --- a/packet-dcerpc-lsa.c +++ b/packet-dcerpc-lsa.c @@ -3,7 +3,7 @@ * Copyright 2001, Tim Potter <tpot@samba.org> * 2002 Added LSA command dissectors Ronnie Sahlberg * - * $Id: packet-dcerpc-lsa.c,v 1.52 2002/06/24 00:03:17 tpot Exp $ + * $Id: packet-dcerpc-lsa.c,v 1.53 2002/07/31 21:22:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -3106,7 +3106,7 @@ lsa_dissect_lsasettrusteddomaininfo_reply(tvbuff_t *tvb, int offset, } static int -lsa_dissect_lsafunction_2e_rqst(tvbuff_t *tvb, int offset, +lsa_dissect_lsaqueryinformationpolicy2_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3120,11 +3120,13 @@ lsa_dissect_lsafunction_2e_rqst(tvbuff_t *tvb, int offset, } static int -lsa_dissect_lsafunction_2e_reply(tvbuff_t *tvb, int offset, +lsa_dissect_lsaqueryinformationpolicy2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { + /* This is really a pointer to a pointer though the first level is REF + so we just ignore that one */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, - lsa_dissect_POLICY_INFORMATION, NDR_POINTER_REF, + lsa_dissect_POLICY_INFORMATION, NDR_POINTER_UNIQUE, "POLICY_INFORMATION pointer: info", -1, 0); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -3933,9 +3935,9 @@ static dcerpc_sub_dissector dcerpc_lsa_dissectors[] = { { LSA_LSAGETUSERNAME, "GetUsername", lsa_dissect_lsagetusername_rqst, lsa_dissect_lsagetusername_reply }, - { LSA_LSAFUNCTION_2E, "LSAFUNCTION_2E", - lsa_dissect_lsafunction_2e_rqst, - lsa_dissect_lsafunction_2e_reply }, + { LSA_LSAQUERYINFORMATIONPOLICY2, "QueryInformationPolicy2", + lsa_dissect_lsaqueryinformationpolicy2_rqst, + lsa_dissect_lsaqueryinformationpolicy2_reply }, { LSA_LSAFUNCTION_2F, "LSAFUNCTION_2F", lsa_dissect_lsafunction_2f_rqst, lsa_dissect_lsafunction_2f_reply }, @@ -4025,7 +4027,7 @@ static const value_string lsa_opnum_vals[] = { { LSA_LSARETRIEVEPRIVATEDATA, "RetrievePrivateData" }, { LSA_LSAOPENPOLICY2, "OpenPolicy2" }, { LSA_LSAGETUSERNAME, "GetUsername" }, - { LSA_LSAFUNCTION_2E, "LSAFUNCTION_2E" }, + { LSA_LSAQUERYINFORMATIONPOLICY2, "QueryInformationPolicy2" }, { LSA_LSAFUNCTION_2F, "LSAFUNCTION_2F" }, { LSA_LSAQUERYTRUSTEDDOMAININFOBYNAME, "QueryTrustedDomainInfoByName" }, { LSA_LSASETTRUSTEDDOMAININFOBYNAME, "SetTrustedDomainInfoByName" }, diff --git a/packet-dcerpc-lsa.h b/packet-dcerpc-lsa.h index 7322cc1f56..a820827286 100644 --- a/packet-dcerpc-lsa.h +++ b/packet-dcerpc-lsa.h @@ -2,7 +2,7 @@ * Routines for SMB \PIPE\lsarpc packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-lsa.h,v 1.5 2002/06/18 13:18:30 sahlberg Exp $ + * $Id: packet-dcerpc-lsa.h,v 1.6 2002/07/31 21:22:29 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -72,7 +72,7 @@ #define LSA_LSARETRIEVEPRIVATEDATA 0x2b #define LSA_LSAOPENPOLICY2 0x2c #define LSA_LSAGETUSERNAME 0x2d -#define LSA_LSAFUNCTION_2E 0x2e +#define LSA_LSAQUERYINFORMATIONPOLICY2 0x2e #define LSA_LSAFUNCTION_2F 0x2f #define LSA_LSAQUERYTRUSTEDDOMAININFOBYNAME 0x30 #define LSA_LSASETTRUSTEDDOMAININFOBYNAME 0x31 |