diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-11-22 09:32:35 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-11-22 09:32:35 +0000 |
| commit | 4666ec9301ebb753c846f4a79a008bc088cf0c02 (patch) | |
| tree | 0e7fc482919167ef30e7a394b441f2f7e6d167f8 | |
| parent | 175e9475796ca7f2ba1e8efad3e6975ad0c71882 (diff) | |
| download | samba-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)
| -rw-r--r-- | source4/librpc/ndr/ndr.c | 3 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc.c | 8 | ||||
| -rw-r--r-- | source4/torture/rpc/lsa.c | 4 |
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; } |