summaryrefslogtreecommitdiff
path: root/source4/librpc/ndr/ndr.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-11-17 09:34:19 +0000
committerAndrew Tridgell <tridge@samba.org>2003-11-17 09:34:19 +0000
commite62c5c9a8dd1258b776d40918026a1be4b71fb72 (patch)
tree877a0934d7082d96093d420627e3d3797b67483e /source4/librpc/ndr/ndr.c
parentc562794e7477e56251baea4f954794ec189f2847 (diff)
downloadsamba-e62c5c9a8dd1258b776d40918026a1be4b71fb72.tar.gz
samba-e62c5c9a8dd1258b776d40918026a1be4b71fb72.tar.bz2
samba-e62c5c9a8dd1258b776d40918026a1be4b71fb72.zip
use [subcontext] to make GetPrinter a bit easier in smbtorture
(This used to be commit a5140985d8f57695b4165c72af217092da6fae5f)
Diffstat (limited to 'source4/librpc/ndr/ndr.c')
-rw-r--r--source4/librpc/ndr/ndr.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c
index 5f941c703d..6d2a6a99dd 100644
--- a/source4/librpc/ndr/ndr.c
+++ b/source4/librpc/ndr/ndr.c
@@ -399,6 +399,9 @@ NTSTATUS ndr_pull_subcontext_flags_fn(struct ndr_pull *ndr,
struct ndr_pull ndr2;
NDR_CHECK(ndr_pull_uint32(ndr, &size));
+ if (size == 0) {
+ return NT_STATUS_OK;
+ }
NDR_CHECK(ndr_pull_subcontext(ndr, &ndr2, size));
NDR_CHECK(fn(&ndr2, NDR_SCALARS|NDR_BUFFERS, base));
NDR_CHECK(ndr_pull_advance(ndr, size));
@@ -414,6 +417,9 @@ NTSTATUS ndr_pull_subcontext_union_fn(struct ndr_pull *ndr,
struct ndr_pull ndr2;
NDR_CHECK(ndr_pull_uint32(ndr, &size));
+ if (size == 0) {
+ return NT_STATUS_OK;
+ }
NDR_CHECK(ndr_pull_subcontext(ndr, &ndr2, size));
NDR_CHECK(fn(&ndr2, NDR_SCALARS|NDR_BUFFERS, level, base));
NDR_CHECK(ndr_pull_advance(ndr, size));