diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-09-23 07:20:00 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-09-24 00:10:57 +0200 |
| commit | 3d3e8b53bf78c6ab442682b9fe22c902b9c45d73 (patch) | |
| tree | e43120f345a6bdb5fce1cb4c8ed995f41251227f | |
| parent | 4f69b58afdf6d13c67e9cc5a69a9946e8b58a15e (diff) | |
| download | samba-3d3e8b53bf78c6ab442682b9fe22c902b9c45d73.tar.gz samba-3d3e8b53bf78c6ab442682b9fe22c902b9c45d73.tar.bz2 samba-3d3e8b53bf78c6ab442682b9fe22c902b9c45d73.zip | |
librpc/ndr: make ndr_pull/push_DATA_BLOB NDR64 aware
Pair-Programmed-With: Matthieu Patou <mat@matws.net>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Matthieu Patou <mat@matws.net>
| -rw-r--r-- | librpc/ndr/ndr_basic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c index 1887838779..e56021b606 100644 --- a/librpc/ndr/ndr_basic.c +++ b/librpc/ndr/ndr_basic.c @@ -1253,7 +1253,7 @@ _PUBLIC_ void ndr_print_DATA_BLOB(struct ndr_print *ndr, const char *name, DATA_ * current ndr offset. * 2) When called with the LIBNDR_FLAG_REMAINING flag, push the byte array to * the ndr buffer. - * 3) Otherwise, push a uint32 length _and_ a corresponding byte array to the + * 3) Otherwise, push a uint3264 length _and_ a corresponding byte array to the * ndr buffer. */ _PUBLIC_ enum ndr_err_code ndr_push_DATA_BLOB(struct ndr_push *ndr, int ndr_flags, DATA_BLOB blob) @@ -1271,7 +1271,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_DATA_BLOB(struct ndr_push *ndr, int ndr_flag NDR_PUSH_ALLOC_SIZE(ndr, blob.data, blob.length); data_blob_clear(&blob); } else { - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, blob.length)); + NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, blob.length)); } NDR_CHECK(ndr_push_bytes(ndr, blob.data, blob.length)); return NDR_ERR_SUCCESS; @@ -1284,7 +1284,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_DATA_BLOB(struct ndr_push *ndr, int ndr_flag * current ndr offset. * 2) When called with the LIBNDR_FLAG_REMAINING flag, pull all remaining bytes * from the ndr buffer. - * 3) Otherwise, pull a uint32 length _and_ a corresponding byte array from the + * 3) Otherwise, pull a uint3264 length _and_ a corresponding byte array from the * ndr buffer. */ _PUBLIC_ enum ndr_err_code ndr_pull_DATA_BLOB(struct ndr_pull *ndr, int ndr_flags, DATA_BLOB *blob) @@ -1305,7 +1305,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_DATA_BLOB(struct ndr_pull *ndr, int ndr_flag length = ndr->data_size - ndr->offset; } } else { - NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &length)); + NDR_CHECK(ndr_pull_uint3264(ndr, NDR_SCALARS, &length)); } NDR_PULL_NEED_BYTES(ndr, length); *blob = data_blob_talloc(ndr->current_mem_ctx, ndr->data+ndr->offset, length); |