summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-09-03 02:08:25 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:36:26 -0500
commit40d70b92e0d0ec5d29d975c49a4ca7a62f592f17 (patch)
treec6caa2aa538f048c1f1a073ae7c89908cefc5fe6
parent563be66ccbd6473212314708cced9d134e2b5f8f (diff)
downloadsamba-40d70b92e0d0ec5d29d975c49a4ca7a62f592f17.tar.gz
samba-40d70b92e0d0ec5d29d975c49a4ca7a62f592f17.tar.bz2
samba-40d70b92e0d0ec5d29d975c49a4ca7a62f592f17.zip
r9984: Honour the NOEMIT conformance directive for entire IDL files.
(This used to be commit 73dffade2c008b26eaf3924d31693c27328b8586)
-rw-r--r--source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm2
-rwxr-xr-xsource4/pidl/pidl4
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm b/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
index a0e8f4126b..dbaf12b572 100644
--- a/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
@@ -707,6 +707,8 @@ sub Parse($$$$)
my($ndr,$idl_file,$h_filename,$cnf_file) = @_;
Initialize($cnf_file);
+ return (undef, undef) if defined($conformance->{noemit_dissector});
+
$tabs = "";
%res = (code=>"",def=>"",hdr=>"");
diff --git a/source4/pidl/pidl b/source4/pidl/pidl
index a8631043b2..c68ea6c121 100755
--- a/source4/pidl/pidl
+++ b/source4/pidl/pidl
@@ -326,8 +326,8 @@ $dcom
$cnffile =~ s/\.idl$/\.cnf/;
my ($dp, $dh) = Parse::Pidl::Ethereal::NDR::Parse($ndr, $idl_file, $eheader, $cnffile);
- FileSave($eparser, $dp);
- FileSave($eheader, $dh);
+ FileSave($eparser, $dp) if defined($dp);
+ FileSave($eheader, $dh) if defined($dh);
}
my $tdr_parser = ($opt_tdr_parser or "$outputdir/tdr_$basename.c");