stop using pidfile()

ok benno jung jca

diff --git a/usr.bin/usbhidaction/usbhidaction.c b/usr.bin/usbhidaction/usbhidaction.c
index 53b5c54..4b61105 100644 (file)
--- 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 b0c83bc..8a0cdc5 100644 (file)
--- 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 724aaa2..d8a2b42 100644 (file)
--- 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 bfc0969..61ba851 100644 (file)
--- 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.