libndr: add LIBNDR_FLAG_NO_RELATIVE_REVERSE so that relative reverse processing can...

Guenther
(cherry picked from commit a2c34296fa6ca2ffb69cb69698a9b5f81803e8a8)

diff --git a/librpc/idl/idl_types.h b/librpc/idl/idl_types.h
index 193a1f612f15c45a29e99345f6982ed1a4785512..3c6c12cd846a6c0563b01f9dd418f68402eec0a4 100644 (file)
--- a/librpc/idl/idl_types.h
+++ b/librpc/idl/idl_types.h
@@ -69,3 +69,4 @@
 #define NDR_PAHEX LIBNDR_PRINT_ARRAY_HEX
 
 #define NDR_RELATIVE_REVERSE LIBNDR_FLAG_RELATIVE_REVERSE
+#define NDR_NO_RELATIVE_REVERSE LIBNDR_FLAG_NO_RELATIVE_REVERSE

diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 6312c40515c437b77a1a26df98af30c818d837e5..6274b20c49d3a7d12b354dfe0ba5627377936e8a 100644 (file)
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -123,6 +123,9 @@ struct ndr_print {
 #define LIBNDR_FLAG_STR_UTF8           (1<<12)
 #define LIBNDR_STRING_FLAGS            (0x7FFC)
 
+/* set if relative pointers should *not* be marshalled in reverse order */
+#define LIBNDR_FLAG_NO_RELATIVE_REVERSE        (1<<18)
+
 /* set if relative pointers are marshalled in reverse order */
 #define LIBNDR_FLAG_RELATIVE_REVERSE   (1<<19)
 

diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c
index 2df406318c3d8c483204b9506c0a3c42941ef4c8..523d7e8c984addfff92adbab4a835e06a31372b0 100644 (file)
--- a/librpc/ndr/ndr.c
+++ b/librpc/ndr/ndr.c
@@ -367,6 +367,9 @@ _PUBLIC_ void ndr_set_flags(uint32_t *pflags, uint32_t new_flags)
        if (new_flags & LIBNDR_ALIGN_FLAGS) {
                (*pflags) &= ~LIBNDR_FLAG_REMAINING;
        }
+       if (new_flags & LIBNDR_FLAG_NO_RELATIVE_REVERSE) {
+               (*pflags) &= ~LIBNDR_FLAG_RELATIVE_REVERSE;
+       }
        (*pflags) |= new_flags;
 }