From owner-p4-projects@FreeBSD.ORG  Thu Jul  8 20:24:11 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6064416A4D0; Thu,  8 Jul 2004 20:24:11 +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 3BE8216A4CE
	for <perforce@freebsd.org>; Thu,  8 Jul 2004 20:24:11 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 338F543D39
	for <perforce@freebsd.org>; Thu,  8 Jul 2004 20:24:11 +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.12.11/8.12.11) with ESMTP id i68KOBd5026313
	for <perforce@freebsd.org>; Thu, 8 Jul 2004 20:24:11 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i68KOBLr026310
	for perforce@freebsd.org; Thu, 8 Jul 2004 20:24:11 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 8 Jul 2004 20:24:11 GMT
Message-Id: <200407082024.i68KOBLr026310@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 56804 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: Thu, 08 Jul 2004 20:24:11 -0000

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

Change 56804 by rwatson@rwatson_tislabs on 2004/07/08 20:24:06

	Trim uneeded #ifdef, comment that isn't necessarily useful.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#24 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#24 (text+ko) ====

@@ -26,9 +26,7 @@
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/jail.h>
-#ifdef MAC
 #include <sys/mac.h>
-#endif
 
 static MALLOC_DEFINE(M_SEM, "sem", "SVID compatible semaphores");
 
@@ -572,10 +570,6 @@
 	sema_mtxp = &sema_mtx[semid];
 #ifdef MAC
 	mtx_lock(sema_mtxp);
-	/*
-	 * The MAC framework lets the policies decide what type of access
-	 * is permitted, based on the cmd.
-	 */
 	if ((error = mac_check_ipc_semctl(cred, semakptr, cmd))) {
 		MPRINTF((
 		    "MAC Framework: mac_check_ipc_semctl access denied\n"));