Revert "s3: Fix bug 8371"

This reverts commit 2642f385887fbd3aecd4286a4d6223a21d981714.

This is not needed anymore, as 035342c11719d1daa647c0b2ae7cec27a969f83a
"Fix bug #8373 - Can't join XP Pro workstations to 3.6.1 DC." is
the more generic fix for the problem.

metze

diff --git a/librpc/ndr/ndr_nbt.c b/librpc/ndr/ndr_nbt.c
index 29013f0359cdd3ce9707ebbbf0d62e99f018adf6..f2a1ca3ba5fff4f1f28f7c2037c38dbf60b2e870 100644 (file)
--- a/librpc/ndr/ndr_nbt.c
+++ b/librpc/ndr/ndr_nbt.c
@@ -234,7 +234,6 @@ enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_REQUEST(struct ndr_push *ndr, int
                if (ndr_size_dom_sid0(&r->sid, ndr->flags)) {
                        struct ndr_push *_ndr_sid;
                        uint32_t _flags_save_DATA_BLOB = ndr->flags;
-                       ndr->flags &= ~LIBNDR_FLAG_NOALIGN;
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
                        NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->_pad));
                        ndr->flags = _flags_save_DATA_BLOB;
@@ -280,7 +279,6 @@ enum ndr_err_code ndr_pull_NETLOGON_SAM_LOGON_REQUEST(struct ndr_pull *ndr, int
                if (r->sid_size) {
                        uint32_t _flags_save_DATA_BLOB = ndr->flags;
                        struct ndr_pull *_ndr_sid;
-                       ndr->flags &= ~LIBNDR_FLAG_NOALIGN;
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
                        NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->_pad));
                        ndr->flags = _flags_save_DATA_BLOB;