From owner-p4-projects@FreeBSD.ORG  Tue Dec  9 07:36:57 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9C6C716A4D0; Tue,  9 Dec 2003 07:36:57 -0800 (PST)
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 66D1C16A4CE
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 07:36:57 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9E5B743D2A
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 07:36:56 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9FauXJ099009
	for <perforce@freebsd.org>; Tue, 9 Dec 2003 07:36:56 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9Fatru099006
	for perforce@freebsd.org; Tue, 9 Dec 2003 07:36:55 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Date: Tue, 9 Dec 2003 07:36:55 -0800 (PST)
Message-Id: <200312091536.hB9Fatru099006@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 43675 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: Tue, 09 Dec 2003 15:36:58 -0000

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

Change 43675 by cvance@cvance_korben on 2003/12/09 07:36:09

	Remove precondition check 
	Fix bug in sebsd_check_vnode_relabel

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#28 edit

Differences ...

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

@@ -75,12 +75,6 @@
 
 MALLOC_DEFINE(M_SEBSD, "sebsd", "Security Enhanced BSD");
 
-extern int ss_initialized;
-static __inline int ss_precondition(void)
-{
-	return ss_initialized;
-}
-
 static void
 sebsd_init(struct mac_policy_conf *mpc)
 {
@@ -520,10 +514,6 @@
 	int rc;
 	struct task_security_struct *parent, *task;
 
-	rc = ss_precondition();
-	if (rc <= 0)
-		return;
-
 	parent = SLOT(cred_parent->cr_label);
 	task = SLOT(cred_child->cr_label);
 
@@ -880,10 +870,6 @@
 	}
 }
 
-/*
- * Initialize the SEBSD security server after the root partition has
- * been mounted; policy is located on root partition.
- */
 static void
 sebsd_create_root_mount(struct ucred *cred, struct mount *mp,
     struct label *mntlabel, struct label *fslabel)
@@ -1624,7 +1610,7 @@
 
 	task = SLOT(cred->cr_label);
 	old = SLOT(oldlabel);
-	new = SLOT(oldlabel);
+	new = SLOT(newlabel);
 
 	AVC_AUDIT_DATA_INIT(&ad, FS);
 	ad.u.fs.vp = vp;