From c9dd4a3fe3a6dd7eb00d421d9452b4f4769836bf Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Mon, 26 Oct 2015 09:57:55 +0000
Subject: [PATCH] stop using pidfile() ok benno jung jca

---
 usr.bin/usbhidaction/usbhidaction.c | 3 +--
 usr.sbin/mrouted/main.c             | 2 --
 usr.sbin/rarpd/rarpd.c              | 3 +--
 usr.sbin/rbootd/rbootd.c            | 5 +----
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c
index 53b5c54f71e..4b61105359b 100644
--- a/usr.bin/usbhidaction/usbhidaction.c
+++ b/usr.bin/usbhidaction/usbhidaction.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbhidaction.c,v 1.19 2015/01/18 17:18:08 mpi Exp $ */
+/*	$OpenBSD: usbhidaction.c,v 1.20 2015/10/26 09:57:55 deraadt Exp $ */
 /*      $NetBSD: usbhidaction.c,v 1.7 2002/01/18 14:38:59 augustss Exp $ */
 
 /*
@@ -162,7 +162,6 @@ main(int argc, char **argv)
 	if (demon) {
 		if (daemon(0, 0) < 0)
 			err(1, "daemon()");
-		pidfile(NULL);
 		isdemon = 1;
 	}
 
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index b0c83bc1a6a..8a0cdc5dc7d 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -219,8 +219,6 @@ usage:	fprintf(stderr,
     if (debug)
 	fprintf(stderr, "pruning %s\n", pruning ? "on" : "off");
 
-    pidfile(NULL);
-
     (void)signal(SIGALRM, fasttimer);
 
     (void)signal(SIGHUP,  restart);
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index 724aaa25a20..d8a2b4202c8 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rarpd.c,v 1.62 2015/10/16 23:09:53 deraadt Exp $ */
+/*	$OpenBSD: rarpd.c,v 1.63 2015/10/26 09:57:55 deraadt Exp $ */
 /*	$NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $	*/
 
 /*
@@ -151,7 +151,6 @@ main(int argc, char *argv[])
 	if ((!fflag) && (!dflag)) {
 		if (daemon(0, 0) == -1)
 			error(FATAL, "failed to daemonize: %s", strerror(errno));
-		pidfile(NULL);
 	}
 	rarp_loop();
 	exit(0);
diff --git a/usr.sbin/rbootd/rbootd.c b/usr.sbin/rbootd/rbootd.c
index bfc09695442..61ba851a772 100644
--- a/usr.sbin/rbootd/rbootd.c
+++ b/usr.sbin/rbootd/rbootd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbootd.c,v 1.26 2015/01/16 06:40:19 deraadt Exp $	*/
+/*	$OpenBSD: rbootd.c,v 1.27 2015/10/26 09:57:55 deraadt Exp $	*/
 /*	$NetBSD: rbootd.c,v 1.5 1995/10/06 05:12:17 thorpej Exp $	*/
 
 /*
@@ -160,9 +160,6 @@ main(int argc, char *argv[])
 
 	gethostname(MyHost, HOST_NAME_MAX+1);
 
-	if (pidfile(NULL) < 0)
-		syslog(LOG_WARNING, "pidfile: failed");
-
 	/*
 	 *  All boot files are relative to the boot directory, we might
 	 *  as well chdir() there to make life easier.
-- 
2.20.1