Formerly ../mach/bootprivport.c.~4~

[kopensolaris-gnu/glibc.git] / mach / bootprivport.c

diff --git a/mach/bootprivport.c b/mach/bootprivport.c
index 54bd534..acd8fff 100644 (file)
--- a/mach/bootprivport.c
+++ b/mach/bootprivport.c
@@ -17,19 +17,48 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
 #include <mach.h>
-#include <mach/kernel_boot.h>
 
 kern_return_t
 __mach_get_priv_ports (mach_port_t *host_priv_ptr,
                       mach_port_t *device_master_ptr)
 {
   kern_return_t err;
-  mach_port_t bootstrap;
+  mach_port_t bootstrap, reply;
+
+  struct
+    {
+      mach_msg_header_t hdr;
+      mach_msg_type_t host_priv_type;
+      mach_port_t host_priv;
+      mach_msg_type_t dev_master_type;
+      mach_port_t dev_master;
+    } msg;
 
   if (err = task_get_bootstrap_port (mach_task_self (), &bootstrap))
     return err;
-  err = __kernel_boot_get_priv_ports (bootstrap,
-                                     host_priv_ptr, device_master_ptr);
+
+  /* We cannot simply use a MiG-generated user stub to do this,
+     because the return message does not contain a return code datum.  */
+  reply = mach_reply_port ();
+  msg.hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_COPY_SEND,
+                                     MACH_MSG_TYPE_MAKE_SEND_ONCE);
+  msg.hdr.msgh_size = 0;
+  msg.hdr.msgh_remote_port = bootstrap;
+  msg.hdr.msgh_local_port = reply;
+  msg.hdr.msgh_kind = MACH_MSGH_KIND_NORMAL;
+  msg.hdr.msgh_id = 999999;
+  err = mach_msg (&msg.hdr,
+                 MACH_SEND_MSG|MACH_RCV_MSG|MACH_RCV_TIMEOUT,
+                 sizeof (msg.hdr), sizeof (msg), reply,
+                 500, MACH_PORT_NULL);
   mach_port_deallocate (mach_task_self (), bootstrap);
+  mach_port_deallocate (mach_task_self (), reply);
+
+  if (err == KERN_SUCCESS)
+    {
+      *host_priv_ptr = msg.host_priv;
+      *device_master_ptr = msg.dev_master;
+    }
+
   return err;
 }