Store PID after becoming a daemon() and not before to ensure the

correct PID gets written to the PID file.

Submitted by:	Maxime Soule <btik-fbsd@scoubidou.com>
PR:		203252
MFC after:	2 weeks
This commit is contained in:
Hans Petter Selasky 2015-09-28 07:23:05 +00:00
parent 6f5ed42a0c
commit b27480c68d

View File

@ -166,17 +166,15 @@ main(int argc, char **argv)
if (demon) {
fp = open(pidfile, O_WRONLY|O_CREAT, S_IRUSR|S_IRGRP|S_IROTH);
if (fp >= 0) {
sz1 = snprintf(buf, sizeof buf, "%ld\n",
(long)getpid());
if (sz1 > sizeof buf)
sz1 = sizeof buf;
write(fp, buf, sz1);
close(fp);
} else
if (fp < 0)
err(1, "%s", pidfile);
if (daemon(0, 0) < 0)
err(1, "daemon()");
snprintf(buf, sizeof(buf), "%ld\n", (long)getpid());
sz1 = strlen(buf);
if (write(fp, buf, sz1) < 0)
err(1, "%s", pidfile);
close(fp);
isdemon = 1;
}