Page MenuHomeFreeBSD
Files F177575679

D46313.1794784135.diff
No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

D46313.1794784135.diff
View Options

diff --git a/usr.sbin/daemon/daemon.8 b/usr.sbin/daemon/daemon.8
--- a/usr.sbin/daemon/daemon.8
+++ b/usr.sbin/daemon/daemon.8
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd January 28, 2026
+.Dd August 13, 2026
.Dt DAEMON 8
.Os
.Sh NAME
@@ -32,7 +32,7 @@
.Nd run detached from the controlling terminal
.Sh SYNOPSIS
.Nm
-.Op Fl cfHrS
+.Op Fl cfHrSx
.Op Fl p Ar child_pidfile
.Op Fl P Ar supervisor_pidfile
.Op Fl t Ar title
@@ -209,10 +209,23 @@
.Ev SHELL
are set accordingly.
Requires adequate superuser privileges.
+.It Fl x , Fl -execute-only
+Do not supervise the child process when using
+.Fl p .
+This option is useful to run the given program as another user when
+.Xr su 1
+can't be used but a file holding the pid is needed.
+The
+.Ar child_pidfile
+will not be locked and the contents may be silently truncated by
+a concurrent daemon(8) invocation.
.El
.Pp
If any of the options
-.Fl -child-pidfile ,
+.Fl -child-pidfile
+(without
+.Fl -execute-only
+),
.Fl -output-mask ,
.Fl -restart ,
.Fl -restart-delay ,
diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c
--- a/usr.sbin/daemon/daemon.c
+++ b/usr.sbin/daemon/daemon.c
@@ -119,13 +119,14 @@
static int pidfile_truncate(struct pidfh *);
-static const char shortopts[] = "+cfHSp:P:ru:o:M:s:l:t:m:R:T:C:h";
+static const char shortopts[] = "+cfHSxp:P:ru:o:M:s:l:t:m:R:T:C:h";
static const struct option longopts[] = {
{ "change-dir", no_argument, NULL, 'c' },
{ "close-fds", no_argument, NULL, 'f' },
{ "sighup", no_argument, NULL, 'H' },
{ "syslog", no_argument, NULL, 'S' },
+ { "execute-only", no_argument, NULL, 'x' },
{ "output-file", required_argument, NULL, 'o' },
{ "output-file-mode", required_argument, NULL, 'M' },
{ "output-mask", required_argument, NULL, 'm' },
@@ -147,7 +148,7 @@
usage(int exitcode)
{
(void)fprintf(stderr,
- "usage: daemon [-cfHrS] [-p child_pidfile] [-P supervisor_pidfile]\n"
+ "usage: daemon [-cfHrSx] [-p child_pidfile] [-P supervisor_pidfile]\n"
" [-u user] [-o output_file] [-M output_file_mode] [-t title]\n"
" [-l syslog_facility] [-s syslog_priority]\n"
" [-T syslog_tag] [-m output_mask] [-R restart_delay_secs]\n"
@@ -159,6 +160,7 @@
" --close-fds -f Set stdin, stdout, stderr to /dev/null\n"
" --sighup -H Close and re-open output file on SIGHUP\n"
" --syslog -S Send output to syslog\n"
+ " --execute-only -x Do not supervise child process when using -p\n"
" --output-file -o <file> Append output of the child process to file\n"
" --output-file-mode -M <mode> Output file mode of the child process\n"
" --output-mask -m <mask> What to send to syslog/file\n"
@@ -185,6 +187,7 @@
int ch = 0;
mode_t *set = NULL;
struct daemon_state state;
+ bool opt_x = false;
daemon_state_init(&state);
@@ -195,7 +198,7 @@
/*
* Supervision mode is enabled if one of the following options are used:
* --output-file -o
- * --child-pidfile -p
+ * --child-pidfile -p (if --execute-only -x is not given)
* --supervisor-pidfile -P
* --restart -r / --restart-delay -R
* --syslog -S
@@ -262,9 +265,14 @@
free(set);
set = NULL;
break;
+ case 'x':
+ opt_x = true;
+ break;
case 'p':
state.child_pidfile = optarg;
- state.mode = MODE_SUPERVISE;
+ /*
+ * Enable supervision later if no -x was given
+ */
break;
case 'P':
state.parent_pidfile = optarg;
@@ -322,6 +330,17 @@
usage(1);
}
+ /*
+ * Enable supervision for -p if -x was not given
+ */
+ if (state.child_pidfile != NULL) {
+ if (!opt_x) {
+ state.mode = MODE_SUPERVISE;
+ }
+ } else if (opt_x) {
+ errx(6, "-x is not allowed without -p");
+ }
+
if (!state.title) {
state.title = argv[0];
}

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 15, 11:08 PM (21 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41750356
Default Alt Text
D46313.1794784135.diff (4 KB)

Event Timeline