From owner-p4-projects@FreeBSD.ORG Tue Oct 3 08:30:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39C4B16A494; Tue, 3 Oct 2006 08:30:12 +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 106E616A47C for ; Tue, 3 Oct 2006 08:30:11 +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 AB8B243D55 for ; Tue, 3 Oct 2006 08:30:11 +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 k938UBXS033334 for ; Tue, 3 Oct 2006 08:30:11 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 k938UBsi033331 for perforce@freebsd.org; Tue, 3 Oct 2006 08:30:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Oct 2006 08:30:11 GMT Message-Id: <200610030830.k938UBsi033331@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 107149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Oct 2006 08:30:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=107149 Change 107149 by rwatson@rwatson_peppercorn on 2006/10/03 08:29:45 Not very correct version ifdef'ing for priv(9) in 6.x. Affected files ... .. //depot/projects/trustedbsd/priv6/src/sys/dev/ce/if_ce.c#3 edit Differences ... ==== //depot/projects/trustedbsd/priv6/src/sys/dev/ce/if_ce.c#3 (text) ==== @@ -1342,7 +1342,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1383,7 +1383,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1413,7 +1413,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1433,7 +1433,7 @@ CE_DEBUG2 (d, ("ioctl: setcfg\n")); #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1535,7 +1535,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1571,7 +1571,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1599,7 +1599,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1623,7 +1623,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1651,7 +1651,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1677,7 +1677,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1707,7 +1707,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1731,7 +1731,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1759,7 +1759,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1785,7 +1785,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1813,7 +1813,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1841,7 +1841,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1869,7 +1869,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1902,7 +1902,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1929,7 +1929,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1948,7 +1948,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER); @@ -1986,7 +1986,7 @@ /* Only for superuser! */ #if __FreeBSD_version < 500000 error = suser (p); -#elsif __FreeBSD_version < 700000 +#elsif __FreeBSD_version < 600000 error = suser (td); #else error = priv_check (td, PRIV_DRIVER);