From owner-trustedbsd-cvs@FreeBSD.ORG  Tue Oct  3 11:24:01 2006
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 [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 98F3116A417
	for <trustedbsd-cvs@freebsd.org>; Tue,  3 Oct 2006 11:24:01 +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 0EF7243D46
	for <trustedbsd-cvs@freebsd.org>; Tue,  3 Oct 2006 11:24:01 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
	by cyrus.watson.org (Postfix) with ESMTP id 58A0646C44
	for <trustedbsd-cvs@trustedbsd.org>;
	Tue,  3 Oct 2006 07:24:00 -0400 (EDT)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id 4843356AFE;
	Tue,  3 Oct 2006 11:23:59 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3FB7316A40F; Tue,  3 Oct 2006 11:23:59 +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 13E2816A403
	for <perforce@freebsd.org>; Tue,  3 Oct 2006 11:23:59 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D1DB243D46
	for <perforce@freebsd.org>; Tue,  3 Oct 2006 11:23:58 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k93BNwJu072550
	for <perforce@freebsd.org>; Tue, 3 Oct 2006 11:23:58 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93BNwrJ072547
	for perforce@freebsd.org; Tue, 3 Oct 2006 11:23:58 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 3 Oct 2006 11:23:58 GMT
Message-Id: <200610031123.k93BNwrJ072547@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 107159 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: Tue, 03 Oct 2006 11:24:01 -0000

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

Change 107159 by rwatson@rwatson_peppercorn on 2006/10/03 11:23:49

	Update for priv(9) difference in RELENG_6, annotate oddness.

Affected files ...

.. //depot/projects/trustedbsd/priv6/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/priv6/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 (text+ko) ====

@@ -44,6 +44,7 @@
 #include <sys/sysctl.h>
 #include <sys/bus.h>
 #include <sys/malloc.h>
+#include <sys/priv.h>
 #include <sys/proc.h>
 
 #include <machine/stdarg.h>
@@ -198,8 +199,12 @@
 {
 	int error;
 
+	/*
+	 * XXXRW: Why is this required?  We should only get here if privilege
+	 * was granted for the sysctl call.
+	 */
 	if (enable) {
-		error = suser(curthread);
+		error = priv_check(curthread, PRIV_DRIVER);
 		if (error == 0) {
 			error = alq_open(&ath_hal_alq, ath_hal_logfile,
 				curthread->td_ucred, ALQ_DEFAULT_CMODE,