svn commit: r230541 - head/usr.sbin/daemon
Guy Helmer
ghelmer at FreeBSD.org
Wed Jan 25 14:50:13 UTC 2012
Author: ghelmer
Date: Wed Jan 25 14:50:12 2012
New Revision: 230541
URL: http://svn.freebsd.org/changeset/base/230541
Log:
Revert 229667: After some discussion of this change, it seems it is
better to leave the pidfile open where it was. Add a note to the
man page describing pidfile strategies to use if the daemon is to
be run as a user other than root.
Modified:
head/usr.sbin/daemon/daemon.8
head/usr.sbin/daemon/daemon.c
Modified: head/usr.sbin/daemon/daemon.8
==============================================================================
--- head/usr.sbin/daemon/daemon.8 Wed Jan 25 14:38:00 2012 (r230540)
+++ head/usr.sbin/daemon/daemon.8 Wed Jan 25 14:50:12 2012 (r230541)
@@ -59,6 +59,10 @@ Write the ID of the created process into
using the
.Xr pidfile 3
functionality.
+If the
+.Fl u
+option is used, the directory to contain the pidfile must be writable
+by the specified user.
Note, that the file will be created shortly before the process is
actually executed, and will remain after the process exits (although
it will be removed if the execution fails).
Modified: head/usr.sbin/daemon/daemon.c
==============================================================================
--- head/usr.sbin/daemon/daemon.c Wed Jan 25 14:38:00 2012 (r230540)
+++ head/usr.sbin/daemon/daemon.c Wed Jan 25 14:50:12 2012 (r230541)
@@ -79,6 +79,9 @@ main(int argc, char *argv[])
if (argc == 0)
usage();
+ if (user != NULL)
+ restrict_process(user);
+
/*
* Try to open the pidfile before calling daemon(3),
* to be able to report the error intelligently
@@ -94,9 +97,6 @@ main(int argc, char *argv[])
}
}
- if (user != NULL)
- restrict_process(user);
-
if (daemon(nochdir, noclose) == -1)
err(1, NULL);
More information about the svn-src-all
mailing list