diff options
| author |   claudio <claudio@openbsd.org> | 2008-07-19 21:31:39 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2008-07-19 21:31:39 +0000 |
| commit | 8d80afc1ead958fe8304814d104196762aee19f0 (patch) | |
| tree | c6b7481a55b1c21c38e55f8be93b0676b4467835 | |
| parent | In dec_1000a_intr_map(), use the SRM hint if available. This allows cards (diff) | |
| download | wireguard-openbsd-8d80afc1ead958fe8304814d104196762aee19f0.tar.xz wireguard-openbsd-8d80afc1ead958fe8304814d104196762aee19f0.zip | |
Use errx instead of fprintf, exit combo.
Diff from Gleydson Soares gsoares (at) gmail (dot) com
OK henning@
| -rw-r--r-- | usr.sbin/ntpd/ntpd.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/usr.sbin/ntpd/ntpd.c b/usr.sbin/ntpd/ntpd.c index 89012f4cf34..fcffb36ed5e 100644 --- a/usr.sbin/ntpd/ntpd.c +++ b/usr.sbin/ntpd/ntpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntpd.c,v 1.60 2008/05/16 06:13:25 ckuethe Exp $ */ +/* $OpenBSD: ntpd.c,v 1.61 2008/07/19 21:31:39 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -29,6 +29,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <err.h> #include "ntpd.h" @@ -137,15 +138,12 @@ main(int argc, char *argv[]) exit(0); } - if (geteuid()) { - fprintf(stderr, "ntpd: need root privileges\n"); - exit(1); - } + if (geteuid()) + errx(1, "need root privileges"); + + if ((pw = getpwnam(NTPD_USER)) == NULL) + errx(1, "unknown user %s", NTPD_USER); - if ((pw = getpwnam(NTPD_USER)) == NULL) { - fprintf(stderr, "ntpd: unknown user %s\n", NTPD_USER); - exit(1); - } endpwent(); reset_adjtime(); |