From owner-p4-projects@FreeBSD.ORG  Sat Apr  2 17:32:03 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1285516A4D0; Sat,  2 Apr 2005 17:32:03 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CA81716A4CE
	for <perforce@freebsd.org>; Sat,  2 Apr 2005 17:32:02 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9D9A943D1F
	for <perforce@freebsd.org>; Sat,  2 Apr 2005 17:32:02 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j32HW2iq025440
	for <perforce@freebsd.org>; Sat, 2 Apr 2005 17:32:02 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j32HW2JO025437
	for perforce@freebsd.org; Sat, 2 Apr 2005 17:32:02 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 2 Apr 2005 17:32:02 GMT
Message-Id: <200504021732.j32HW2JO025437@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 74356 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
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: Sat, 02 Apr 2005 17:32:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=74356

Change 74356 by rwatson@rwatson_paprika on 2005/04/02 17:31:46

	Delete likely mis-merge from adding MAC labels and access control
	to System V messages.  This line is not present in the main FreeBSD
	source tree.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac/mac_sysv_msg.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_sysv_msg.c#11 (text+ko) ====

@@ -101,7 +101,6 @@
 {
 
 	msqkptr->label = mac_sysv_msgqueue_label_alloc();
-	msqkptr->label = NULL;
 }
 
 static void