From owner-trustedbsd-cvs@FreeBSD.ORG Tue Oct 3 11:22:59 2006 Return-Path: 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 6007716A55D for ; Tue, 3 Oct 2006 11:22:59 +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 CC5D743D4C for ; Tue, 3 Oct 2006 11:22:58 +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 1836846BEA for ; Tue, 3 Oct 2006 07:22:58 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7F3F755889; Tue, 3 Oct 2006 11:22:57 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 76E6C16A412; Tue, 3 Oct 2006 11:22:57 +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 36A9116A403 for ; Tue, 3 Oct 2006 11:22:57 +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 D474543D46 for ; Tue, 3 Oct 2006 11:22:56 +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 k93BMubj072308 for ; Tue, 3 Oct 2006 11:22:56 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 k93BMu9u072302 for perforce@freebsd.org; Tue, 3 Oct 2006 11:22:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 11:22:56 GMT Message-Id: <200610031122.k93BMu9u072302@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 To: Perforce Change Reviews Cc: Subject: PERFORCE change 107158 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Oct 2006 11:22:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=107158 Change 107158 by rwatson@rwatson_peppercorn on 2006/10/03 11:21:57 Approximately update priv6 altq for priv(9). Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_cbq.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_cdnr.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_hfsc.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_priq.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_red.c#3 edit .. //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_rio.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_cbq.c#3 (text+ko) ==== @@ -1062,7 +1062,7 @@ /* currently only command that an ordinary user can call */ break; default: -#if (__FreeBSD_version > 700000) +#if (__FreeBSD_version > 600000) error = priv_check(p, PRIV_ALTQ_MANAGE); #elsif (__FreeBSD_version > 400000) error = suser(p); ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_cdnr.c#3 (text+ko) ==== @@ -1262,7 +1262,7 @@ case CDNR_GETSTATS: break; default: -#if (__FreeBSD_versoin > 700000) +#if (__FreeBSD_versoin > 600000) if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) #elsif (__FreeBSD_version > 400000) if ((error = suser(p)) != 0) ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_hfsc.c#3 (text+ko) ==== @@ -1975,7 +1975,7 @@ case HFSC_GETSTATS: break; default: -#if (__FreeBSD_version > 700000) +#if (__FreeBSD_version > 600000) if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) return (error); #elsif (__FreeBSD_version > 400000) ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_priq.c#3 (text+ko) ==== @@ -772,7 +772,7 @@ case PRIQ_GETSTATS: break; default: -#if (__FreeBSD_version > 700000) +#if (__FreeBSD_version > 600000) if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) return (error); #elsif (__FreeBSD_version > 400000) ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_red.c#3 (text+ko) ==== @@ -781,7 +781,7 @@ case RED_GETSTATS: break; default: -#if (__FreeBSD_version > 700000) +#if (__FreeBSD_version > 600000) if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) #elsif (__FreeBSD_version > 400000) if ((error = suser(p)) != 0) ==== //depot/projects/trustedbsd/priv6/src/sys/contrib/altq/altq/altq_rio.c#3 (text+ko) ==== @@ -531,7 +531,7 @@ case RIO_GETSTATS: break; default: -#if (__FreeBSD_versoin > 700000) +#if (__FreeBSD_versoin > 600000) if ((error = priv_check(p, PRIV_ALTQ_MANAGE)) != 0) return (error); #elsif (__FreeBSD_version > 400000)