From owner-p4-projects@FreeBSD.ORG  Thu Sep  7 15:17:32 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 6C14016A4E7; Thu,  7 Sep 2006 15:17:32 +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 2C9BA16A4E6
	for <perforce@freebsd.org>; Thu,  7 Sep 2006 15:17:32 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9EAB643D5F
	for <perforce@freebsd.org>; Thu,  7 Sep 2006 15:17:31 +0000 (GMT)
	(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 k87FHV6r024426
	for <perforce@freebsd.org>; Thu, 7 Sep 2006 15:17:31 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87FHVQn024423
	for perforce@freebsd.org; Thu, 7 Sep 2006 15:17:31 GMT
	(envelope-from millert@freebsd.org)
Date: Thu, 7 Sep 2006 15:17:31 GMT
Message-Id: <200609071517.k87FHVQn024423@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 105797 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: Thu, 07 Sep 2006 15:17:32 -0000

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

Change 105797 by millert@millert_g5tower on 2006/09/07 15:17:14

	o Conditionalize FreeBSD bits.
	o Use kauth_cred_dup_add().
	o Fix fallback conditionals.
	o Export sbuf_len, _kauth_cred_dup and _kauth_cred_dup_add.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#3 edit
.. //depot/projects/trustedbsd/sedarwin8/policies/console/mac_console.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#3 (text+ko) ====

@@ -17,6 +17,7 @@
 _sbuf_printf
 _sbuf_putc
 _sbuf_vprintf
+_sbuf_len
 _strsep
 
 _IS_64BIT_PROCESS
@@ -24,6 +25,9 @@
 _VNOP_SETXATTR
 _VNOP_GETXATTR
 
+_kauth_cred_dup
+_kauth_cred_dup_add
+
 _mac_kalloc
 _mac_kfree
 _mac_wire

==== //depot/projects/trustedbsd/sedarwin8/policies/console/mac_console.c#4 (text+ko) ====

@@ -369,11 +369,9 @@
 	struct mac_console *mc;
 	int error;
 
+#if defined(__FreeBSD__)
 	if (strcmp(MAC_CONSOLE_LABEL_NAME, element_name) != 0)
-#if defined(__FreeBSD__)
 		return (0);
-#elif defined(__APPLE__)
-		return (EINVAL);
 #endif
 
 	mc = SLOT(label);
@@ -414,11 +412,9 @@
 	struct mac_console *mc;
 	int error;
 
+#if defined(__FreeBSD__)
 	if (strcmp(MAC_CONSOLE_LABEL_NAME, element_name) != 0)
-#if defined(__FreeBSD__)
 		return (0);
-#elif defined(__APPLE__)
-		return (EINVAL);
 #endif
 
 	mc = SLOT(label);
@@ -457,11 +453,9 @@
 {
 	struct mac_console *mc;
 
+#if defined(__FreeBSD__)
 	if (strcmp(MAC_CONSOLE_LABEL_NAME, element_name) != 0)
-#if defined(__FreeBSD__)
 		return (0);
-#elif defined(__APPLE__)
-		return (EINVAL);
 #endif
 
 	mc = SLOT(label);
@@ -506,7 +500,7 @@
 	crfree(oldcred);
 #elif defined (__APPLE__)
 	oldcred = proc_ucred(p);
-	newcred = kauth_cred_dup(oldcred);
+	newcred = kauth_cred_dup_add(oldcred);
 	p->p_ucred = newcred;
 	kauth_cred_rele(oldcred);
 #endif
@@ -583,7 +577,7 @@
 #endif
 
 	/* Fall back to the fslabel. */
-	if (error == ENOATTR || error == EOPNOTSUPP || blen == 0) {
+	if (error == ENOATTR || error == ENOTSUP || error == EPERM || blen == 0) {
 		/* Fall back to the fslabel. */
 		mac_console_copy_label(fslabel, vlabel);
 		return (0);