diff options
author | Andrew Tridgell <tridge@samba.org> | 2004-08-09 19:40:24 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:57:48 -0500 |
commit | 15dddf7b1ebd9a5b67038a284cc88c1a5f185231 (patch) | |
tree | 9fcdfee5e38307351a273bc2518d4c0a17a64a1a /source4/librpc/ndr | |
parent | 1d529283c755f38c72b907d44e2b4177651d4f06 (diff) | |
download | samba-15dddf7b1ebd9a5b67038a284cc88c1a5f185231.tar.gz samba-15dddf7b1ebd9a5b67038a284cc88c1a5f185231.tar.bz2 samba-15dddf7b1ebd9a5b67038a284cc88c1a5f185231.zip |
r1671: make [relative] pointers in idl much more generic, treating them just
like normal pointers in most cases. This means we can now support
relative pointers to unions, builtin types etc, whereas we could only
previously support relative pointers to structures.
metze needs this for the PAC decoding.
(This used to be commit 0d063725e12f51375b7d0be55a19072a9a54e7e6)
Diffstat (limited to 'source4/librpc/ndr')
-rw-r--r-- | source4/librpc/ndr/ndr.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c index 881a4ab60f..1d6b90f4bf 100644 --- a/source4/librpc/ndr/ndr.c +++ b/source4/librpc/ndr/ndr.c @@ -686,8 +686,7 @@ NTSTATUS ndr_pull_relative(struct ndr_pull *ndr, const void **buf, size_t size, /* push a relative structure */ -NTSTATUS ndr_push_relative(struct ndr_push *ndr, int ndr_flags, const void *p, - NTSTATUS (*fn)(struct ndr_push *, int , const void *)) +NTSTATUS ndr_push_relative(struct ndr_push *ndr, int ndr_flags, const void *p) { struct ndr_ofs_list *ofs; if (ndr_flags & NDR_SCALARS) { @@ -730,7 +729,6 @@ NTSTATUS ndr_push_relative(struct ndr_push *ndr, int ndr_flags, const void *p, ndr->offset = ofs->offset; NDR_CHECK(ndr_push_uint32(ndr, save.offset - ofs->base)); ndr_push_restore(ndr, &save); - NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p)); } return NT_STATUS_OK; } |