From 9313b5d1da24406dd7d26afb2488fee0cbea44a9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 22 Feb 2011 15:58:45 +0100 Subject: [PATCH] TODO test/review librpc/ndr: remove align2 hack for relative pointers metze (cherry picked from commit 23f6f449792d889538e0d0028bb8fbd5c807b0da) --- librpc/ndr/ndr.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c index 14f9e063379..e7850d31dfc 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) { -- 2.34.1