libndr: for now align reverse relative pointers to 2 bytes by default.
authorStefan Metzmacher <metze@samba.org>
Thu, 18 Feb 2010 12:40:44 +0000 (13:40 +0100)
committerKarolin Seeger <kseeger@samba.org>
Fri, 19 Feb 2010 13:32:31 +0000 (14:32 +0100)
This is just a hack and we should let the callers use FLAG_ALIGN2
explicit in future.

metze
(cherry picked from commit 4a76d29374769ba4c075b8d5767498848d2e17d6)
(cherry picked from commit d8251b5ab5e2d1abb8c69cc6ee2fe56bd074e48d)

librpc/ndr/ndr.c

index c5c6804afc286e3c7be69711313a9f0fcceca9e9..da02682213d69d2e85643827c0ec02bd6f05fd7c 100644 (file)
@@ -1165,6 +1165,9 @@ _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) {