The branch, master has been updated
via 187f695 Fix alignment issues in SPOOLSS "BUFFER" marshalling.
Guenther and Metze please check !
from d05aa90 s3:vfs:syncops add option to disable metasync per share
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 187f695469071d0550613e037b36170facb85460
Author: Jeremy Allison <[email protected]>
Date: Fri Feb 18 09:01:46 2011 -0800
Fix alignment issues in SPOOLSS "BUFFER" marshalling.
Guenther and Metze please check !
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Fri Feb 18 18:49:55 CET 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 075ad85..eda583e 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1281,12 +1281,19 @@ sub ParseStructPushPrimitives($$$$$)
sub ParseStructPushDeferred($$$$)
{
my ($self, $struct, $ndr, $varname, $env) = @_;
+
if (defined($struct->{PROPERTIES}{relative_base})) {
+ $self->pidl("NDR_CHECK(ndr_push_align($ndr,
$struct->{ALIGN}));");
+
# retrieve the current offset as base for relative pointers
# based on the toplevel struct/union
$self->pidl("NDR_CHECK(ndr_push_setup_relative_base_offset2($ndr, $varname));");
}
$self->ParseElementPush($_, $ndr, $env, 0, 1) foreach
(@{$struct->{ELEMENTS}});
+
+ if (defined($struct->{PROPERTIES}{relative_base})) {
+ $self->pidl("NDR_CHECK(ndr_push_trailer_align($ndr,
$struct->{ALIGN}));");
+ }
}
#####################################################################
--
Samba Shared Repository
