diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-11-17 06:27:45 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-11-17 06:27:45 +0000 |
| commit | 59df3ce5b5c5b484793a0e16faeb581ef343e167 (patch) | |
| tree | cceb5d9fc8df01ec7c399ef690e86a34fba34a6b /source4/librpc/ndr/ndr_samr.c | |
| parent | fa83432e1085d32f1a3f4208b81b6e936ba63b38 (diff) | |
| download | samba-59df3ce5b5c5b484793a0e16faeb581ef343e167.tar.gz samba-59df3ce5b5c5b484793a0e16faeb581ef343e167.tar.bz2 samba-59df3ce5b5c5b484793a0e16faeb581ef343e167.zip | |
security descriptors are no longer a "special" type, they are handled
using the [relative] property
this also fixes level3 of PrinterInfo (a relative secdesc)
(This used to be commit d5a15257fdd5f6cfe2706765a7c29f623ec1c6f8)
Diffstat (limited to 'source4/librpc/ndr/ndr_samr.c')
| -rw-r--r-- | source4/librpc/ndr/ndr_samr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/librpc/ndr/ndr_samr.c b/source4/librpc/ndr/ndr_samr.c index a3786117b1..33750b767d 100644 --- a/source4/librpc/ndr/ndr_samr.c +++ b/source4/librpc/ndr/ndr_samr.c @@ -77,7 +77,7 @@ NTSTATUS ndr_push_samr_OpenDomain(struct ndr_push *ndr, struct samr_OpenDomain * { NDR_CHECK(ndr_push_policy_handle(ndr, r->in.handle)); NDR_CHECK(ndr_push_uint32(ndr, r->in.access_mask)); - NDR_CHECK(ndr_push_dom_sid2(ndr, r->in.sid)); + NDR_CHECK(ndr_push_dom_sid2(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.sid)); return NT_STATUS_OK; } @@ -546,7 +546,7 @@ NTSTATUS ndr_pull_samr_LookupDomain(struct ndr_pull *ndr, struct samr_LookupDoma r->out.sid = NULL; } if (r->out.sid) { - NDR_CHECK(ndr_pull_dom_sid2(ndr, r->out.sid)); + NDR_CHECK(ndr_pull_dom_sid2(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.sid)); } NDR_CHECK(ndr_pull_NTSTATUS(ndr, &r->out.result)); @@ -1507,7 +1507,7 @@ buffers: NDR_CHECK(ndr_pull_uint32(ndr, &_length)); if (_offset != 0) return ndr_pull_error(ndr, NDR_ERR_OFFSET, "Bad array offset 0x%08x", _offset); if (_length > 1260 || _length != r->units_per_week/8) return ndr_pull_error(ndr, NDR_ERR_LENGTH, "Bad array length 0x%08x > size 0x%08x", _offset, 1260); - NDR_CHECK(ndr_pull_array_uint8(ndr, r->logon_hours, _length)); + NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS|NDR_BUFFERS, r->logon_hours, _length)); } done: return NT_STATUS_OK; @@ -1543,7 +1543,7 @@ buffers: NDR_CHECK(ndr_pull_uint32(ndr, &_length)); if (_offset != 0) return ndr_pull_error(ndr, NDR_ERR_OFFSET, "Bad array offset 0x%08x", _offset); if (_length > 1260 || _length != r->units_per_week/8) return ndr_pull_error(ndr, NDR_ERR_LENGTH, "Bad array length 0x%08x > size 0x%08x", _offset, 1260); - NDR_CHECK(ndr_pull_array_uint8(ndr, r->logon_hours, _length)); + NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS|NDR_BUFFERS, r->logon_hours, _length)); } done: return NT_STATUS_OK; @@ -1603,7 +1603,7 @@ buffers: NDR_CHECK(ndr_pull_uint32(ndr, &_length)); if (_offset != 0) return ndr_pull_error(ndr, NDR_ERR_OFFSET, "Bad array offset 0x%08x", _offset); if (_length > 1260 || _length != r->units_per_week/8) return ndr_pull_error(ndr, NDR_ERR_LENGTH, "Bad array length 0x%08x > size 0x%08x", _offset, 1260); - NDR_CHECK(ndr_pull_array_uint8(ndr, r->logon_hours, _length)); + NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS|NDR_BUFFERS, r->logon_hours, _length)); } done: return NT_STATUS_OK; @@ -1855,7 +1855,7 @@ buffers: } } NDR_ALLOC_N_SIZE(ndr, r->buffer, r->buf_count, sizeof(r->buffer[0])); - NDR_CHECK(ndr_pull_array_uint8(ndr, r->buffer, r->buf_count)); + NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS|NDR_BUFFERS, r->buffer, r->buf_count)); } if (r->logon_hours) { { @@ -1871,7 +1871,7 @@ buffers: NDR_CHECK(ndr_pull_uint32(ndr, &_length)); if (_offset != 0) return ndr_pull_error(ndr, NDR_ERR_OFFSET, "Bad array offset 0x%08x", _offset); if (_length > 1260 || _length != r->units_per_week/8) return ndr_pull_error(ndr, NDR_ERR_LENGTH, "Bad array length 0x%08x > size 0x%08x", _offset, 1260); - NDR_CHECK(ndr_pull_array_uint8(ndr, r->logon_hours, _length)); + NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS|NDR_BUFFERS, r->logon_hours, _length)); } done: return NT_STATUS_OK; |