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/Samba4/NDR | |
| 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/Samba4/NDR')
| -rw-r--r-- | pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 62e38bf7e9..9a02d522a9 100644 --- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -1644,6 +1644,10 @@ sub ParseUnionPushPrimitives($$$$) $self->pidl("NDR_CHECK(ndr_push_$e->{SWITCH_TYPE}($ndr, NDR_SCALARS, level));"); } + if (defined($e->{ALIGN})) { + $self->pidl("NDR_CHECK(ndr_push_union_align($ndr, $e->{ALIGN}));"); + } + $self->pidl("switch (level) {"); $self->indent; foreach my $el (@{$e->{ELEMENTS}}) { @@ -1788,6 +1792,10 @@ sub ParseUnionPullPrimitives($$$$$) $self->pidl("}"); } + if (defined($e->{ALIGN})) { + $self->pidl("NDR_CHECK(ndr_pull_union_align($ndr, $e->{ALIGN}));"); + } + $self->pidl("switch (level) {"); $self->indent; foreach my $el (@{$e->{ELEMENTS}}) { |