diff options
| -rw-r--r-- | sys-utils/hwclock.8.in | 15 | ||||
| -rw-r--r-- | sys-utils/hwclock.c | 34 |
2 files changed, 5 insertions, 44 deletions
diff --git a/sys-utils/hwclock.8.in b/sys-utils/hwclock.8.in index 9926ed479..ddf42a27f 100644 --- a/sys-utils/hwclock.8.in +++ b/sys-utils/hwclock.8.in @@ -577,21 +577,6 @@ This second field is not used under Linux and is always zero. See also .BR \%settimeofday (2). . -.SS User access and setuid -.PP -Sometimes, you need to install -.B \%hwclock -setuid root. If you want users other than the superuser to be able to -display the clock value using the direct ISA I/O method, install it setuid -root. If you have the rtc device interface on your system, or are on a non-ISA -compatible system, there is probably no need for users to have the direct -ISA I/O method, so do not bother. See the -.BR \-\-rtc " option." -.PP -In any case, \fBhwclock\fR will not allow you to set anything unless you have the -superuser real uid. (This restriction is not necessary if you haven't -installed setuid root, but it's there for now.) -. .SS Hardware Clock Access Methods .PP .B \%hwclock diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index ccbdace45..cadbf3075 100644 --- a/sys-utils/hwclock.c +++ b/sys-utils/hwclock.c @@ -1633,8 +1633,6 @@ int main(int argc, char **argv) * fractions. */ time_t set_time = 0; /* Time to which user said to set Hardware Clock */ - - bool permitted; /* User is permitted to do the function */ int rc, c; /* Variables set by various options; show may also be set later */ @@ -1863,6 +1861,11 @@ int main(int argc, char **argv) argc -= optind; argv += optind; + if (getuid() != 0) { + warnx(_("Sorry, only the superuser can use the Hardware Clock.")); + hwclock_exit(EX_NOPERM); + } + #ifdef HAVE_LIBAUDIT if (testing != TRUE) { if (adjust == TRUE || hctosys == TRUE || systohc == TRUE || @@ -1904,28 +1907,6 @@ int main(int argc, char **argv) | setepoch | predict | compare | get)) show = 1; /* default to show */ - if (getuid() == 0) - permitted = TRUE; - else { - /* program is designed to run setuid (in some situations) */ - if ((set || systohc || adjust) && !testing) { - warnx(_("Sorry, only the superuser can change " - "the Hardware Clock.")); - permitted = FALSE; - } else if ((systz || hctosys) && !testing) { - warnx(_("Sorry, only the superuser can change " - "the System Clock.")); - permitted = FALSE; - } else if (setepoch && !testing) { - warnx(_("Sorry, only the superuser can change the " - "Hardware Clock epoch in the kernel.")); - permitted = FALSE; - } else - permitted = TRUE; - } - - if (!permitted) - hwclock_exit(EX_NOPERM); #ifdef __linux__ if (getepoch || setepoch) { @@ -2028,11 +2009,6 @@ void __attribute__((__noreturn__)) hwaudit_exit(int status) * with any functions by these names, you will have unresolved external * references when you link. * - * The program is designed to run setuid superuser, since we need to be able - * to do direct I/O. (More to the point: we need permission to execute the - * iopl() system call). (However, if you use one of the methods other than - * direct ISA I/O to access the clock, no setuid is required). - * * Here's some info on how we must deal with the time that elapses while * this program runs: There are two major delays as we run: * |