PERFORCE change 113293 for review

[Todd Miller]

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

Change 113293 by millert at millert_macbook on 2007/01/21 22:42:25

	Fix what looks like a mis-merge.  Move MAC check before return.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_prot.c#8 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_prot.c#8 (text+ko) ====

@@ -1013,6 +1013,10 @@
 	audit_token.val[6] = p->p_ucred->cr_au.ai_asid;
 	audit_token.val[7] = p->p_ucred->cr_au.ai_termid.port;
 
+#ifdef MAC
+	mac_task_label_update_cred(p->p_ucred, p->task);
+#endif
+
 	return (host_security_set_task_token(host_security_self(),
 					   p->task,
 					   sec_token,
@@ -1020,9 +1024,6 @@
 					   (sec_token.val[0]) ?
 						HOST_PRIV_NULL :
 						host_priv_self()) != KERN_SUCCESS);
-#ifdef MAC
-	mac_task_label_update_cred(p->p_ucred, p->task);
-#endif
 }