From nobody Sat Feb 7 14:46:49 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7Ygt007cz6QgXM for ; Sat, 07 Feb 2026 14:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7Ygs6Tnwz3pXB for ; Sat, 07 Feb 2026 14:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770475609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QIsWm+mtvyiGybU9wbT3qUoEMurT3AltNoOtC1XMN2M=; b=PurbAYnLVOx814uzehWsMBL4JXj8JkDLk1fonJaDYD+nJzLLvbbjpM6uUgJwP578FMDDCU R7e5t/nuzORv26ulmt2FBRb2nWuBtgGF8nwmp5u2ZSxadYe7CHtn3sdQf6BAuiR6b6/kW6 kdDKXRHjMMSGlqV3I4SOxKJM/CRZgfl5qaBYx6uL7CCmtTqB5La84m+7TvKs9Ti/TtAatm XzPLkkJzUQ64VVTgygxX7jENpkpDakW+aLXUEz9KuURI451sZZdps/Yg/sO6BHP2MybWri LIjpWk06BDkliDxYqcuREcJUEL0Wszzc5j86F17TFdnZwL9GBbW6kM639TxEpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770475609; a=rsa-sha256; cv=none; b=p4RS18+LE1ZdY7fnGWMnTYElGz2Bm3XNELJMcIsp1SCfljMrFmr3AVzlucb3DEO8uZ4lQe 9CZ+pMXax6mKzJFg/GV3SUMMFCF8YFjx7qdgQjEUNxpLc+wMP4LTn2FZucwtl9ttdO+5Ow I4MAx6V2cfZjLspWB1N8XR9TrA+qXwnL8H5XOXq2igL7T3Ewk7u0ueMJthhzeFV1Stwl2G IiDfK+tx5lUa9pM8EWAvic3RZ3HjMODNupmBfGK0o+PfBMF6cisnM6lfj/gWBGFeT1uE5E 3jUae5Cm0WHDaoKrck0o0zLSPnKF5ra3K6tEC3qjZYyHioia44U++OuvCH3xMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770475609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QIsWm+mtvyiGybU9wbT3qUoEMurT3AltNoOtC1XMN2M=; b=h95CaZIvkctJtiI1easzpy3JroXj+hyaWpagveRAxfchCgJoL3tcNvQLJD24wuxSRIbQgM J8oDXRBmTQT7++LSKRDGTIpqYyKys8wpDRXRHUo75bzXHNjqV+leOL6ftXryQE9WybIXQ8 DeuIsu3hoonkiUH6fzvMFp0N5XYudiWUSJnE75rehmilrwV1tioZNAVdnygrDF2FYzpHcV HMcwaQrUE6m54QqDIBH4zuQUmU9hpI/AvMoaAXouKWJANL35/79c+COyBoWBoyfieXaVkC YkZCDT3ltvsZn6yIXwvVSTwLxQ5GqcvExvUV6RUO2yQdQfshRjz+JYzIlhdgHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7Ygs61Z2z1573 for ; Sat, 07 Feb 2026 14:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40c71 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 14:46:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: a3b90a1f0083 - main - daemon: Add option for output file mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3b90a1f008365d9f62773998f89f9c872e2bed5 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 14:46:49 +0000 Message-Id: <69875059.40c71.4310f0d8@gitrepo.freebsd.org> The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=a3b90a1f008365d9f62773998f89f9c872e2bed5 commit a3b90a1f008365d9f62773998f89f9c872e2bed5 Author: Michael Osipov AuthorDate: 2026-01-28 18:49:26 +0000 Commit: Michael Osipov CommitDate: 2026-02-07 14:45:40 +0000 daemon: Add option for output file mode The daemon utility has always created its output file with a fixed mode of 0600. This causes issues for log collection setups where the collector does not run as root but instead relies on group access to the watched daemon’s log file. Introduce a new option that allows specifying the output file mode using install(1)-style semantics. This enables non-root log collectors to access the file as intended and improves compatibility with log rotation tools. Reviewed by: kevans MFC after: 1 week Relnotes: yes Differential Revision: https://reviews.freebsd.org/D54930 --- usr.sbin/daemon/daemon.8 | 17 +++++++++++++++-- usr.sbin/daemon/daemon.c | 28 +++++++++++++++++++++------- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/usr.sbin/daemon/daemon.8 b/usr.sbin/daemon/daemon.8 index 52fbc230ac77..ada1aa252265 100644 --- 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 April 25, 2024 +.Dd January 28, 2026 .Dt DAEMON 8 .Os .Sh NAME @@ -111,10 +111,23 @@ or both This value specifies what is sent to syslog and the log file. The default is .Cm 3 . +.It Fl M , Fl -output-file-mode Ar mode +Specify the file +.Ar mode +to use when creating the +.Pa output_file . +The mode is interpreted using +.Xr chmod 1 +style semantics. +This option is useful when the daemonized process or external log +collectors require group or world access to the output file. +The default is +.Cm 0600 . .It Fl o , Fl -output-file Ar output_file Append output from the daemonized process to .Pa output_file . -If the file does not exist, it is created with permissions 0600. +If the file does not exist, it is created with the default file +.Ar mode . When this option is used together with options .Fl -change-dir and diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index efba87de19d4..341438730a6d 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -93,6 +93,7 @@ struct daemon_state { int syslog_facility; int keep_fds_open; int output_fd; + mode_t output_file_mode; bool restart_enabled; bool syslog_enabled; bool log_reopen; @@ -101,7 +102,7 @@ struct daemon_state { }; static void restrict_process(const char *); -static int open_log(const char *); +static int open_log(const char *, mode_t); static void reopen_log(struct daemon_state *); static bool listen_child(struct daemon_state *); static int get_log_mapping(const char *, const CODE *); @@ -118,7 +119,7 @@ static int daemon_setup_kqueue(void); static int pidfile_truncate(struct pidfh *); -static const char shortopts[] = "+cfHSp:P:ru:o:s:l:t:m:R:T:C:h"; +static const char shortopts[] = "+cfHSp:P:ru:o:M:s:l:t:m:R:T:C:h"; static const struct option longopts[] = { { "change-dir", no_argument, NULL, 'c' }, @@ -126,6 +127,7 @@ static const struct option longopts[] = { { "sighup", no_argument, NULL, 'H' }, { "syslog", no_argument, NULL, 'S' }, { "output-file", required_argument, NULL, 'o' }, + { "output-file-mode", required_argument, NULL, 'M' }, { "output-mask", required_argument, NULL, 'm' }, { "child-pidfile", required_argument, NULL, 'p' }, { "supervisor-pidfile", required_argument, NULL, 'P' }, @@ -146,7 +148,7 @@ usage(int exitcode) { (void)fprintf(stderr, "usage: daemon [-cfHrS] [-p child_pidfile] [-P supervisor_pidfile]\n" - " [-u user] [-o output_file] [-t title]\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" " [-C restart_count]\n" @@ -158,6 +160,7 @@ usage(int exitcode) " --sighup -H Close and re-open output file on SIGHUP\n" " --syslog -S Send output to syslog\n" " --output-file -o Append output of the child process to file\n" + " --output-file-mode -M Output file mode of the child process\n" " --output-mask -m What to send to syslog/file\n" " 1=stdout, 2=stderr, 3=both\n" " --child-pidfile -p Write PID of the child process to file\n" @@ -180,6 +183,7 @@ main(int argc, char *argv[]) { const char *e = NULL; int ch = 0; + mode_t *set = NULL; struct daemon_state state; daemon_state_init(&state); @@ -248,6 +252,15 @@ main(int argc, char *argv[]) */ state.mode = MODE_SUPERVISE; break; + case 'M': + if ((set = setmode(optarg)) == NULL) { + errx(6, "unrecognized output file mode: %s", optarg); + } else { + state.output_file_mode = getmode(set, 0); + } + free(set); + set = NULL; + break; case 'p': state.child_pidfile = optarg; state.mode = MODE_SUPERVISE; @@ -313,7 +326,7 @@ main(int argc, char *argv[]) } if (state.output_filename) { - state.output_fd = open_log(state.output_filename); + state.output_fd = open_log(state.output_filename, state.output_file_mode); if (state.output_fd == -1) { err(7, "open"); } @@ -756,10 +769,10 @@ do_output(const unsigned char *buf, size_t len, struct daemon_state *state) } static int -open_log(const char *outfn) +open_log(const char *outfn, mode_t outfm) { - return open(outfn, O_CREAT | O_WRONLY | O_APPEND | O_CLOEXEC, 0600); + return open(outfn, O_CREAT | O_WRONLY | O_APPEND | O_CLOEXEC, outfm); } static void @@ -767,7 +780,7 @@ reopen_log(struct daemon_state *state) { int outfd; - outfd = open_log(state->output_filename); + outfd = open_log(state->output_filename, state->output_file_mode); if (state->output_fd >= 0) { close(state->output_fd); } @@ -804,6 +817,7 @@ daemon_state_init(struct daemon_state *state) .keep_fds_open = 1, .output_fd = -1, .output_filename = NULL, + .output_file_mode = 0600, .restart_count = -1, .restarted_count = 0 };