r8162: Revert my pad8 hack.

Andrew Bartlett
(This used to be commit 8e78830ffc9280b48e1e690d95a94f1645e6e496)

diff --git a/source4/build/pidl/ndr.pm b/source4/build/pidl/ndr.pm
index c4ff1d8a897bd904a818eefc4e62952174eda9ba..2bf673b5e34c78e99d4bccab12d4c2aa3730ba32 100644 (file)
--- a/source4/build/pidl/ndr.pm
+++ b/source4/build/pidl/ndr.pm
@@ -166,8 +166,7 @@ sub GetElementLevelTable($)
                        SUBCONTEXT_SIZE => $subsize,
                        IS_DEFERRED => $is_deferred,
                        COMPRESSION => util::has_property($e, "compression"),
-                       OBFUSCATION => util::has_property($e, "obfuscation"),
-                       PAD8 => util::has_property($e, "pad8")
+                       OBFUSCATION => util::has_property($e, "obfuscation")
                });
        }
 

diff --git a/source4/build/pidl/ndr_parser.pm b/source4/build/pidl/ndr_parser.pm
index 48e243aa0cc3bd9575471ef7486ec0ef18cb2136..ba6b9d58da54b03c564a1f0ecead936169188ef8 100644 (file)
--- a/source4/build/pidl/ndr_parser.pm
+++ b/source4/build/pidl/ndr_parser.pm
@@ -452,9 +452,6 @@ sub ParseSubcontextPushEnd($$$$)
 
        pidl "NDR_CHECK(ndr_push_subcontext_header(ndr, $l->{HEADER_SIZE}, $subcontext_size, $ndr));";
        pidl "NDR_CHECK(ndr_push_bytes(ndr, $ndr->data, $ndr->offset));";
-       if (defined $l->{PAD8}) {
-           pidl "NDR_CHECK(ndr_push_align(ndr, 8));";
-       }
        deindent;
        pidl "}";
 }
@@ -504,9 +501,6 @@ sub ParseSubcontextPullEnd($$$)
                $advance = "$ndr->offset";
        }
        pidl "NDR_CHECK(ndr_pull_advance(ndr, $advance));";
-       if (defined $l->{PAD8}) {
-           pidl "NDR_CHECK(ndr_pull_align(ndr, 8));";
-       }
        deindent;
        pidl "}";
 }

diff --git a/source4/build/pidl/validator.pm b/source4/build/pidl/validator.pm
index f1677d1ae7e51f4ae97ee8073f7a4c3657460573..fbf7993b208931b7cde3528137d3b2ad63815dfa 100644 (file)
--- a/source4/build/pidl/validator.pm
+++ b/source4/build/pidl/validator.pm
@@ -106,7 +106,6 @@ my %property_list = (
        "default"               => ["ELEMENT"],
 
        # subcontext
-       "pad8"                  => ["ELEMENT"],
        "subcontext"            => ["ELEMENT"],
        "subcontext_size"       => ["ELEMENT"],
        "compression"           => ["ELEMENT"],