diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-02-22 15:58:45 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-02-28 15:54:13 -0800 |
| commit | 23f6f449792d889538e0d0028bb8fbd5c807b0da (patch) | |
| tree | 9f11df73c5ef9697948ddd74b02730d049ee8ced /librpc | |
| parent | 712ef2590d0ee59a4a659926cdf8aac6e968dfa8 (diff) | |
| download | samba-23f6f449792d889538e0d0028bb8fbd5c807b0da.tar.gz samba-23f6f449792d889538e0d0028bb8fbd5c807b0da.tar.bz2 samba-23f6f449792d889538e0d0028bb8fbd5c807b0da.zip | |
TODO test/review librpc/ndr: remove align2 hack for relative pointers
metze
Diffstat (limited to 'librpc')
| -rw-r--r-- | librpc/ndr/ndr.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c index 14f9e06337..e7850d31df 100644 --- a/librpc/ndr/ndr.c +++ b/librpc/ndr/ndr.c @@ -1181,8 +1181,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_start(struct ndr_push *ndr, co if (!(ndr->flags & LIBNDR_FLAG_RELATIVE_REVERSE)) { uint32_t relative_offset; size_t pad; - /* TODO: remove this hack and let the idl use FLAG_ALIGN2 explicit */ - size_t align = 2; + size_t align = 1; if (ndr->offset < ndr->relative_base_offset) { return ndr_push_error(ndr, NDR_ERR_BUFSIZE, @@ -1271,9 +1270,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_end(struct ndr_push *ndr, cons /* the reversed offset is at the end of the main buffer */ correct_offset = ndr->relative_end_offset - len; - /* TODO: remove this hack and let the idl use FLAG_ALIGN2 explicit */ - align = 2; - if (ndr->flags & LIBNDR_FLAG_ALIGN2) { align = 2; } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) { |