d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When the 'R' flag is used with a newsyslog.conf entry, some fields of

Browse Source 
the corresponding struct sigwork_entry were left uninitialized,
potentially causing an early return from do_sigwork(). Ensure that these
fields are initialized, and handle the 'R' flag properly in
do_sigwork().

PR:		bin/175330
Reviewed by:	gad
Approved by:	rstone (co-mentor)
MFC after:	1 week
This commit is contained in:
markj 2013-01-27 06:01:35 +00:00
parent 9d3fe41880
commit eb5455fa48
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/newsyslog/newsyslog.c
View File

@ -1866,7 +1866,7 @@ do_sigwork(struct sigwork_entry *swork)
int kres, secs;
char *tmp;
if (!(swork->sw_pidok) || swork->sw_pid == 0)
if (swork->run_cmd == 0 && (!(swork->sw_pidok) || swork->sw_pid == 0))
return; /* no work to do... */
/*
@ -2078,6 +2078,8 @@ save_sigwork(const struct conf_entry *ent)
stmp->run_cmd = 0;
/* If this is a command to run we just set the flag and run command */
if (ent->flags & CE_PID2CMD) {
stmp->sw_pid = -1;
stmp->sw_pidok = 0;
stmp->run_cmd = 1;
} else {
set_swpid(stmp, ent);