diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-29 17:47:54 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-29 18:08:22 +1000 |
| commit | 64e08fef16001d62b43f6925a26ad739391cface (patch) | |
| tree | fbe75bd3c38c149145f3a7aa1e3d8e6bf5cd75de /pidl/lib/Parse/Pidl/NDR.pm | |
| parent | 325baf37fffde738dcbb37a096d79f07b23586b2 (diff) | |
| download | samba-64e08fef16001d62b43f6925a26ad739391cface.tar.gz samba-64e08fef16001d62b43f6925a26ad739391cface.tar.bz2 samba-64e08fef16001d62b43f6925a26ad739391cface.zip | |
pidl: added union padding for NDR64
This fixes the problem with samr UserInfo16 when NDR64 is enabled
Diffstat (limited to 'pidl/lib/Parse/Pidl/NDR.pm')
| -rw-r--r-- | pidl/lib/Parse/Pidl/NDR.pm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pidl/lib/Parse/Pidl/NDR.pm b/pidl/lib/Parse/Pidl/NDR.pm index 7aebed0fe2..4f2578e72e 100644 --- a/pidl/lib/Parse/Pidl/NDR.pm +++ b/pidl/lib/Parse/Pidl/NDR.pm @@ -509,7 +509,8 @@ sub ParseUnion($$) ELEMENTS => undef, PROPERTIES => $e->{PROPERTIES}, HAS_DEFAULT => $hasdefault, - ORIGINAL => $e + ORIGINAL => $e, + ALIGN => undef } unless defined($e->{ELEMENTS}); CheckPointerTypes($e, $pointer_default); @@ -533,6 +534,11 @@ sub ParseUnion($$) push @elements, $t; } + my $align = undef; + if ($e->{NAME}) { + $align = align_type($e->{NAME}); + } + return { TYPE => "UNION", NAME => $e->{NAME}, @@ -540,7 +546,8 @@ sub ParseUnion($$) ELEMENTS => \@elements, PROPERTIES => $e->{PROPERTIES}, HAS_DEFAULT => $hasdefault, - ORIGINAL => $e + ORIGINAL => $e, + ALIGN => $align }; } |