diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-02-09 21:10:23 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:36 -0500 |
commit | 632acd9bc7704ac3d326354808c3d12f4f0a9f8f (patch) | |
tree | b801c24612751b65c3af360e6842396f0e96d85b /source4/librpc/ndr/ndr_dcom.c | |
parent | 73d317e0dae5d9dd30300da9dd19abaaef5db03f (diff) | |
download | samba-632acd9bc7704ac3d326354808c3d12f4f0a9f8f.tar.gz samba-632acd9bc7704ac3d326354808c3d12f4f0a9f8f.tar.bz2 samba-632acd9bc7704ac3d326354808c3d12f4f0a9f8f.zip |
r5286: Some first steps in making the pidl code somewhat more generic for the
various data types:
Add ndr_flags argument to all ndr push/pull scalar functions
(This used to be commit ab490c0c882bb13de190546c50a0631ecb8255ad)
Diffstat (limited to 'source4/librpc/ndr/ndr_dcom.c')
-rw-r--r-- | source4/librpc/ndr/ndr_dcom.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/librpc/ndr/ndr_dcom.c b/source4/librpc/ndr/ndr_dcom.c index 71a43a8fff..2a28db4178 100644 --- a/source4/librpc/ndr/ndr_dcom.c +++ b/source4/librpc/ndr/ndr_dcom.c @@ -33,16 +33,16 @@ NTSTATUS ndr_pull_DUALSTRINGARRAY(struct ndr_pull *ndr, int ndr_flags, struct DU return NT_STATUS_OK; } - NDR_CHECK(ndr_pull_uint32(ndr, &conformant_size)); - NDR_CHECK(ndr_pull_uint16(ndr, &num_entries)); - NDR_CHECK(ndr_pull_uint16(ndr, &security_offset)); + NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &conformant_size)); + NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &num_entries)); + NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &security_offset)); ar->stringbindings = talloc_array(ndr, struct STRINGBINDING *, num_entries); ar->stringbindings[0] = NULL; do { /* 'Peek' */ - NDR_CHECK(ndr_pull_uint16(ndr, &towerid)); + NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &towerid)); if (towerid > 0) { ndr->offset -= 2; @@ -61,7 +61,7 @@ NTSTATUS ndr_pull_DUALSTRINGARRAY(struct ndr_pull *ndr, int ndr_flags, struct DU do { /* 'Peek' */ - NDR_CHECK(ndr_pull_uint16(ndr, &towerid)); + NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &towerid)); if (towerid > 0) { ndr->offset -= 2; @@ -124,14 +124,14 @@ NTSTATUS ndr_pull_STRINGARRAY(struct ndr_pull *ndr, int ndr_flags, struct STRING return NT_STATUS_OK; } - NDR_CHECK(ndr_pull_uint16(ndr, &num_entries)); + NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &num_entries)); ar->stringbindings = talloc_array(ndr, struct STRINGBINDING *, 1); ar->stringbindings[0] = NULL; do { /* 'Peek' */ - NDR_CHECK(ndr_pull_uint16(ndr, &towerid)); + NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &towerid)); if (towerid > 0) { ndr->offset -= 2; |