From owner-p4-projects@FreeBSD.ORG  Fri Oct  7 22:12:03 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3FD491065672; Fri,  7 Oct 2011 22:12:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 02A87106566B
	for <perforce@freebsd.org>; Fri,  7 Oct 2011 22:12:03 +0000 (UTC)
	(envelope-from pjd@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id E51E98FC08
	for <perforce@freebsd.org>; Fri,  7 Oct 2011 22:12:02 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p97MC2ig098952
	for <perforce@freebsd.org>; Fri, 7 Oct 2011 22:12:02 GMT
	(envelope-from pjd@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p97MC2fh098949
	for perforce@freebsd.org; Fri, 7 Oct 2011 22:12:02 GMT
	(envelope-from pjd@freebsd.org)
Date: Fri, 7 Oct 2011 22:12:02 GMT
Message-Id: <201110072212.p97MC2fh098949@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	pjd@freebsd.org using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 199872 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Oct 2011 22:12:03 -0000

http://p4web.freebsd.org/@@199872?ac=10

Change 199872 by pjd@pjd_anger on 2011/10/07 22:11:45

	- When creating a file, don't give group access before setting
	  proper group ownership.
	- Add XXX comment, as creating a file and opening it for reading
	  only looks strange.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#15 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#15 (text+ko) ====

@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#14 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#15 $
  */
 
 #include <sys/param.h>
@@ -783,10 +783,11 @@
 {
 	int error, fd;
 
-	fd = open(fname, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP);
+	/* XXXPJD: We create a file and open it only for reading? Strange. */
+	fd = open(fname, O_RDONLY | O_CREAT, S_IRUSR);
 	if (fd < 0)
 		return (-1);
-	if (fchown(fd, -1, gid) < 0) {
+	if (fchown(fd, -1, gid) < 0 || fchmod(fd, S_IRUSR | S_IRGRP) < 0) {
 		error = errno;
 		close(fd);
 		(void)unlink(fname);