From owner-p4-projects@FreeBSD.ORG  Thu Nov 11 19:59:24 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9BB7916A4D1; Thu, 11 Nov 2004 19:59:23 +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 6CC2916A4CE
	for <perforce@freebsd.org>; Thu, 11 Nov 2004 19:59:23 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5AB9543D2F
	for <perforce@freebsd.org>; Thu, 11 Nov 2004 19:59:23 +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 iABJxNVW034742
	for <perforce@freebsd.org>; Thu, 11 Nov 2004 19:59:23 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 iABJxNUO034739
	for perforce@freebsd.org; Thu, 11 Nov 2004 19:59:23 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 11 Nov 2004 19:59:23 GMT
Message-Id: <200411111959.iABJxNUO034739@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 64901 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, 11 Nov 2004 19:59:24 -0000

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

Change 64901 by rwatson@rwatson_tislabs on 2004/11/11 19:58:22

	Integrate System V IPC sysctl fix to SEBSD branch.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_msg.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_sem.c#4 integrate
.. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_shm.c#4 integrate

Differences ...

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

@@ -54,7 +54,7 @@
 #include <security/mac/mac_internal.h>
 
 static int	mac_enforce_sysv_msg = 1;
-SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv, CTLFLAG_RW,
+SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv_msg, CTLFLAG_RW,
     &mac_enforce_sysv_msg, 0,
     "Enforce MAC policy on System V IPC Message Queues");
 TUNABLE_INT("security.mac.enforce_sysv_msg", &mac_enforce_sysv_msg);

==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_sem.c#4 (text+ko) ====

@@ -54,7 +54,7 @@
 #include <security/mac/mac_internal.h>
 
 static int	mac_enforce_sysv_sem = 1;
-SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv, CTLFLAG_RW,
+SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv_sem, CTLFLAG_RW,
     &mac_enforce_sysv_sem, 0, "Enforce MAC policy on System V IPC Semaphores");
 TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv_sem);
 

==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_sysv_shm.c#4 (text+ko) ====

@@ -54,7 +54,7 @@
 #include <security/mac/mac_internal.h>
 
 static int	mac_enforce_sysv_shm = 1;
-SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv, CTLFLAG_RW,
+SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysv_shm, CTLFLAG_RW,
     &mac_enforce_sysv_shm, 0,
     "Enforce MAC policy on System V IPC shared memory");
 TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv_shm);