Module Name: src
Committed By: christos
Date: Thu May 14 23:42:18 UTC 2020
Modified Files:
src/usr.sbin/rtadvd: rtadvd.c
Log Message:
If we could not lock the pid file, don't continue as we end up with multiple
rtadvd's (thanks roy@)
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/usr.sbin/rtadvd/rtadvd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/rtadvd/rtadvd.c
diff -u src/usr.sbin/rtadvd/rtadvd.c:1.77 src/usr.sbin/rtadvd/rtadvd.c:1.78
--- src/usr.sbin/rtadvd/rtadvd.c:1.77 Sun May 10 18:38:51 2020
+++ src/usr.sbin/rtadvd/rtadvd.c Thu May 14 19:42:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rtadvd.c,v 1.77 2020/05/10 22:38:51 christos Exp $ */
+/* $NetBSD: rtadvd.c,v 1.78 2020/05/14 23:42:18 christos Exp $ */
/* $KAME: rtadvd.c,v 1.92 2005/10/17 14:40:02 suz Exp $ */
/*
@@ -224,12 +224,11 @@ main(int argc, char *argv[])
if ((pid = pidfile_lock(pidfilepath)) != 0) {
if (pid == -1) {
logit(LOG_ERR, "pidfile_lock: %m");
- /* Continue */
} else {
logit(LOG_ERR, "Another instance of `%s' is running "
"(pid %d); exiting.", getprogname(), pid);
- return EXIT_FAILURE;
}
+ return EXIT_FAILURE;
}
if (prog_init && prog_init() == -1)
