--- source3/librpc/gen_ndr/ndr_nbt.c.orig	2012-05-23 16:52:56.095305758 -0700
+++ source3/librpc/gen_ndr/ndr_nbt.c	2012-05-23 16:53:13.055611721 -0700
@@ -2193,6 +2193,7 @@
 		{
 			uint32_t _flags_save_DATA_BLOB = ndr->flags;
 			ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN2);
+			ndr->flags &= ~LIBNDR_FLAG_NOALIGN;
 			NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->_pad));
 			ndr->flags = _flags_save_DATA_BLOB;
 		}