From owner-p4-projects@FreeBSD.ORG  Sat Jul  8 13:27:40 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6485216A4E7; Sat,  8 Jul 2006 13:27:40 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 3384E16A4DA
	for <perforce@freebsd.org>; Sat,  8 Jul 2006 13:27:40 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BAFD043D45
	for <perforce@freebsd.org>; Sat,  8 Jul 2006 13:27:39 +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.6/8.13.6) with ESMTP id k68DRdv0022177
	for <perforce@freebsd.org>; Sat, 8 Jul 2006 13:27:39 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68DRdEt022173
	for perforce@freebsd.org; Sat, 8 Jul 2006 13:27:39 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 8 Jul 2006 13:27:39 GMT
Message-Id: <200607081327.k68DRdEt022173@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>
Cc: 
Subject: PERFORCE change 101003 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 08 Jul 2006 13:27:40 -0000

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

Change 101003 by rwatson@rwatson_zoo on 2006/07/08 13:26:47

	Resort.

Affected files ...

.. //depot/projects/trustedbsd/mac2/sys/security/mac_lomac/mac_lomac.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/mac2/sys/security/mac_lomac/mac_lomac.c#4 (text+ko) ====

@@ -2084,30 +2084,6 @@
 }
 
 static int
-mac_lomac_vnode_check_unlink(struct ucred *cred, struct vnode *dvp,
-    struct label *dlabel, struct vnode *vp, struct label *label,
-    struct componentname *cnp)
-{
-	struct mac_lomac *subj, *obj;
-
-	if (!mac_lomac_enabled)
-		return (0);
-
-	subj = SLOT(cred->cr_label);
-	obj = SLOT(dlabel);
-
-	if (!mac_lomac_subject_dominate(subj, obj))
-		return (EACCES);
-
-	obj = SLOT(label);
-
-	if (!mac_lomac_subject_dominate(subj, obj))
-		return (EACCES);
-
-	return (0);
-}
-
-static int
 mac_lomac_vnode_check_deleteacl(struct ucred *cred, struct vnode *vp,
     struct label *label, acl_type_t type)
 {
@@ -2492,6 +2468,30 @@
 }
 
 static int
+mac_lomac_vnode_check_unlink(struct ucred *cred, struct vnode *dvp,
+    struct label *dlabel, struct vnode *vp, struct label *label,
+    struct componentname *cnp)
+{
+	struct mac_lomac *subj, *obj;
+
+	if (!mac_lomac_enabled)
+		return (0);
+
+	subj = SLOT(cred->cr_label);
+	obj = SLOT(dlabel);
+
+	if (!mac_lomac_subject_dominate(subj, obj))
+		return (EACCES);
+
+	obj = SLOT(label);
+
+	if (!mac_lomac_subject_dominate(subj, obj))
+		return (EACCES);
+
+	return (0);
+}
+
+static int
 mac_lomac_vnode_check_write(struct ucred *active_cred,
     struct ucred *file_cred, struct vnode *vp, struct label *label)
 {
@@ -2666,7 +2666,6 @@
 	.mpo_system_check_sysctl = mac_lomac_system_check_sysctl,
 	.mpo_vnode_check_access = mac_lomac_vnode_check_open,
 	.mpo_vnode_check_create = mac_lomac_vnode_check_create,
-	.mpo_vnode_check_unlink = mac_lomac_vnode_check_unlink,
 	.mpo_vnode_check_deleteacl = mac_lomac_vnode_check_deleteacl,
 	.mpo_vnode_check_link = mac_lomac_vnode_check_link,
 	.mpo_vnode_check_mmap = mac_lomac_vnode_check_mmap,
@@ -2683,6 +2682,7 @@
 	.mpo_vnode_check_setmode = mac_lomac_vnode_check_setmode,
 	.mpo_vnode_check_setowner = mac_lomac_vnode_check_setowner,
 	.mpo_vnode_check_setutimes = mac_lomac_vnode_check_setutimes,
+	.mpo_vnode_check_unlink = mac_lomac_vnode_check_unlink,
 	.mpo_vnode_check_write = mac_lomac_vnode_check_write,
 	.mpo_thread_userret = mac_lomac_thread_userret,
 };