PERFORCE change 43675 for review

[Chris Vance]

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

Change 43675 by cvance at 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;