[hurd] 11/12: libports: preserve the complex message flag

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch upstream
in repository hurd.

commit 5512308e4176303b25d52350c3c48dc37c3c665d
Author: Justus Winter <address@hidden>
Date:   Tue Feb 23 23:35:30 2016 +0100

    libports: preserve the complex message flag
    
    * libports/manage-multithread.c (internal_demuxer): Preserve all
    message flags when we store the objects address as payload in the
    message.
    * libports/manage-one-thread.c (internal_demuxer): Likewise.
---
 libports/manage-multithread.c | 7 ++++---
 libports/manage-one-thread.c  | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libports/manage-multithread.c b/libports/manage-multithread.c
index 60743d9..1588f63 100644
--- a/libports/manage-multithread.c
+++ b/libports/manage-multithread.c
@@ -180,9 +180,10 @@ ports_manage_port_operations_multithread (struct 
port_bucket *bucket,
                 having to do another hash table lookup in the intran
                 functions if protected payloads are not supported by
                 the kernel.  */
-             inp->msgh_bits = MACH_MSGH_BITS (
-               MACH_MSGH_BITS_REMOTE (inp->msgh_bits),
-               MACH_MSG_TYPE_PROTECTED_PAYLOAD);
+             inp->msgh_bits =
+               MACH_MSGH_BITS_OTHER (inp->msgh_bits)
+               | MACH_MSGH_BITS (MACH_MSGH_BITS_REMOTE (inp->msgh_bits),
+                                 MACH_MSG_TYPE_PROTECTED_PAYLOAD);
              inp->msgh_protected_payload = (unsigned long) pi;
            }
        }
diff --git a/libports/manage-one-thread.c b/libports/manage-one-thread.c
index b920338..313838c 100644
--- a/libports/manage-one-thread.c
+++ b/libports/manage-one-thread.c
@@ -71,9 +71,10 @@ ports_manage_port_operations_one_thread (struct port_bucket 
*bucket,
                 having to do another hash table lookup in the intran
                 functions if protected payloads are not supported by
                 the kernel.  */
-             inp->msgh_bits = MACH_MSGH_BITS (
-               MACH_MSGH_BITS_REMOTE (inp->msgh_bits),
-               MACH_MSG_TYPE_PROTECTED_PAYLOAD);
+             inp->msgh_bits =
+               MACH_MSGH_BITS_OTHER (inp->msgh_bits)
+               | MACH_MSGH_BITS (MACH_MSGH_BITS_REMOTE (inp->msgh_bits),
+                                 MACH_MSG_TYPE_PROTECTED_PAYLOAD);
              inp->msgh_protected_payload = (unsigned long) pi;
            }
        }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git