From owner-trustedbsd-cvs@FreeBSD.ORG  Sun Jan 21 22:44:23 2007
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0487716A402
	for <trustedbsd-cvs@freebsd.org>; Sun, 21 Jan 2007 22:44:23 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.freebsd.org (Postfix) with ESMTP id 71D6413C448
	for <trustedbsd-cvs@freebsd.org>; Sun, 21 Jan 2007 22:44:22 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53])
	by cyrus.watson.org (Postfix) with ESMTP id D61E047FFD
	for <trustedbsd-cvs@trustedbsd.org>;
	Sun, 21 Jan 2007 17:44:20 -0500 (EST)
Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54])
	by mx2.freebsd.org (Postfix) with ESMTP id 57358635E8;
	Sun, 21 Jan 2007 22:42:48 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4ED2016A403; Sun, 21 Jan 2007 22:42:48 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2D32A16A400
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 22:42:48 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 1C08C13C457
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 22:42:48 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LMgm78065746
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 22:42:48 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMgl8K065742
	for perforce@freebsd.org; Sun, 21 Jan 2007 22:42:47 GMT
	(envelope-from millert@freebsd.org)
Date: Sun, 21 Jan 2007 22:42:47 GMT
Message-Id: <200701212242.l0LMgl8K065742@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 113293 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Jan 2007 22:44:23 -0000

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

Change 113293 by millert@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
 }