3 files changed, 6 insertions, 4 deletions
diff --git a/source4/librpc/idl/nbt.idl b/source4/librpc/idl/nbt.idl
index e12ec6290a..429a35267c 100644
--- a/source4/librpc/idl/nbt.idl
+++ b/source4/librpc/idl/nbt.idl
@@ -142,13 +142,13 @@ interface nbt
 	} nbt_rdata_status;
 
 	typedef struct {
-		nbt_operation operation;
-	} nbt_rdata_wack;
+		[flag(NDR_REMAINING)] DATA_BLOB data;
+	} nbt_rdata_data;
 
 	typedef [nodiscriminant] union {
 		[case(NBT_QTYPE_NETBIOS)] nbt_rdata_netbios netbios;
 		[case(NBT_QTYPE_STATUS)]  nbt_rdata_status status;
-		[case(NBT_QTYPE_NULL)]    nbt_rdata_wack wack;
+		[default]                 nbt_rdata_data   data;
 	} nbt_rdata;
 
 	typedef [flag(LIBNDR_PRINT_ARRAY_HEX)] struct {
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index 7070ae80ec..5485c232b4 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -185,7 +185,7 @@ enum ndr_err_code {
 		} \
 		ndr->offset = (ndr->offset + (n-1)) & ~(n-1); \
 	} \
-	if (ndr->offset >= ndr->data_size) { \
+	if (ndr->offset > ndr->data_size) { \
 		return ndr_pull_error(ndr, NDR_ERR_BUFSIZE, "Pull align %u", n); \
 	} \
 } while(0)
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c
index 6947cc8ee6..032c743bef 100644
--- a/source4/librpc/ndr/ndr.c
+++ b/source4/librpc/ndr/ndr.c
@@ -436,6 +436,8 @@ static NTSTATUS ndr_pull_subcontext_header(struct ndr_pull *ndr,
 					   size_t sub_size,
 					   struct ndr_pull *ndr2)
 {
+	ndr2->flags = ndr->flags;
+
 	switch (sub_size) {
 	case 0: {
 		uint32_t size = ndr->data_size - ndr->offset;