From owner-svn-src-all@FreeBSD.ORG  Sun Jan 27 06:01:35 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BA57389C;
 Sun, 27 Jan 2013 06:01:35 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A336914B;
 Sun, 27 Jan 2013 06:01:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0R61ZW6012625;
 Sun, 27 Jan 2013 06:01:35 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0R61ZiJ012624;
 Sun, 27 Jan 2013 06:01:35 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201301270601.r0R61ZiJ012624@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Sun, 27 Jan 2013 06:01:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245961 - head/usr.sbin/newsyslog
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Jan 2013 06:01:35 -0000

Author: markj
Date: Sun Jan 27 06:01:35 2013
New Revision: 245961
URL: http://svnweb.freebsd.org/changeset/base/245961

Log:
  When the 'R' flag is used with a newsyslog.conf entry, some fields of
  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

Modified:
  head/usr.sbin/newsyslog/newsyslog.c

Modified: head/usr.sbin/newsyslog/newsyslog.c
==============================================================================
--- head/usr.sbin/newsyslog/newsyslog.c	Sun Jan 27 05:59:28 2013	(r245960)
+++ head/usr.sbin/newsyslog/newsyslog.c	Sun Jan 27 06:01:35 2013	(r245961)
@@ -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 *en
 	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);