diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-09-26 12:05:40 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-09-26 19:07:05 +0000 |
| commit | df685fc94ea9f23143748eb2a1c179410fb658be (patch) | |
| tree | 475cd9dd70c28ff3b87c2046bcde5cdf1255310a /tools | |
| parent | bcae0488fc09cbb264b1a816be74e5e0721847b3 (diff) | |
| download | wireshark-df685fc94ea9f23143748eb2a1c179410fb658be.tar.gz | |
Update to the latest version from the Samba Git repository.
Changes from the Samba log:
commit 3a0fa3605b8eb995a8cc4696256129893e1f6f7e
Author: Stefan Metzmacher <metze@samba.org>
Date: Sat Sep 21 23:46:01 2013 +0200
pidl:Samba3/ServerNDR: skip DCERPC pipe elements and leave NULL pointers.
We don't support them anyway, but this lets us adding them to the idl
file and only ignore it on the server.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: Idbe742fa13e5d3892343fde2b3943f38a6e90a8c
Reviewed-on: https://code.wireshark.org/review/4313
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/tools/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm index d433f60eb7..e8d2bf9c57 100644 --- a/tools/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm +++ b/tools/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm @@ -14,7 +14,7 @@ use strict; use Parse::Pidl qw(warning error fatal); use Parse::Pidl::Typelist qw(mapTypeName scalar_is_reference); use Parse::Pidl::Util qw(ParseExpr has_property is_constant); -use Parse::Pidl::NDR qw(GetNextLevel); +use Parse::Pidl::NDR qw(GetNextLevel ContainsPipe); use Parse::Pidl::Samba4 qw(ElementStars DeclLong); use Parse::Pidl::Samba4::Header qw(GenerateFunctionOutEnv); @@ -110,6 +110,7 @@ sub CallWithStruct($$$$) } foreach (@{$fn->{ELEMENTS}}) { + next if ContainsPipe($_, $_->{LEVELS}[0]); my @dir = @{$_->{DIRECTION}}; if (grep(/in/, @dir) and grep(/out/, @dir)) { # noop |