From 4b7b3363bdfdb661eb3422c62090a9a709c82034 Mon Sep 17 00:00:00 2001
From: dtucker <>
Date: Mon, 12 Jul 2004 09:22:38 +0000
Subject: [PATCH] Replace errx with equivalent fprintf+exit to make porting
 easier; ok henning@

---
 src/usr.sbin/ntpd/buffer.c |  3 +--
 src/usr.sbin/ntpd/log.c    |  3 +--
 src/usr.sbin/ntpd/ntpd.c   | 15 +++++++++------
 src/usr.sbin/ntpd/parse.y  |  3 +--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/usr.sbin/ntpd/buffer.c b/src/usr.sbin/ntpd/buffer.c
index efc1bfff..a1bedd5b 100644
--- a/src/usr.sbin/ntpd/buffer.c
+++ b/src/usr.sbin/ntpd/buffer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buffer.c,v 1.1 2004/05/31 13:46:16 henning Exp $ */
+/*	$OpenBSD: buffer.c,v 1.2 2004/07/12 09:22:38 dtucker Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -21,7 +21,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <err.h>
 #include <errno.h>
 #include <limits.h>
 #include <string.h>
diff --git a/src/usr.sbin/ntpd/log.c b/src/usr.sbin/ntpd/log.c
index 40acc044..4445972f 100644
--- a/src/usr.sbin/ntpd/log.c
+++ b/src/usr.sbin/ntpd/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.5 2004/07/11 03:05:50 dtucker Exp $ */
+/*	$OpenBSD: log.c,v 1.6 2004/07/12 09:22:38 dtucker Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -21,7 +21,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <err.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
index 6115ac58..d00caf66 100644
--- a/src/usr.sbin/ntpd/ntpd.c
+++ b/src/usr.sbin/ntpd/ntpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntpd.c,v 1.10 2004/07/09 15:08:54 deraadt Exp $ */
+/*	$OpenBSD: ntpd.c,v 1.11 2004/07/12 09:22:38 dtucker Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -21,7 +21,6 @@
 #include <sys/wait.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
@@ -110,11 +109,15 @@ main(int argc, char *argv[])
 	if (parse_config(conffile, &conf))
 		exit(1);
 
-	if (geteuid())
-		errx(1, "need root privileges");
+	if (geteuid()) {
+		fprintf(stderr, "ntpd: need root privileges");
+		exit(1);
+	}
 
-	if (getpwnam(NTPD_USER) == NULL)
-		errx(1, "unknown user %s", NTPD_USER);
+	if (getpwnam(NTPD_USER) == NULL) {
+		fprintf(stderr, "ntpd: unknown user %s", NTPD_USER);
+		exit(1);
+	}
 	endpwent();
 
 	log_init(debug);
diff --git a/src/usr.sbin/ntpd/parse.y b/src/usr.sbin/ntpd/parse.y
index 73bba735..5599202e 100644
--- a/src/usr.sbin/ntpd/parse.y
+++ b/src/usr.sbin/ntpd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.11 2004/07/09 19:28:03 otto Exp $ */
+/*	$OpenBSD: parse.y,v 1.12 2004/07/12 09:22:38 dtucker Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -26,7 +26,6 @@
 #include <arpa/inet.h>
 
 #include <ctype.h>
-#include <err.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>