summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-10-23 01:19:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:10 -0500
commit79b667eda998596d6a9020fe61821f6878ece376 (patch)
tree8f828d276fd95488f75beb28bbfe48f813d4531d
parent9759d435ca014b192a79d7de2cd2eb0fb92745b9 (diff)
downloadsamba-79b667eda998596d6a9020fe61821f6878ece376.tar.gz
samba-79b667eda998596d6a9020fe61821f6878ece376.tar.bz2
samba-79b667eda998596d6a9020fe61821f6878ece376.zip
r11262: 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? (This used to be commit d770f853475d12a33d23fc86ab30223dfde22dd7)
-rw-r--r--source4/librpc/idl/winreg.cnf2
-rw-r--r--source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm4
2 files changed, 6 insertions, 0 deletions
diff --git a/source4/librpc/idl/winreg.cnf b/source4/librpc/idl/winreg.cnf
index e5a146cd5d..d3315b35e8 100644
--- a/source4/librpc/idl/winreg.cnf
+++ b/source4/librpc/idl/winreg.cnf
@@ -50,3 +50,5 @@ HF_RENAME hf_winreg_winreg_OpenHKCC_handle hf_winreg_handle
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);
diff --git a/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm b/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
index 41ccaf54dd..24423d9292 100644
--- a/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
@@ -292,6 +292,10 @@ sub ElementLevel($$$$$)
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;