summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/ndr/ndr.c3
-rw-r--r--source4/librpc/rpc/dcerpc.c8
-rw-r--r--source4/torture/rpc/lsa.c4
3 files changed, 13 insertions, 2 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));
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index cb03ff8970..871d0fec24 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -780,6 +780,10 @@ static NTSTATUS dcerpc_ndr_validate_in(TALLOC_CTX *mem_ctx,
blob2 = ndr_push_blob(push);
if (!data_blob_equal(&blob, &blob2)) {
+ DEBUG(3,("original:\n"));
+ dump_data(3, blob.data, blob.length);
+ DEBUG(3,("secondary:\n"));
+ dump_data(3, blob2.data, blob2.length);
return ndr_push_error(push, NDR_ERR_VALIDATE,
"Error in input validation data - %s",
nt_errstr(status));
@@ -855,6 +859,10 @@ static NTSTATUS dcerpc_ndr_validate_out(TALLOC_CTX *mem_ctx,
blob2 = ndr_push_blob(push);
if (!data_blob_equal(&blob, &blob2)) {
+ DEBUG(3,("original:\n"));
+ dump_data(3, blob.data, blob.length);
+ DEBUG(3,("secondary:\n"));
+ dump_data(3, blob2.data, blob2.length);
return ndr_push_error(push, NDR_ERR_VALIDATE,
"Error in output validation data - %s",
nt_errstr(status));
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 178248a49b..c98b7ec60a 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -443,7 +443,6 @@ static BOOL test_QueryInfoPolicy(struct dcerpc_pipe *p,
NTSTATUS status;
int i;
BOOL ret = True;
-
printf("\nTesting QueryInfoPolicy\n");
for (i=1;i<13;i++) {
@@ -454,8 +453,9 @@ static BOOL test_QueryInfoPolicy(struct dcerpc_pipe *p,
status = dcerpc_lsa_QueryInfoPolicy(p, mem_ctx, &r);
- if ((i == 9 || i == 10) &&
+ if ((i == 9 || i == 10 || i == 11) &&
NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) {
+ printf("server failed level %u (OK)\n", i);
continue;
}