summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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;