From 5017b2c845c235542b3101b9cf648f72b9f6ed3e Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 19 Apr 2001 22:53:58 +0000 Subject: * hurd/privports.c (__get_privileged_ports): Renamed with __. Use __ names for calls we make. (get_privileged_ports): Add alias. * hurd/hurd.h: Declare it with the __ name. * sysdeps/mach/hurd/reboot.c (reboot): Use __get_privileged_ports. * sysdeps/mach/hurd/adjtime.c (__adjtime): Likewise. * sysdeps/mach/hurd/settimeofday.c (__settimeofday): Likewise. --- sysdeps/mach/hurd/adjtime.c | 11 +++++------ sysdeps/mach/hurd/reboot.c | 11 +++++------ sysdeps/mach/hurd/settimeofday.c | 11 +++++------ 3 files changed, 15 insertions(+), 18 deletions(-) (limited to 'sysdeps/mach') diff --git a/sysdeps/mach/hurd/adjtime.c b/sysdeps/mach/hurd/adjtime.c index 1af3a635dc..791bb4b92e 100644 --- a/sysdeps/mach/hurd/adjtime.c +++ b/sysdeps/mach/hurd/adjtime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991,93,95,97,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -30,12 +30,11 @@ __adjtime (delta, olddelta) struct timeval *olddelta; { error_t err; - mach_port_t hostpriv, devmaster; + mach_port_t hostpriv; - if (err = __USEPORT (PROC, __proc_getprivports (port, - &hostpriv, &devmaster))) - return __hurd_fail (err); - __mach_port_deallocate (__mach_task_self (), devmaster); + err = __get_privileged_ports (&hostpriv, NULL); + if (err) + return __hurd_fail (EPERM); err = __host_adjust_time (hostpriv, /* `time_value_t' and `struct timeval' are in diff --git a/sysdeps/mach/hurd/reboot.c b/sysdeps/mach/hurd/reboot.c index ea298b2135..528bffa343 100644 --- a/sysdeps/mach/hurd/reboot.c +++ b/sysdeps/mach/hurd/reboot.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 93, 94, 97, 98 Free Software Foundation, Inc. +/* Copyright (C) 1992,93,94,97,98,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -28,12 +28,11 @@ reboot (int howto) { error_t err; startup_t init; - mach_port_t hostpriv, devmaster; + mach_port_t hostpriv; - if (err = __USEPORT (PROC, __proc_getprivports (port, - &hostpriv, &devmaster))) - return __hurd_fail (err); - __mach_port_deallocate (__mach_task_self (), devmaster); + err = __get_privileged_ports (&hostpriv, NULL); + if (err) + return __hurd_fail (EPERM); err = __USEPORT (PROC, __proc_getmsgport (port, 1, &init)); if (!err) diff --git a/sysdeps/mach/hurd/settimeofday.c b/sysdeps/mach/hurd/settimeofday.c index e0e8135809..a728309e1e 100644 --- a/sysdeps/mach/hurd/settimeofday.c +++ b/sysdeps/mach/hurd/settimeofday.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 93, 94, 95, 97 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,93,94,95,97,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -29,7 +29,7 @@ __settimeofday (tv, tz) const struct timezone *tz; { error_t err; - mach_port_t hostpriv, devmaster; + mach_port_t hostpriv; if (tz != NULL) { @@ -37,10 +37,9 @@ __settimeofday (tv, tz) return -1; } - if (err = __USEPORT (PROC, __proc_getprivports (port, - &hostpriv, &devmaster))) - return __hurd_fail (err); - __mach_port_deallocate (__mach_task_self (), devmaster); + err = __get_privileged_ports (&hostpriv, NULL); + if (err) + return __hurd_fail (EPERM); /* `time_value_t' and `struct timeval' are in fact identical with the names changed. */ -- cgit v1.2.3