From owner-p4-projects@FreeBSD.ORG  Mon Jun 12 22:02:29 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 DDFD816A41A; Mon, 12 Jun 2006 22:02:28 +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 8A63C16A478
	for <perforce@freebsd.org>; Mon, 12 Jun 2006 22:02:28 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BD2CD43D48
	for <perforce@freebsd.org>; Mon, 12 Jun 2006 22:02:27 +0000 (GMT)
	(envelope-from jb@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 k5CM0BKi025517
	for <perforce@freebsd.org>; Mon, 12 Jun 2006 22:00:11 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CM0B4x025513
	for perforce@freebsd.org; Mon, 12 Jun 2006 22:00:11 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 12 Jun 2006 22:00:11 GMT
Message-Id: <200606122200.k5CM0B4x025513@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 99089 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: Mon, 12 Jun 2006 22:02:29 -0000

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

Change 99089 by jb@jb_freebsd2 on 2006/06/12 21:59:37

	Disable a couple of things which require a complete credentials
	implementation. These were preventing destructive actions.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_priv.c#4 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_priv.c#4 (text+ko) ====

@@ -127,21 +127,29 @@
 static int
 dtrace_priv_kernel(dtrace_state_t *state)
 {
+#if defined(sun)
 	if (state->dts_cred.dcr_action & DTRACE_CRA_KERNEL)
 		return (1);
 
 	cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_KPRIV;
 
 	return (0);
+#else
+	return (1);
+#endif
 }
 
 static int
 dtrace_priv_kernel_destructive(dtrace_state_t *state)
 {
+#if defined(sun)
 	if (state->dts_cred.dcr_action & DTRACE_CRA_KERNEL_DESTRUCTIVE)
 		return (1);
 
 	cpu_core[curcpu].cpuc_dtrace_flags |= CPU_DTRACE_KPRIV;
 
 	return (0);
+#else
+	return (1);
+#endif
 }