Page MenuHomeFreeBSD
Files F159361518

D54930.id171408.diff
No OneTemporary
Actions

D54930.id171408.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 April 25, 2024
+.Dd January 28, 2026
.Dt DAEMON 8
.Os
.Sh NAME
@@ -111,10 +111,23 @@
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
--- a/usr.sbin/daemon/daemon.c
+++ b/usr.sbin/daemon/daemon.c
@@ -93,6 +93,7 @@
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 @@
};
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 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 @@
{ "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 @@
{
(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 @@
" --sighup -H Close and re-open output file on SIGHUP\n"
" --syslog -S Send output to syslog\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"
" 1=stdout, 2=stderr, 3=both\n"
" --child-pidfile -p <file> Write PID of the child process to file\n"
@@ -180,6 +183,7 @@
{
const char *e = NULL;
int ch = 0;
+ mode_t *set = NULL;
struct daemon_state state;
daemon_state_init(&state);
@@ -248,6 +252,15 @@
*/
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 @@
}
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 @@
}
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 @@
{
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 @@
.keep_fds_open = 1,
.output_fd = -1,
.output_filename = NULL,
+ .output_file_mode = 0600,
.restart_count = -1,
.restarted_count = 0
};

File Metadata

Mime Type
text/plain
Expires
Sun, Jun 14, 7:17 AM (8 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33940225
Default Alt Text
D54930.id171408.diff (4 KB)

Event Timeline