Revert "Fix alignment issues in SPOOLSS "BUFFER" marshalling."
authorStefan Metzmacher <metze@samba.org>
Tue, 22 Feb 2011 10:00:07 +0000 (11:00 +0100)
committerJeremy Allison <jra@samba.org>
Mon, 28 Feb 2011 23:54:13 +0000 (15:54 -0800)
This reverts commit 187f695469071d0550613e037b36170facb85460.

This is the wrong fix.

metze

pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm

index eda583e7a8066242be134fb0718092d66c1420a4..075ad8516eb2b93951f7381db76dfda0cddd1f90 100644 (file)
@@ -1281,19 +1281,12 @@ 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}));");
-       }
 }
 
 #####################################################################