summaryrefslogtreecommitdiff
path: root/source4/librpc/ndr
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-11-22 09:32:35 +0000
committerAndrew Tridgell <tridge@samba.org>2003-11-22 09:32:35 +0000
commit4666ec9301ebb753c846f4a79a008bc088cf0c02 (patch)
tree0e7fc482919167ef30e7a394b441f2f7e6d167f8 /source4/librpc/ndr
parent175e9475796ca7f2ba1e8efad3e6975ad0c71882 (diff)
downloadsamba-4666ec9301ebb753c846f4a79a008bc088cf0c02.tar.gz
samba-4666ec9301ebb753c846f4a79a008bc088cf0c02.tar.bz2
samba-4666ec9301ebb753c846f4a79a008bc088cf0c02.zip
* fixed NDR flag inheritance across push subcontexts
* don't consider not doing lsa_QueryInfoPolicy level 11 a failure (w2k3 doesn't have this level, w2k does) * on a NDR validation failure dump the failed data at level 3 (This used to be commit 9d5078962f0f8aef3360dea4c4774cf8de1fdc26)
Diffstat (limited to 'source4/librpc/ndr')
-rw-r--r--source4/librpc/ndr/ndr.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c
index 7deee6be3b..f22145af97 100644
--- a/source4/librpc/ndr/ndr.c
+++ b/source4/librpc/ndr/ndr.c
@@ -564,6 +564,7 @@ NTSTATUS ndr_push_subcontext_fn(struct ndr_push *ndr,
ndr2 = ndr_push_init_ctx(ndr->mem_ctx);
if (!ndr2) return NT_STATUS_NO_MEMORY;
+ ndr2->flags = ndr->flags;
NDR_CHECK(fn(ndr2, base));
NDR_CHECK(ndr_push_subcontext_header(ndr, sub_size, ndr2));
NDR_CHECK(ndr_push_bytes(ndr, ndr2->data, ndr2->offset));
@@ -583,6 +584,7 @@ NTSTATUS ndr_push_subcontext_flags_fn(struct ndr_push *ndr,
ndr2 = ndr_push_init_ctx(ndr->mem_ctx);
if (!ndr2) return NT_STATUS_NO_MEMORY;
+ ndr2->flags = ndr->flags;
NDR_CHECK(fn(ndr2, NDR_SCALARS|NDR_BUFFERS, base));
NDR_CHECK(ndr_push_subcontext_header(ndr, sub_size, ndr2));
NDR_CHECK(ndr_push_bytes(ndr, ndr2->data, ndr2->offset));
@@ -603,6 +605,7 @@ NTSTATUS ndr_push_subcontext_union_fn(struct ndr_push *ndr,
ndr2 = ndr_push_init_ctx(ndr->mem_ctx);
if (!ndr2) return NT_STATUS_NO_MEMORY;
+ ndr2->flags = ndr->flags;
NDR_CHECK(fn(ndr2, NDR_SCALARS|NDR_BUFFERS, level, base));
NDR_CHECK(ndr_push_subcontext_header(ndr, sub_size, ndr2));
NDR_CHECK(ndr_push_bytes(ndr, ndr2->data, ndr2->offset));