librpc/ndr: change ndr_pull/push/print flags to uint64_t

metze

diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 8a15fccfe09ae6846cee4ee26ab5409be9f9ab40..3bb83d7cc5877fc0bbff85cf9564253c58c3df4f 100644 (file)
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -58,7 +58,7 @@ struct ndr_compression_state;
    particular transport
 */
 struct ndr_pull {
-       uint32_t flags; /* LIBNDR_FLAG_* */
+       uint64_t _flags; /* LIBNDR_FLAG_* */
        uint8_t *data;
        uint32_t data_size;
        uint32_t offset;
@@ -84,7 +84,7 @@ struct ndr_pull {
 
 /* structure passed to functions that generate NDR formatted data */
 struct ndr_push {
-       uint32_t flags; /* LIBNDR_FLAG_* */
+       uint64_t _flags; /* LIBNDR_FLAG_* */
        uint8_t *data;
        uint32_t alloc_size;
        uint32_t offset;
@@ -109,7 +109,7 @@ struct ndr_push {
 
 /* structure passed to functions that print IDL structures */
 struct ndr_print {
-       uint32_t flags; /* LIBNDR_FLAG_* */
+       uint64_t _flags; /* LIBNDR_FLAG_* */
        uint32_t depth;
        struct ndr_token_list switch_list;
        void (*print)(struct ndr_print *, const char *, ...) PRINTF_ATTRIBUTE(2,3);

diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c
index d478eb69c013d472ad2bff428dd826458f99af34..73a10c17abfbd5e511bab9552ec7559632263864 100644 (file)
--- a/librpc/ndr/ndr.c
+++ b/librpc/ndr/ndr.c
@@ -561,7 +561,7 @@ failed:
        return ret;
 }
 
-_PUBLIC_ void ndr_set_flags(uint32_t *pflags, uint32_t new_flags)
+_PUBLIC_ void ndr_set_flags(uint64_t *pflags, uint64_t new_flags)
 {
        /* the big/little endian flags are inter-dependent */
        if (new_flags & LIBNDR_FLAG_LITTLE_ENDIAN) {

diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 432e52f89c4562f7ff32f8dd4fb8a2f12a910469..5c8dc661f9356ce98260c5525e87cec8ff6baa3f 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -165,7 +165,7 @@ sub start_flags($$$)
        if (defined $flags) {
                $self->pidl("{");
                $self->indent;
-               $self->pidl("uint32_t _flags_save_$e->{TYPE} = $ndr->flags;");
+               $self->pidl("uint64_t _flags_save_$e->{TYPE} = $ndr->flags;");
                $self->pidl("ndr_set_flags(&$ndr->flags, $flags);");
        }
 }