From: David Michael <fedora.dm0@gmail.com>
Date: Sun, 11 Mar 2018 23:21:44 +0000 (+0100)
Subject: Lookup the startup server through /servers/startup
X-Git-Tag: glibc-2.28~483
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da6d4404ecfd7eacba8c096b0761a5758a59da4b;p=thirdparty%2Fglibc.git

Lookup the startup server through /servers/startup

* sysdeps/mach/hurd/reboot.c: Include <hurd/paths.h>
(reboot): Lookup _SERVERS_STARTUP instead of calling proc_getmsgport to get a
port to the startup server.
---

diff --git a/ChangeLog b/ChangeLog
index eda37a2b314..02d1ccdc682 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-12  David Michael <fedora.dm0@gmail.com>
+
+	* sysdeps/mach/hurd/reboot.c: Include <hurd/paths.h>
+	(reboot): Lookup _SERVERS_STARTUP instead of calling proc_getmsgport to
+	get a port to the startup server.
+
 2018-03-11  Zack Weinberg  <zackw@panix.com>
 
 	* sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Include math.h
diff --git a/sysdeps/mach/hurd/reboot.c b/sysdeps/mach/hurd/reboot.c
index a7987e16409..beeb9bfcbc8 100644
--- a/sysdeps/mach/hurd/reboot.c
+++ b/sysdeps/mach/hurd/reboot.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <hurd.h>
+#include <hurd/paths.h>
 #include <hurd/startup.h>
 #include <sys/reboot.h>
 
@@ -33,8 +34,8 @@ reboot (int howto)
   if (err)
     return __hurd_fail (EPERM);
 
-  err = __USEPORT (PROC, __proc_getmsgport (port, 1, &init));
-  if (!err)
+  init = __file_name_lookup (_SERVERS_STARTUP, 0, 0);
+  if (init != MACH_PORT_NULL)
     {
       err = __startup_reboot (init, hostpriv, howto);
       __mach_port_deallocate (__mach_task_self (), init);