From owner-p4-projects@FreeBSD.ORG  Tue Mar  7 16:49:11 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 0052716A423; Tue,  7 Mar 2006 16:49:10 +0000 (GMT)
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 CEAA016A420
	for <perforce@freebsd.org>; Tue,  7 Mar 2006 16:49:10 +0000 (GMT)
	(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 9860943D49
	for <perforce@freebsd.org>; Tue,  7 Mar 2006 16:49:10 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k27GnAbP013964
	for <perforce@freebsd.org>; Tue, 7 Mar 2006 16:49:10 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GnAL1013961
	for perforce@freebsd.org; Tue, 7 Mar 2006 16:49:10 GMT
	(envelope-from millert@freebsd.org)
Date: Tue, 7 Mar 2006 16:49:10 GMT
Message-Id: <200603071649.k27GnAL1013961@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 92922 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: Tue, 07 Mar 2006 16:49:11 -0000

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

Change 92922 by millert@millert_ibook on 2006/03/07 16:49:06

	Add proc_has_security() and proc_has_system() for systems without
	per-thread ucred (like Darwin).

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#34 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#34 (text+ko) ====

@@ -238,6 +238,20 @@
 
 	return (cred_has_security(td->td_proc->p_ucred, perm));
 }
+#else
+int
+proc_has_system(struct proc *p, access_vector_t perm)
+{
+
+	return (cred_has_system(p->p_ucred, perm));
+}
+
+int
+proc_has_security(struct proc *p, access_vector_t perm)
+{
+
+	return (cred_has_security(p->p_ucred, perm));
+}
 #endif
 
 static __inline security_class_t

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_sysctl.c#4 (text+ko) ====

@@ -121,19 +121,21 @@
 	if (error)
 		return (error);
 
-#if 0
 	if (req->newptr != NULL) {
 		error = SYSCTL_IN(req, &enforcing, sizeof(enforcing));
 		if (error)
 			return (error);
 
-		error = thread_has_system (curthread, SYSTEM__AVC_TOGGLE);
+#ifdef APPLE
+		error = proc_has_system(current_proc(), SECURITY__SETENFORCE);
+#else
+		error = thread_has_system(curthread, SECURITY__SETENFORCE);
+#endif
 		if (error)
 			return error;
 
 		selinux_enforcing = enforcing;
 	}
-#endif
 
 	return (0);
 }