svn commit: samba r11262 - in branches/SAMBA_4_0/source: librpc/idl
pidl/lib/Parse/Pidl/Ethereal
tpot at samba.org
tpot at samba.org
Sun Oct 23 01:19:39 GMT 2005
Author: tpot
Date: 2005-10-23 01:19:38 +0000 (Sun, 23 Oct 2005)
New Revision: 11262
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11262
Log:
Try to get the equivalent of a subcontext in pidl ethereal conformance
files working. It doesn't quite work though. (-:
This patch also allows a struct.field format to be used in an IMPORT
statement instead of a type name.
Jelmer, what do you think?
Modified:
branches/SAMBA_4_0/source/librpc/idl/winreg.cnf
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/winreg.cnf
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/winreg.cnf 2005-10-22 08:00:09 UTC (rev 11261)
+++ branches/SAMBA_4_0/source/librpc/idl/winreg.cnf 2005-10-23 01:19:38 UTC (rev 11262)
@@ -50,3 +50,5 @@
HF_RENAME hf_winreg_winreg_OpenHKDD_handle hf_winreg_handle
HF_RENAME hf_winreg_winreg_OpenHKPT_handle hf_winreg_handle
HF_RENAME hf_winreg_winreg_OpenHKPN_handle hf_winreg_handle
+
+IMPORT KeySecurityData.data offset = dissect_nt_sec_desc(tvb, offset, pinfo, tree, drep, FALSE, -1, NULL);
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm 2005-10-22 08:00:09 UTC (rev 11261)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm 2005-10-23 01:19:38 UTC (rev 11262)
@@ -292,6 +292,10 @@
if ($conformance->{imports}->{$l->{DATA_TYPE}}) {
$call = $conformance->{imports}->{$l->{DATA_TYPE}}->{DATA};
$conformance->{imports}->{$l->{DATA_TYPE}}->{USED} = 1;
+ } elsif (defined($conformance->{imports}->{"$pn.$e->{NAME}"})) {
+ $call = $conformance->{imports}->{"$pn.$e->{NAME}"}->{DATA};
+ $conformance->{imports}->{"$pn.$e->{NAME}"}->{USED} = 1;
+
} elsif (defined($conformance->{types}->{$l->{DATA_TYPE}})) {
$call= $conformance->{types}->{$l->{DATA_TYPE}}->{DISSECTOR_NAME};
$conformance->{types}->{$l->{DATA_TYPE}}->{USED} = 1;
More information about the samba-cvs
mailing list