From owner-p4-projects@FreeBSD.ORG Sun Oct 2 17:05:04 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF9991065675; Sun, 2 Oct 2011 17:05:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0B711065673 for ; Sun, 2 Oct 2011 17:05:03 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 9711C8FC08 for ; Sun, 2 Oct 2011 17:05:03 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p92H53h9086344 for ; Sun, 2 Oct 2011 17:05:03 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p92H53Zk086341 for perforce@freebsd.org; Sun, 2 Oct 2011 17:05:03 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 2 Oct 2011 17:05:03 GMT Message-Id: <201110021705.p92H53Zk086341@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199617 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 17:05:04 -0000 http://p4web.freebsd.org/@@199617?ac=10 Change 199617 by rene@rene_acer on 2011/10/02 17:04:32 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#106 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#31 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#28 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#45 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#106 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -3377,12 +3377,14 @@ channel-group 1 mode active channel-protocol lacp - On the &os; machine create the &man.lagg.4; interface using - fxp0 and - fxp1, with an IP Address of + Create the &man.lagg.4; interface using + fxp0 and fxp1, + and bring the interfaces up with the IP Address of 10.0.0.3/24: - &prompt.root; ifconfig lagg0 create + &prompt.root; ifconfig fxp0 up +&prompt.root; ifconfig fxp1 up +&prompt.root; ifconfig lagg0 create &prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 10.0.0.3/24 View the interface status by running: @@ -3437,14 +3439,15 @@ Failover mode Failover mode can be used to switch over to a secondary interface if - the link is lost on the master interface. Create and configure the - lagg0 interface, with + the link is lost on the master interface. Bring the underlying + physical interfaces up. Create the &man.lagg.4; interface, using fxp0 as the master interface and - fxp1 as the secondary interface, - with an IP Address of 10.0.0.15/24: - + fxp1 as the secondary interface and assign + an IP Address of 10.0.0.15/24: - &prompt.root; ifconfig lagg0 create + &prompt.root; ifconfig fxp0 up +&prompt.root; ifconfig fxp1 up +&prompt.root; ifconfig lagg0 create &prompt.root; ifconfig lagg0 up laggproto failover laggport fxp0 laggport fxp1 10.0.0.15/24 The interface will look something like this, the major @@ -3523,11 +3526,13 @@ &prompt.root; ifconfig wlan0 create wlandev iwn0 ssid my_router up - Create the &man.lagg.4; interface with bge0 + Bring the bge0 interface up. Create + the &man.lagg.4; interface with bge0 as master, and failover to wlan0 if necessary: - &prompt.root; ifconfig lagg0 create + &prompt.root; ifconfig bge0 up +&prompt.root; ifconfig lagg0 create &prompt.root; ifconfig lagg0 up laggproto failover laggport bge0 laggport wlan0 The interface will look something like this, the major ==== //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#28 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -52,9 +52,11 @@ des Norway - Mac Mini with 1 GB RAM, no peripherals - Tinderbox. - 2005/05/19 + 1 GB memory sticks: 184-pin DDR SDRAM, ECC + REG, + PC2100 CL 2.5. Up to 20 (two each for 10 scavenged 1U + servers). + Test cluster. + 2011/10/02 ==== //depot/projects/docproj_nl/www/en/releng/index.sgml#45 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -87,14 +87,30 @@ HEAD - Frozen + Slush committers + Active development branch for 10-CURRENT. Avoid major + changes before 9.0-RELEASE. + - Active development branch for 9-CURRENT and now in a + + RELENG_9 + Frozen + &contact.re; + Development branch for FreeBSD 9-STABLE, and now in a preparation stage for 9.0-RELEASE. All commits to this branch requires RE's approval. + + RELENG_8 Open From owner-p4-projects@FreeBSD.ORG Sun Oct 2 17:09:28 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE14C1065675; Sun, 2 Oct 2011 17:09:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B08981065673 for ; Sun, 2 Oct 2011 17:09:27 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 855308FC08 for ; Sun, 2 Oct 2011 17:09:27 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p92H9R6t086471 for ; Sun, 2 Oct 2011 17:09:27 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p92H9RrP086468 for perforce@freebsd.org; Sun, 2 Oct 2011 17:09:27 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 2 Oct 2011 17:09:27 GMT Message-Id: <201110021709.p92H9RrP086468@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199618 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 17:09:28 -0000 http://p4web.freebsd.org/@@199618?ac=10 Change 199618 by rene@rene_acer on 2011/10/02 17:08:55 MFen articles/contributing-ports 1.6 -> 1.7 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#14 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#14 (text+ko) ==== @@ -1,7 +1,8 @@ Iedereen kan erin betrokken raken, en er zijn vele manieren om dat te doen. Bijdragen aan ports is een uitstekende manier om te - helpen om iets aan het project "terug te geven". Of u nu op zoek - bent naar een blijvende rol, of naar een uitdaging voor een + helpen om iets aan het project terug te geven. Of u nu op + zoek bent naar een blijvende rol, of naar een uitdaging voor een regenachtige dag, wij stellen uw hulp zeer op prijs! Als een vrijwilliger kunt u doen en laten wat u wilt. We @@ -413,8 +414,8 @@ Wacht Op een gegeven moment zal een committer uw PR - behandelen. Dit kan minuten, maar ook weken duren - dus - ben alstublieft geduldig. + behandelen. Dit kan minuten, maar ook weken duren — ben + dus alstublieft geduldig. @@ -635,7 +636,7 @@ - Informatie over hun bouw- en uitvoeromgeving - + Informatie over hun bouw- en uitvoeromgeving — bijvoorbeeld een lijst van geïnstalleerde pakketten en de uitvoer van &man.env.1; From owner-p4-projects@FreeBSD.ORG Sun Oct 2 17:12:46 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10D6F1065672; Sun, 2 Oct 2011 17:12:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7484106564A for ; Sun, 2 Oct 2011 17:12:45 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B580F8FC08 for ; Sun, 2 Oct 2011 17:12:45 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p92HCjvP088173 for ; Sun, 2 Oct 2011 17:12:45 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p92HCjH5088170 for perforce@freebsd.org; Sun, 2 Oct 2011 17:12:45 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 2 Oct 2011 17:12:45 GMT Message-Id: <201110021712.p92HCjH5088170@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199619 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 17:12:46 -0000 http://p4web.freebsd.org/@@199619?ac=10 Change 199619 by rene@rene_acer on 2011/10/02 17:12:33 MFen mailing-lists.ent 1.83 -> 1.84 Add myself as translator. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#35 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#35 (text+ko) ==== @@ -2,10 +2,10 @@ Namen van FreeBSD mailinglijsten en gerelateerde software. $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.28 2011/09/27 20:23:17 rene Exp $ - Vertaald door: Siebrand Mazeland + Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/share/sgml/mailing-lists.ent - %SRCID% 1.83 + %SRCID% 1.84 --> @@ -451,6 +451,10 @@ SVN-commitberichten voor alleen de 8-stable-src-structuur"> svn-src-stable-8"> + +SVN-commitberichten voor alleen de 9-stable-src-structuur"> +svn-src-stable-9"> + SVN-commitberichten van de oude stable-src-structuren"> svn-src-stable-other"> From owner-p4-projects@FreeBSD.ORG Sun Oct 2 17:16:02 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6837E106566C; Sun, 2 Oct 2011 17:16:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A33A1065672 for ; Sun, 2 Oct 2011 17:16:02 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 186F38FC1B for ; Sun, 2 Oct 2011 17:16:02 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p92HG1he089174 for ; Sun, 2 Oct 2011 17:16:01 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p92HG1pJ089171 for perforce@freebsd.org; Sun, 2 Oct 2011 17:16:01 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 2 Oct 2011 17:16:01 GMT Message-Id: <201110021716.p92HG1pJ089171@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199620 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Oct 2011 17:16:02 -0000 http://p4web.freebsd.org/@@199620?ac=10 Change 199620 by rene@rene_acer on 2011/10/02 17:15:53 [www] MFen where.sgml 1.118 -> 1.121 Affected files ... .. //depot/projects/docproj_nl/www/nl/where.sgml#31 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/where.sgml#31 (text+ko) ==== @@ -6,7 +6,7 @@ ]> &header; @@ -188,8 +188,8 @@ ia64 - [Distributie] - [ISO] + [Distributie] + [ISO] From owner-p4-projects@FreeBSD.ORG Wed Oct 5 23:34:25 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 614E01065670; Wed, 5 Oct 2011 23:34:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23F9E106566B for ; Wed, 5 Oct 2011 23:34:25 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id EC4F38FC0C for ; Wed, 5 Oct 2011 23:34:24 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p95NYOWn036521 for ; Wed, 5 Oct 2011 23:34:24 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p95NYOgI036518 for perforce@freebsd.org; Wed, 5 Oct 2011 23:34:24 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 5 Oct 2011 23:34:24 GMT Message-Id: <201110052334.p95NYOgI036518@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199778 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 23:34:25 -0000 http://p4web.freebsd.org/@@199778?ac=10 Change 199778 by rene@rene_acer on 2011/10/05 23:34:09 Partial update of advanced-networking Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#56 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#56 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.28 2011/03/19 16:44:56 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml - %SRCID% 1.436 + %SRCID% 1.438 --> @@ -49,6 +49,11 @@ + Hoe opstarten met netwerk-PXE en een NFS-root-bestandssysteem te + installeren. + + + Hoe Network Address Translation te installeren. @@ -3537,8 +3542,10 @@ Wanneer de meesterpoort niet beschikbaar is, wordt de volgende actieve poort gebruikt. De eerste toegevoegde interface is de meesterpoort; alle interfaces die hierna - zijn toegevoegd worden gebruikt als failover-apparaten. - + zijn toegevoegd worden gebruikt als failover-apparaten. Als + failover naar een niet-meesterpoort plaatsvindt, dan wordt de + originele poort de meester wanneer deze weer beschikbaar + wordt. @@ -3644,14 +3651,15 @@ Maak op de &os;-machine de &man.lagg.4;-interface aan door fxp0 en - fxp1 te gebruiken: + fxp1 met IP-adres + 10.0.0.3/24 te gebruiken: - &prompt.root; ifconfig lagg0 create -&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 + &prompt.root; ifconfig lagg0 create +&prompt.root; ifconfig lagg0 up laggproto lacp laggport fxp0 laggport fxp1 10.0.0.3/24 Bekijk de interfacestatus van ifconfig: - &prompt.root; ifconfig lagg0 + &prompt.root; ifconfig lagg0 Poorten die als ACTIVE zijn gemarkeerd zijn lid van de actieve aggregatiegroep waarover From owner-p4-projects@FreeBSD.ORG Wed Oct 5 23:40:53 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC1CF1065670; Wed, 5 Oct 2011 23:40:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DE75106564A for ; Wed, 5 Oct 2011 23:40:52 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7A81A8FC12 for ; Wed, 5 Oct 2011 23:40:52 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p95Neq7h037643 for ; Wed, 5 Oct 2011 23:40:52 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p95NepIK037631 for perforce@freebsd.org; Wed, 5 Oct 2011 23:40:51 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 5 Oct 2011 23:40:51 GMT Message-Id: <201110052340.p95NepIK037631@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199780 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2011 23:40:53 -0000 http://p4web.freebsd.org/@@199780?ac=10 Change 199780 by rene@rene_acer on 2011/10/05 23:40:13 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#107 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#41 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#27 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#27 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#26 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#15 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#36 integrate .. //depot/projects/docproj_nl/share/pgpkeys/jilles.key#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/rakuco.key#2 integrate .. //depot/projects/docproj_nl/www/en/search/search.sgml#11 integrate .. //depot/projects/docproj_nl/www/nl/where.sgml#32 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#107 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -181,7 +181,7 @@ &prompt.root; pkg_add -r firefox - This will install Firefox 6.0, + This will install Firefox 7.0, if you want to run Firefox 3.6, use instead: ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#27 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -550,6 +550,11 @@ &a.xen.name; Discussion of the &os; port to &xen; — implementation and usage + + + &a.xfce.name; + XFCE for &os; — porting and maintaining + @@ -1778,6 +1783,22 @@ administrative deployment issues. + + + &a.xfce.name; + + + XFCE + + This is a forum for discussions related to bring the + XFCE environment to &os;. This + is a technical mailing list. It is for individuals actively + working on porting XFCE to &os;, + to bring up problems or discuss alternative solutions. + Individuals interested in following the technical discussion + are also welcome. + + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#26 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -536,6 +536,10 @@ FreeBSD port to Xen mailing list"> freebsd-xen"> + +XFCE for FreeBSD mailing list"> +freebsd-xfce"> + bug-followup@FreeBSD.org"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#15 (text+ko) ==== @@ -1,5 +1,5 @@ + uid Jilles Tjoelker uid Jilles Tjoelker (FreeBSD) -sub 2048g/B94834AC 2001-02-18 +sub 4096R/14CB5775 2011-07-02 ]]> ==== //depot/projects/docproj_nl/share/pgpkeys/rakuco.key#2 (text+ko) ==== @@ -1,55 +1,51 @@ - + -uid Raphael Kubo da Costa -sub 4096g/F03F08AA 2009-07-04 +pub 4096R/18DCEED6 2011-10-03 + Key fingerprint = 6911 54FE BA6E 6106 5789 7099 8DD0 7D21 18DC EED6 +uid Raphael Kubo da Costa (Personal key) ]]> ==== //depot/projects/docproj_nl/www/en/search/search.sgml#11 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -661,6 +661,12 @@ value="freebsd-x11"> X11 Maintenance and support of X11 on FreeBSD + + + XFCE + XFCE for FreeBSD — porting and maintaining +

Limited lists

==== //depot/projects/docproj_nl/www/nl/where.sgml#32 (text+ko) ==== @@ -1,5 +1,5 @@ + From owner-p4-projects@FreeBSD.ORG Thu Oct 6 00:01:41 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FCAD1065677; Thu, 6 Oct 2011 00:01:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29B031065672 for ; Thu, 6 Oct 2011 00:01:41 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 178198FC1E for ; Thu, 6 Oct 2011 00:01:41 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p9601eu8040643 for ; Thu, 6 Oct 2011 00:01:40 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9601eHp040639 for perforce@freebsd.org; Thu, 6 Oct 2011 00:01:40 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 6 Oct 2011 00:01:40 GMT Message-Id: <201110060001.p9601eHp040639@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199781 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2011 00:01:41 -0000 http://p4web.freebsd.org/@@199781?ac=10 Change 199781 by rene@rene_acer on 2011/10/06 00:01:37 MFen: handbook/desktop 1.114 -> 1.115 handbook/eresources 1.211 -> 1.213 (add myself as translator) mailing-lists.ent 1.84 -> 1.85 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#42 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#43 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#37 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#42 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.33 2011/09/07 21:06:51 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml - %SRCID% 1.114 + %SRCID% 1.115 --> @@ -207,7 +207,7 @@ &prompt.root; pkg_add -r firefox - Dit zal Firefox 6.0 installeren, + Dit zal Firefox 7.0 installeren, als u in plaats hiervan Firefox 3.6 wilt draaien, gebruik dan: ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#43 (text+ko) ==== @@ -2,10 +2,10 @@ The FreeBSD Dutch Documentation Project $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.31 2011/09/07 21:06:51 rene Exp $ - Vertaald door: Siebrand Mazeland + Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml - %SRCID% 1.211 + %SRCID% 1.213 --> @@ -662,9 +662,16 @@ &a.xen.name; - Discussies over het porteren van &os; naar &xen; + Discussies over het overbrengen van &os; naar &xen; — implementatie en gebruik + + + &a.xfce.name; + + Overbrengen en onderhouden van + XFCE voor &os; + @@ -888,6 +895,16 @@ + &a.svn-src-stable-9.name; + + /usr/src + + Alle veranderingen aan de + stable/9-tak van het + src-Subversion-repository + + + &a.svn-src-stable-other.name; /usr/src @@ -1998,6 +2015,22 @@ bedoeld is. + + + &a.xfce.name; + + + XFCE + + Dit is een forum voor discussies gerelateerd aan de + XFCE-omgeving voor &os;. Dit is een + technische mailinglijst. Het is bedoeld voor degenen die actief + werken aan het porten van XFCE naar + &os;, om problemen naar voren te brengen of alternatieve + oplossingen te bespreken. Personen die geïnteresseerd zijn + in het volgen van de technische discussie zijn ook welkom. + + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#37 (text+ko) ==== @@ -5,7 +5,7 @@ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/share/sgml/mailing-lists.ent - %SRCID% 1.84 + %SRCID% 1.85 --> @@ -539,6 +539,10 @@ &os; port naar Xen mailinglijst"> freebsd-xen"> + +XFCE voor &os; mailinglijst"> +freebsd-xfce"> + bug-followup@FreeBSD.org"> From owner-p4-projects@FreeBSD.ORG Fri Oct 7 22:08:46 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76E671065674; Fri, 7 Oct 2011 22:08:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3819F106566C for ; Fri, 7 Oct 2011 22:08:46 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2576F8FC0A for ; Fri, 7 Oct 2011 22:08:46 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p97M8kMw097273 for ; Fri, 7 Oct 2011 22:08:46 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p97M8kfB097270 for perforce@freebsd.org; Fri, 7 Oct 2011 22:08:46 GMT (envelope-from pjd@freebsd.org) Date: Fri, 7 Oct 2011 22:08:46 GMT Message-Id: <201110072208.p97M8kfB097270@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199871 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 22:08:46 -0000 http://p4web.freebsd.org/@@199871?ac=10 Change 199871 by pjd@pjd_anger on 2011/10/07 22:07:54 White-space cleanups. Affected files ... .. //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#14 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#13 $ + * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#14 $ */ #include @@ -106,22 +106,22 @@ static int auditd_hostlen = -1; static char *auditd_errmsg[] = { - "no error", /* ADE_NOERR ( 0) */ - "could not parse audit_control(5) file", /* ADE_PARSE ( 1) */ - "auditon(2) failed", /* ADE_AUDITON ( 2) */ - "malloc(3) failed", /* ADE_NOMEM ( 3) */ - "all audit log directories over soft limit", /* ADE_SOFTLIM ( 4) */ - "all audit log directories over hard limit", /* ADE_HARDLIM ( 5) */ - "could not create file name string", /* ADE_STRERR ( 6) */ - "could not open audit record", /* ADE_AU_OPEN ( 7) */ - "could not close audit record", /* ADE_AU_CLOSE ( 8) */ - "could not set active audit session state", /* ADE_SETAUDIT ( 9) */ - "auditctl(2) failed (trail still swapped)", /* ADE_ACTL (10) */ - "auditctl(2) failed (trail not swapped)", /* ADE_ACTLERR (11) */ - "could not swap audit trail file", /* ADE_SWAPERR (12) */ + "no error", /* ADE_NOERR ( 0) */ + "could not parse audit_control(5) file", /* ADE_PARSE ( 1) */ + "auditon(2) failed", /* ADE_AUDITON ( 2) */ + "malloc(3) failed", /* ADE_NOMEM ( 3) */ + "all audit log directories over soft limit", /* ADE_SOFTLIM ( 4) */ + "all audit log directories over hard limit", /* ADE_HARDLIM ( 5) */ + "could not create file name string", /* ADE_STRERR ( 6) */ + "could not open audit record", /* ADE_AU_OPEN ( 7) */ + "could not close audit record", /* ADE_AU_CLOSE ( 8) */ + "could not set active audit session state", /* ADE_SETAUDIT ( 9) */ + "auditctl(2) failed (trail still swapped)", /* ADE_ACTL (10) */ + "auditctl(2) failed (trail not swapped)", /* ADE_ACTLERR (11) */ + "could not swap audit trail file", /* ADE_SWAPERR (12) */ "could not rename crash recovery file", /* ADE_RENAME (13) */ "could not read 'current' link file", /* ADE_READLINK (14) */ - "could not create 'current' link file", /* ADE_SYMLINK (15) */ + "could not create 'current' link file", /* ADE_SYMLINK (15) */ "invalid argument", /* ADE_INVAL (16) */ "could not resolve hostname to address", /* ADE_GETADDR (17) */ "address family not supported", /* ADE_ADDRFAM (18) */ @@ -144,19 +144,19 @@ if (idx < 0 || idx > (int)MAXERRCODE) return ("Invalid auditd error code"); - + return (auditd_errmsg[idx]); } /* - * Free our local list of directory names and init list + * Free our local list of directory names and init list. */ static void free_dir_q(void) { struct dir_ent *d1, *d2; - + d1 = TAILQ_FIRST(&dir_q); while (d1 != NULL) { d2 = TAILQ_NEXT(d1, dirs); @@ -203,11 +203,11 @@ insert_orderly(struct dir_ent *denew) { struct dir_ent *dep; - + TAILQ_FOREACH(dep, &dir_q, dirs) { if (dep->softlim == 1 && denew->softlim == 0) { TAILQ_INSERT_BEFORE(dep, denew, dirs); - return; + return; } if (dep->hardlim == 1 && denew->hardlim == 0) { TAILQ_INSERT_BEFORE(dep, denew, dirs); @@ -223,8 +223,8 @@ * ADE_NOERR on success. * ADE_PARSE error parsing audit_control(5). * ADE_AUDITON error getting/setting auditon(2) value. - * ADE_GETADDR error getting address info for host. - * ADE_ADDRFAM un-supported address family. + * ADE_GETADDR error getting address info for host. + * ADE_ADDRFAM un-supported address family. */ int auditd_set_host(void) @@ -236,8 +236,8 @@ int error, ret = ADE_NOERR; if (getachost(auditd_host, sizeof(auditd_host)) != 0) { - ret = ADE_PARSE; - + ret = ADE_PARSE; + /* * To maintain reverse compatability with older audit_control * files, simply drop a warning if the host parameter has not @@ -283,11 +283,11 @@ return (ret); } -/* +/* * Get the min percentage of free blocks from audit_control(5) and that * value in the kernel. Return: * ADE_NOERR on success, - * ADE_PARSE error parsing audit_control(5), + * ADE_PARSE error parsing audit_control(5), * ADE_AUDITON error getting/setting auditon(2) value. */ int @@ -297,7 +297,7 @@ if (getacmin(&auditd_minval) != 0) return (ADE_PARSE); - + if (audit_get_qctrl(&qctrl, sizeof(qctrl)) != 0) return (ADE_AUDITON); @@ -340,7 +340,7 @@ if (tm.tm_sec < 0 || tm.tm_sec > 60) return (1); - /* minutes (0-59) */ + /* minutes (0-59) */ *p = '\0'; p -= 2; tm.tm_min = atol(p); if (tm.tm_min < 0 || tm.tm_min > 59) @@ -377,10 +377,10 @@ /* * Remove audit trails files according to the expiration conditions. Returns: - * ADE_NOERR on success or there is nothing to do. - * ADE_PARSE if error parsing audit_control(5). - * ADE_NOMEM if could not allocate memory. - * ADE_EXPIRE if there was an unespected error. + * ADE_NOERR on success or there is nothing to do. + * ADE_PARSE if error parsing audit_control(5). + * ADE_NOMEM if could not allocate memory. + * ADE_EXPIRE if there was an unespected error. */ int auditd_expire_trails(int (*warn_expired)(char *)) @@ -410,7 +410,7 @@ */ activefn[0] = '\0'; readlink(AUDIT_CURRENT_LINK, activefn, MAXPATHLEN - 1); - if ((afnp = strrchr(activefn, '/')) != NULL) + if ((afnp = strrchr(activefn, '/')) != NULL) afnp++; @@ -431,7 +431,7 @@ */ if (dp->d_namlen < (FILENAME_LEN - 1) || #ifdef DT_REG - dp->d_type != DT_REG || + dp->d_type != DT_REG || #endif dp->d_name[POSTFIX_LEN] != '.') continue; @@ -481,9 +481,9 @@ struct timeval tv[2]; tstamp = stbuf.st_mtime = current_time; - TIMESPEC_TO_TIMEVAL(&tv[0], + TIMESPEC_TO_TIMEVAL(&tv[0], &stbuf.st_atimespec); - TIMESPEC_TO_TIMEVAL(&tv[1], + TIMESPEC_TO_TIMEVAL(&tv[1], &stbuf.st_mtimespec); utimes(pn, tv); } @@ -524,7 +524,7 @@ oldest_time = current_time - expire_age; - /* + /* * Expire trail files, oldest (mtime) first, if the given * conditions are met. */ @@ -610,7 +610,7 @@ 1 : 0; hard = (sfs.f_bfree < AUDIT_HARD_LIMIT_FREE_BLOCKS) ? 1 : 0; if (soft) { - if (warn_soft) + if (warn_soft) (*warn_soft)(cur_dir); scnt++; } @@ -623,7 +623,7 @@ if (dirent == NULL) return (ADE_NOMEM); dirent->softlim = soft; - dirent->hardlim = hard; + dirent->hardlim = hard; dirent->dirname = (char *) malloc(MAXNAMLEN); if (dirent->dirname == NULL) { free(dirent); @@ -653,8 +653,8 @@ /* * Process the audit event file, obtaining a class mapping for each event, and * set that mapping into the kernel. Return: - * n number of event mappings that were successfully processed, - * ADE_NOMEM if there was an error allocating memory. + * n number of event mappings that were successfully processed, + * ADE_NOMEM if there was an error allocating memory. */ int auditd_set_evcmap(void) @@ -663,7 +663,7 @@ au_evclass_map_t evc_map; int ctr = 0; - + /* * XXX There's a risk here that the BSM library will return NULL * for an event when it can't properly map it to a class. In that @@ -677,7 +677,7 @@ free(ev.ae_name); return (ADE_NOMEM); } - + /* * XXXRW: Currently we have no way to remove mappings from the kernel * when they are removed from the file-based mappings. @@ -699,7 +699,7 @@ /* * Get the non-attributable event string and set the kernel mask. Return: - * ADE_NOERR on success, + * ADE_NOERR on success, * ADE_PARSE error parsing audit_control(5), * ADE_AUDITON error setting the mask using auditon(2). */ @@ -708,9 +708,9 @@ { au_mask_t aumask; char naeventstr[NA_EVENT_STR_SIZE]; - - if ((getacna(naeventstr, NA_EVENT_STR_SIZE) != 0) || - (getauditflagsbin(naeventstr, &aumask) != 0)) + + if ((getacna(naeventstr, NA_EVENT_STR_SIZE) != 0) || + (getauditflagsbin(naeventstr, &aumask) != 0)) return (ADE_PARSE); if (audit_set_kmask(&aumask, sizeof(aumask)) != 0) @@ -724,7 +724,7 @@ * implement the policy. However, if one isn't defined or if there is an error * parsing the control file, set AUDIT_CNT to avoid leaving the system in a * fragile state. Return: - * ADE_NOERR on success, + * ADE_NOERR on success, * ADE_PARSE error parsing audit_control(5), * ADE_AUDITON error setting policy using auditon(2). */ @@ -734,7 +734,7 @@ int policy; char polstr[POL_STR_SIZE]; - if ((getacpol(polstr, POL_STR_SIZE) != 0) || + if ((getacpol(polstr, POL_STR_SIZE) != 0) || (au_strtopol(polstr, &policy) != 0)) { policy = AUDIT_CNT; if (audit_set_policy(&policy) != 0) @@ -748,9 +748,9 @@ return (ADE_NOERR); } -/* +/* * Set trail rotation size. Return: - * ADE_NOERR on success, + * ADE_NOERR on success, * ADE_PARSE error parsing audit_control(5), * ADE_AUDITON error setting file size using auditon(2). */ @@ -782,7 +782,7 @@ open_trail(char *fname, gid_t gid) { int error, fd; - + fd = open(fname, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP); if (fd < 0) return (-1); @@ -799,18 +799,18 @@ /* * Create the new audit trail file, swap with existing audit file. Arguments * include timestamp for the filename, a pointer to a string for returning the - * new file name, GID for trail file, and audit_warn function pointer for + * new file name, GID for trail file, and audit_warn function pointer for * 'getacdir()' errors. Returns: - * ADE_NOERR on success, - * ADE_STRERR if the file name string could not be created, - * ADE_SWAPERR if the audit trail file could not be swapped, - * ADE_ACTL if the auditctl(2) call failed but file swap still + * ADE_NOERR on success, + * ADE_STRERR if the file name string could not be created, + * ADE_SWAPERR if the audit trail file could not be swapped, + * ADE_ACTL if the auditctl(2) call failed but file swap still * successful. * ADE_ACTLERR if the auditctl(2) call failed and file swap failed. * ADE_SYMLINK if symlink(2) failed updating the current link. */ int -auditd_swap_trail(char *TS, char **newfile, gid_t gid, +auditd_swap_trail(char *TS, char **newfile, gid_t gid, int (*warn_getacdir)(char *)) { char timestr[FILENAME_LEN]; @@ -819,16 +819,16 @@ int fd; int error; int saverrno = 0; - + if (strlen(TS) != (TIMESTAMP_LEN - 1) || snprintf(timestr, FILENAME_LEN, "%s.%s", TS, NOT_TERMINATED) < 0) { errno = EINVAL; return (ADE_STRERR); } - + /* Try until we succeed. */ TAILQ_FOREACH(dirent, &dir_q, dirs) { - if (dirent->hardlim) + if (dirent->hardlim) continue; if ((fn = affixdir(timestr, dirent)) == NULL) return (ADE_STRERR); @@ -841,8 +841,8 @@ if (fd >= 0) { error = auditctl(fn); if (error) { - /* - * auditctl failed setting log file. + /* + * auditctl failed setting log file. * Try again. */ saverrno = errno; @@ -856,7 +856,7 @@ if (saverrno) { /* * auditctl() failed but still - * successful. Return errno and "soft" + * successful. Return errno and "soft" * error. */ errno = saverrno; @@ -890,11 +890,11 @@ { auditinfo_addr_t aia; - /* + /* * To prevent event feedback cycles and avoid audit becoming stalled if * auditing is suspended we mask this processes events from being * audited. We allow the uid, tid, and mask fields to be implicitly - * set to zero, but do set the audit session ID to the PID. + * set to zero, but do set the audit session ID to the PID. * * XXXRW: Is there more to it than this? */ @@ -902,7 +902,7 @@ aia.ai_asid = AU_ASSIGN_ASID; aia.ai_termid.at_type = AU_IPv4; if (setaudit_addr(&aia, sizeof(aia)) != 0) - return (ADE_SETAUDIT); + return (ADE_SETAUDIT); return (ADE_NOERR); } #else @@ -911,21 +911,21 @@ { auditinfo_t ai; - /* + /* * To prevent event feedback cycles and avoid audit becoming stalled if * auditing is suspended we mask this processes events from being * audited. We allow the uid, tid, and mask fields to be implicitly - * set to zero, but do set the audit session ID to the PID. + * set to zero, but do set the audit session ID to the PID. * * XXXRW: Is there more to it than this? */ bzero(&ai, sizeof(ai)); ai.ai_asid = getpid(); if (setaudit(&ai) != 0) - return (ADE_SETAUDIT); + return (ADE_SETAUDIT); return (ADE_NOERR); } -#endif /* __APPLE__ */ +#endif /* !__APPLE__ */ /* * Generate and submit audit record for audit startup or shutdown. The event @@ -934,7 +934,7 @@ * Returns: * AUE_NOERR on success, * ADE_NOMEM if memory allocation fails, - * ADE_AU_OPEN if au_open(3) fails, + * ADE_AU_OPEN if au_open(3) fails, * ADE_AU_CLOSE if au_close(3) fails. */ int @@ -953,7 +953,7 @@ asprintf(&autext, "%s::Audit shutdown", getprogname()); else if (event == AUE_audit_recovery) asprintf(&autext, "%s::Audit recovery", getprogname()); - else + else return (ADE_INVAL); if (autext == NULL) return (ADE_NOMEM); @@ -985,8 +985,8 @@ * 'current' symlink. The argument 'curfile' is the file the 'current' symlink * should point to. Returns: * ADE_NOERR on success, - * ADE_AU_OPEN if au_open(3) fails, - * ADE_AU_CLOSE if au_close(3) fails. + * ADE_AU_OPEN if au_open(3) fails, + * ADE_AU_CLOSE if au_close(3) fails. * ADE_RENAME if error renaming audit trail file, * ADE_READLINK if error reading the 'current' link, * ADE_SYMLINK if error creating 'current' link. @@ -1009,7 +1009,7 @@ if (len > 0) { /* 'current' exist but is it pointing at a valid file? */ recoveredname[len++] = '\0'; - if (stat(recoveredname, &sb) == 0) { + if (stat(recoveredname, &sb) == 0) { /* Yes, rename it to a crash recovery file. */ strlcpy(newname, recoveredname, MAXPATHLEN); @@ -1056,7 +1056,7 @@ char TS[TIMESTAMP_LEN]; int ret = 0; - /* + /* * Mask auditing of this process. */ if (auditd_prevent_audit() != 0) @@ -1081,7 +1081,7 @@ } /* - * Add the current symlink and recover from crash, if needed. + * Add the current symlink and recover from crash, if needed. */ if (auditd_new_curlink(newfile) != 0) { ret = -1; @@ -1172,7 +1172,7 @@ return (-1); } else return (-1); - + (void) unlink(AUDIT_CURRENT_LINK); return (0); From owner-p4-projects@FreeBSD.ORG Fri Oct 7 22:12:03 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FD491065672; Fri, 7 Oct 2011 22:12:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02A87106566B for ; Fri, 7 Oct 2011 22:12:03 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E51E98FC08 for ; Fri, 7 Oct 2011 22:12:02 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p97MC2ig098952 for ; Fri, 7 Oct 2011 22:12:02 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p97MC2fh098949 for perforce@freebsd.org; Fri, 7 Oct 2011 22:12:02 GMT (envelope-from pjd@freebsd.org) Date: Fri, 7 Oct 2011 22:12:02 GMT Message-Id: <201110072212.p97MC2fh098949@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199872 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 22:12:03 -0000 http://p4web.freebsd.org/@@199872?ac=10 Change 199872 by pjd@pjd_anger on 2011/10/07 22:11:45 - When creating a file, don't give group access before setting proper group ownership. - Add XXX comment, as creating a file and opening it for reading only looks strange. Affected files ... .. //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#15 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#15 $ */ #include @@ -783,10 +783,11 @@ { int error, fd; - fd = open(fname, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP); + /* XXXPJD: We create a file and open it only for reading? Strange. */ + fd = open(fname, O_RDONLY | O_CREAT, S_IRUSR); if (fd < 0) return (-1); - if (fchown(fd, -1, gid) < 0) { + if (fchown(fd, -1, gid) < 0 || fchmod(fd, S_IRUSR | S_IRGRP) < 0) { error = errno; close(fd); (void)unlink(fname); From owner-p4-projects@FreeBSD.ORG Fri Oct 7 22:14:13 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C801D1065676; Fri, 7 Oct 2011 22:14:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A70D1065675 for ; Fri, 7 Oct 2011 22:14:13 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 783F28FC0A for ; Fri, 7 Oct 2011 22:14:13 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p97MEDFr099876 for ; Fri, 7 Oct 2011 22:14:13 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p97MEDtN099873 for perforce@freebsd.org; Fri, 7 Oct 2011 22:14:13 GMT (envelope-from pjd@freebsd.org) Date: Fri, 7 Oct 2011 22:14:13 GMT Message-Id: <201110072214.p97MEDtN099873@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199873 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 22:14:14 -0000 http://p4web.freebsd.org/@@199873?ac=10 Change 199873 by pjd@pjd_anger on 2011/10/07 22:13:54 White-space cleanups. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#47 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#47 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#46 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#47 $ */ #include @@ -79,7 +79,7 @@ /* - * LaunchD flag (Mac OS X and, maybe, FreeBSD only.) See launchd(8) and + * LaunchD flag (Mac OS X and, maybe, FreeBSD only.) See launchd(8) and * http://wiki.freebsd.org/launchd for more information. * * In order for auditd to work "on demand" with launchd(8) it can't: @@ -133,7 +133,7 @@ if (cf == NULL) { auditd_log_err("malloc failed: %m"); return (NULL); - } + } len = readlink(AUDIT_CURRENT_LINK, cf, MAXPATHLEN - 1); if (len < 0) { @@ -142,7 +142,7 @@ } /* readlink() doesn't terminate string. */ - cf[len] = '\0'; + cf[len] = '\0'; return (cf); } @@ -160,7 +160,7 @@ /* If lastfile is NULL try to get it from the 'current' link. */ if (lastfile == NULL) lastfile = get_curfile(); - + if (lastfile != NULL) { len = strlen(lastfile) + 1; oldname = (char *)malloc(len); @@ -176,16 +176,16 @@ "Could not rename %s to %s: %m", oldname, lastfile); else { - /* + /* * Remove the 'current' symlink since the link - * is now invalid. + * is now invalid. */ (void) unlink(AUDIT_CURRENT_LINK); auditd_log_notice( "renamed %s to %s", oldname, lastfile); audit_warn_closefile(lastfile); } - } else + } else auditd_log_err( "Could not rename %s to %s", oldname, lastfile); free(lastfile); @@ -229,13 +229,13 @@ * enabled) so updated the cached state as well. */ auditd_set_state(AUD_STATE_ENABLED); - + /* * Create 'current' symlink. Recover from crash, if needed. */ if (auditd_new_curlink(newfile) != 0) - auditd_log_err("auditd_new_curlink(\"%s\") failed: %s: %m", - newfile, auditd_strerror(err)); + auditd_log_err("auditd_new_curlink(\"%s\") failed: %s: %m", + newfile, auditd_strerror(err)); lastfile = newfile; auditd_log_notice("New audit file is %s", newfile); @@ -306,19 +306,18 @@ /* Generate an audit record. */ err = auditd_gen_record(AUE_audit_startup, NULL); if (err) - auditd_log_err("auditd_gen_record(AUE_audit_startup) %s: %m", + auditd_log_err("auditd_gen_record(AUE_audit_startup) %s: %m", auditd_strerror(err)); - + if (auditd_config_controls() == 0) auditd_log_info("Audit controls init successful"); else auditd_log_err("Audit controls init failed"); - } /* - * Close auditd pid file and trigger mechanism. + * Close auditd pid file and trigger mechanism. */ static int close_misc(void) @@ -352,7 +351,7 @@ err = auditd_gen_record(AUE_audit_shutdown, NULL); if (err) - auditd_log_err("auditd_gen_record(AUE_audit_shutdown) %s: %m", + auditd_log_err("auditd_gen_record(AUE_audit_shutdown) %s: %m", auditd_strerror(err)); /* Flush contents. */ @@ -513,7 +512,7 @@ /* * Message processing is done here. - */ + */ switch(trigger) { case AUDIT_TRIGGER_LOW_SPACE: auditd_log_notice("Got low space trigger"); @@ -554,7 +553,7 @@ * send SIGTERM. */ if (!launchd_flag) { - auditd_log_info("auditd exiting."); + auditd_log_info("auditd exiting."); exit (err); } break; @@ -570,7 +569,7 @@ err = auditd_expire_trails(audit_warn_expired); if (err) auditd_log_err("auditd_expire_trails(): %s", - auditd_strerror(err)); + auditd_strerror(err)); break; default: @@ -609,7 +608,7 @@ int ret; auditd_reap_children(); - + if (launchd_flag) ret = close_misc(); else @@ -630,7 +629,7 @@ /* * Configure event to class mappings in kernel. - */ + */ cnt = auditd_set_evcmap(); if (cnt < 0) { auditd_log_err("auditd_set_evcmap() failed: %m"); @@ -646,7 +645,7 @@ */ err = auditd_set_namask(); if (err) { - auditd_log_err("auditd_set_namask() %s: %m", + auditd_log_err("auditd_set_namask() %s: %m", auditd_strerror(err)); ret = -1; } else @@ -657,12 +656,12 @@ */ err = auditd_set_policy(); if (err) { - auditd_log_err("auditd_set_policy() %s: %m", + auditd_log_err("auditd_set_policy() %s: %m", auditd_strerror(err)); ret = -1; } else auditd_log_debug("Set audit policy in kernel."); - + /* * Configure audit trail log size in kernel. */ @@ -673,9 +672,9 @@ ret = -1; } else auditd_log_debug("Set audit trail size in kernel."); - + /* - * Configure audit trail volume minimum free percentage of blocks in + * Configure audit trail volume minimum free percentage of blocks in * kernel. */ err = auditd_set_minfree(); @@ -684,11 +683,11 @@ auditd_strerror(err)); ret = -1; } else - auditd_log_debug( + auditd_log_debug( "Set audit trail min free percent in kernel."); /* - * Configure host address in the audit kernel information. + * Configure host address in the audit kernel information. */ err = auditd_set_host(); if (err) { @@ -730,7 +729,7 @@ */ err = auditd_prevent_audit(); if (err) { - auditd_log_err("auditd_prevent_audit() %s: %m", + auditd_log_err("auditd_prevent_audit() %s: %m", auditd_strerror(err)); fail_exit(); } @@ -785,7 +784,7 @@ * likely the wheel group. Is there a better way to deal with this? */ grp = getgrnam(AUDIT_REVIEW_GROUP); - if (grp != NULL) + if (grp != NULL) audit_review_gid = grp->gr_gid; #endif @@ -815,7 +814,7 @@ setup(); /* - * auditd_wait_for_events() shouldn't return unless something is wrong. + * auditd_wait_for_events() shouldn't return unless something is wrong. */ auditd_wait_for_events(); From owner-p4-projects@FreeBSD.ORG Fri Oct 7 22:16:26 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D98291065672; Fri, 7 Oct 2011 22:16:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C74A106566B for ; Fri, 7 Oct 2011 22:16:25 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8AE988FC08 for ; Fri, 7 Oct 2011 22:16:25 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p97MGPdo000118 for ; Fri, 7 Oct 2011 22:16:25 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p97MGPN6000115 for perforce@freebsd.org; Fri, 7 Oct 2011 22:16:25 GMT (envelope-from pjd@freebsd.org) Date: Fri, 7 Oct 2011 22:16:25 GMT Message-Id: <201110072216.p97MGPN6000115@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199874 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 22:16:26 -0000 http://p4web.freebsd.org/@@199874?ac=10 Change 199874 by pjd@pjd_anger on 2011/10/07 22:15:34 Simplify code by using strdup(). Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#48 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#48 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#47 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#48 $ */ #include @@ -155,18 +155,15 @@ { char *ptr; char *oldname; - size_t len; /* If lastfile is NULL try to get it from the 'current' link. */ if (lastfile == NULL) lastfile = get_curfile(); if (lastfile != NULL) { - len = strlen(lastfile) + 1; - oldname = (char *)malloc(len); + oldname = strdup(lastfile); if (oldname == NULL) return (-1); - strlcpy(oldname, lastfile, len); /* Rename the last file -- append timestamp. */ if ((ptr = strstr(lastfile, NOT_TERMINATED)) != NULL) { From owner-p4-projects@FreeBSD.ORG Fri Oct 7 22:16:26 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23632106576D; Fri, 7 Oct 2011 22:16:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF4F1106566C for ; Fri, 7 Oct 2011 22:16:25 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id ADB428FC16 for ; Fri, 7 Oct 2011 22:16:25 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p97MGP9G000124 for ; Fri, 7 Oct 2011 22:16:25 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p97MGPRG000121 for perforce@freebsd.org; Fri, 7 Oct 2011 22:16:25 GMT (envelope-from pjd@freebsd.org) Date: Fri, 7 Oct 2011 22:16:25 GMT Message-Id: <201110072216.p97MGPRG000121@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199875 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 22:16:26 -0000 http://p4web.freebsd.org/@@199875?ac=10 Change 199875 by pjd@pjd_anger on 2011/10/07 22:16:06 White-space cleanups. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#49 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#49 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#48 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#49 $ */ #include @@ -178,12 +178,12 @@ * is now invalid. */ (void) unlink(AUDIT_CURRENT_LINK); - auditd_log_notice( "renamed %s to %s", + auditd_log_notice("renamed %s to %s", oldname, lastfile); audit_warn_closefile(lastfile); } } else - auditd_log_err( "Could not rename %s to %s", oldname, + auditd_log_err("Could not rename %s to %s", oldname, lastfile); free(lastfile); free(oldname); @@ -208,7 +208,7 @@ err = auditd_swap_trail(TS, &newfile, audit_review_gid, audit_warn_getacdir); if (err != ADE_NOERR) { - auditd_log_err( "%s: %m", auditd_strerror(err)); + auditd_log_err("%s: %m", auditd_strerror(err)); if (err != ADE_ACTL) return (-1); } From owner-p4-projects@FreeBSD.ORG Fri Oct 7 22:18:38 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5955C1065670; Fri, 7 Oct 2011 22:18:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DC52106564A for ; Fri, 7 Oct 2011 22:18:37 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8A9DB8FC0A for ; Fri, 7 Oct 2011 22:18:37 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p97MIb43000184 for ; Fri, 7 Oct 2011 22:18:37 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p97MIbVq000181 for perforce@freebsd.org; Fri, 7 Oct 2011 22:18:37 GMT (envelope-from pjd@freebsd.org) Date: Fri, 7 Oct 2011 22:18:37 GMT Message-Id: <201110072218.p97MIbVq000181@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199876 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 22:18:38 -0000 http://p4web.freebsd.org/@@199876?ac=10 Change 199876 by pjd@pjd_anger on 2011/10/07 22:17:40 White-space cleanups. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#68 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#68 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#67 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#68 $ */ #include @@ -106,7 +106,7 @@ (dest) = be32dec((buf) + (bytesread)); \ (bytesread) += sizeof(u_int32_t); \ } else \ - (err) = 1; \ + (err) = 1; \ } while (0) #define READ_TOKEN_U_INT64(buf, len, dest, bytesread, err) do { \ @@ -114,7 +114,7 @@ dest = be64dec((buf) + (bytesread)); \ (bytesread) += sizeof(u_int64_t); \ } else \ - (err) = 1; \ + (err) = 1; \ } while (0) #define SET_PTR(buf, len, ptr, size, bytesread, err) do { \ @@ -835,7 +835,7 @@ void au_print_xml_header(FILE *outfp) { - + fprintf(outfp, "\n"); fprintf(outfp, "\n"); } @@ -846,7 +846,7 @@ void au_print_xml_footer(FILE *outfp) { - + fprintf(outfp, "\n"); } @@ -998,7 +998,7 @@ } static void -print_header32_ex_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) +print_header32_ex_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) { print_tok_type(fp, tok->id, "header_ex", oflags); @@ -1083,9 +1083,9 @@ } static void -print_header64_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) +print_header64_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) { - + print_tok_type(fp, tok->id, "header", oflags); if (oflags & AU_OFLAG_XML) { open_attr(fp, "version"); @@ -1251,7 +1251,7 @@ } static void -print_trailer_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) +print_trailer_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) { print_tok_type(fp, tok->id, "trailer", oflags); @@ -1835,7 +1835,7 @@ } static void -print_execarg_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) +print_execarg_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) { u_int32_t i; @@ -1987,15 +1987,15 @@ for (i = 0; itt.grps.no; i++) { READ_TOKEN_U_INT32(buf, len, tok->tt.grps.list[i], tok->len, err); - if (err) - return (-1); + if (err) + return (-1); } return (0); } static void -print_newgroups_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) +print_newgroups_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) { int i; @@ -2031,7 +2031,7 @@ } static void -print_inaddr_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) +print_inaddr_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) { print_tok_type(fp, tok->id, "ip addr", oflags); @@ -2045,7 +2045,7 @@ } /* - * type 4 bytes + * type 4 bytes * address 16 bytes */ static int @@ -2074,7 +2074,7 @@ } static void -print_inaddr_ex_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) +print_inaddr_ex_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) { print_tok_type(fp, tok->id, "ip addr ex", oflags); @@ -3117,7 +3117,7 @@ } static void -print_sock_inet128_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) +print_sock_inet128_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags) { print_tok_type(fp, tok->id, "socket-inet6", oflags); @@ -3160,7 +3160,7 @@ /* slen = strnlen((buf + tok->len), 104) + 1; */ p = (u_char *)memchr((const void *)(buf + tok->len), '\0', 104); - slen = (p ? (int)(p - (buf + tok->len)) : 104) + 1; + slen = (p ? (int)(p - (buf + tok->len)) : 104) + 1; READ_TOKEN_BYTES(buf, len, tok->tt.sockunix.path, slen, tok->len, err); if (err) @@ -3387,7 +3387,7 @@ print_tok_type(fp, tok->id, "use of privilege", oflags); if (oflags & AU_OFLAG_XML) { open_attr(fp, "status"); - if (tok->tt.priv.sorf) + if (tok->tt.priv.sorf) (void) fprintf(fp, "successful use of priv"); else (void) fprintf(fp, "failed use of priv"); @@ -3440,7 +3440,7 @@ fetch_privset_tok(tokenstr_t *tok, u_char *buf, int len) { int err = 0; - + READ_TOKEN_U_INT16(buf, len, tok->tt.privset.privtstrlen, tok->len, err); if (err) @@ -3468,7 +3468,7 @@ if (oflags & AU_OFLAG_XML) { open_attr(fp, "type"); print_string(fp, tok->tt.privset.privtstr, - tok->tt.privset.privtstrlen); + tok->tt.privset.privtstrlen); close_attr(fp); open_attr(fp, "priv"); print_string(fp, tok->tt.privset.privstr, @@ -3480,7 +3480,7 @@ tok->tt.privset.privtstrlen); print_delim(fp, del); print_string(fp, tok->tt.privset.privstr, - tok->tt.privset.privstrlen); + tok->tt.privset.privstrlen); } } From owner-p4-projects@FreeBSD.ORG Fri Oct 7 22:19:43 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACB371065673; Fri, 7 Oct 2011 22:19:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6F52C106564A for ; Fri, 7 Oct 2011 22:19:43 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 5DC708FC13 for ; Fri, 7 Oct 2011 22:19:43 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p97MJhvP000219 for ; Fri, 7 Oct 2011 22:19:43 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p97MJhV7000216 for perforce@freebsd.org; Fri, 7 Oct 2011 22:19:43 GMT (envelope-from pjd@freebsd.org) Date: Fri, 7 Oct 2011 22:19:43 GMT Message-Id: <201110072219.p97MJhV7000216@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199877 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 22:19:44 -0000 http://p4web.freebsd.org/@@199877?ac=10 Change 199877 by pjd@pjd_anger on 2011/10/07 22:19:14 Prefer calloc() over malloc()+memset(ptr, 0, size). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#69 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#69 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#68 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#69 $ */ #include @@ -4485,11 +4485,10 @@ return (-1); } - *buf = malloc(recsize * sizeof(u_char)); + *buf = calloc(recsize, sizeof(u_char)); if (*buf == NULL) return (-1); bptr = *buf; - memset(bptr, 0, recsize); /* store the token contents already read, back to the buffer*/ *bptr = type; From owner-p4-projects@FreeBSD.ORG Fri Oct 7 22:20:49 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 649A21065670; Fri, 7 Oct 2011 22:20:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 26053106566B for ; Fri, 7 Oct 2011 22:20:49 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 143DF8FC12 for ; Fri, 7 Oct 2011 22:20:49 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p97MKmto000751 for ; Fri, 7 Oct 2011 22:20:48 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p97MKmgA000747 for perforce@freebsd.org; Fri, 7 Oct 2011 22:20:48 GMT (envelope-from pjd@freebsd.org) Date: Fri, 7 Oct 2011 22:20:48 GMT Message-Id: <201110072220.p97MKmgA000747@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199878 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 22:20:49 -0000 http://p4web.freebsd.org/@@199878?ac=10 Change 199878 by pjd@pjd_anger on 2011/10/07 22:20:01 White-space cleanups. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#96 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#96 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#95 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#96 $ */ #include @@ -119,7 +119,7 @@ * token ID 1 byte * privtstrlen 2 bytes * privtstr N bytes + 1 - * privstrlen 2 bytes + * privstrlen 2 bytes * privstr N bytes + 1 */ token_t * @@ -1340,9 +1340,9 @@ auinfo.ai_asid, &auinfo.ai_termid)); } else { /* getaudit_addr(2) failed for some other reason. */ - return (NULL); + return (NULL); } - } + } return (au_to_subject32_ex(aia.ai_auid, geteuid(), getegid(), getuid(), getgid(), getpid(), aia.ai_asid, &aia.ai_termid)); @@ -1514,7 +1514,7 @@ GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t) + sizeof(u_char) + 2 * sizeof(u_int16_t) + 3 * sizeof(u_int32_t) + tid->at_type); - if (t == NULL) + if (t == NULL) return (NULL); ADD_U_CHAR(dptr, AUT_HEADER32_EX); @@ -1533,7 +1533,7 @@ ADD_U_INT32(dptr, tm.tv_sec); ADD_U_INT32(dptr, timems); /* We need time in ms. */ - return (t); + return (t); } token_t * From owner-p4-projects@FreeBSD.ORG Fri Oct 7 22:23:01 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E2C31065672; Fri, 7 Oct 2011 22:23:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4388106566B for ; Fri, 7 Oct 2011 22:23:00 +0000 (UTC) (envelope-from pjd@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id D2C208FC15 for ; Fri, 7 Oct 2011 22:23:00 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p97MN0FA001929 for ; Fri, 7 Oct 2011 22:23:00 GMT (envelope-from pjd@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p97MN0m9001926 for perforce@freebsd.org; Fri, 7 Oct 2011 22:23:00 GMT (envelope-from pjd@freebsd.org) Date: Fri, 7 Oct 2011 22:23:00 GMT Message-Id: <201110072223.p97MN0m9001926@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to pjd@freebsd.org using -f From: Pawel Jakub Dawidek To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2011 22:23:01 -0000 http://p4web.freebsd.org/@@199879?ac=10 Change 199879 by pjd@pjd_anger on 2011/10/07 22:21:56 Prefer calloc() over malloc()+memset(ptr, 0, size). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#97 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#97 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#96 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#97 $ */ #include @@ -79,12 +79,11 @@ (t) = malloc(sizeof(token_t)); \ if ((t) != NULL) { \ (t)->len = (length); \ - (dptr) = (t->t_data) = malloc((length) * sizeof(u_char)); \ + (dptr) = (t->t_data) = calloc((length), sizeof(u_char)); \ if ((dptr) == NULL) { \ free(t); \ (t) = NULL; \ - } else \ - memset((dptr), 0, (length)); \ + } \ } else \ (dptr) = NULL; \ assert((t) == NULL || (dptr) != NULL); \ From owner-p4-projects@FreeBSD.ORG Sat Oct 8 09:10:17 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B18EA1065670; Sat, 8 Oct 2011 09:10:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 682A0106566B for ; Sat, 8 Oct 2011 09:10:17 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 546DA8FC08 for ; Sat, 8 Oct 2011 09:10:17 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p989AHUP029734 for ; Sat, 8 Oct 2011 09:10:17 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p989AFji029725 for perforce@freebsd.org; Sat, 8 Oct 2011 09:10:15 GMT (envelope-from lz@FreeBSD.org) Date: Sat, 8 Oct 2011 09:10:15 GMT Message-Id: <201110080910.p989AFji029725@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199897 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 09:10:18 -0000 http://p4web.freebsd.org/@@199897?ac=10 Change 199897 by lz@freebsd-dev on 2011/10/08 09:10:12 IFC. Affected files ... .. //depot/projects/soc2010/extfs/amd64/amd64/exception.S#2 integrate .. //depot/projects/soc2010/extfs/amd64/amd64/genassym.c#2 integrate .. //depot/projects/soc2010/extfs/amd64/amd64/machdep.c#2 integrate .. //depot/projects/soc2010/extfs/amd64/amd64/pmap.c#2 integrate .. //depot/projects/soc2010/extfs/amd64/amd64/trap.c#2 integrate .. //depot/projects/soc2010/extfs/amd64/conf/GENERIC#2 integrate .. //depot/projects/soc2010/extfs/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/soc2010/extfs/amd64/include/md_var.h#2 integrate .. //depot/projects/soc2010/extfs/amd64/include/proc.h#2 integrate .. //depot/projects/soc2010/extfs/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/soc2010/extfs/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/soc2010/extfs/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/soc2010/extfs/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/soc2010/extfs/arm/arm/machdep.c#2 integrate .. //depot/projects/soc2010/extfs/arm/arm/pmap.c#2 integrate .. //depot/projects/soc2010/extfs/arm/arm/trap.c#2 integrate .. //depot/projects/soc2010/extfs/arm/at91/at91_mci.c#2 integrate .. //depot/projects/soc2010/extfs/arm/at91/at91_pio.c#2 integrate .. //depot/projects/soc2010/extfs/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/soc2010/extfs/arm/at91/at91_spi.c#2 integrate .. //depot/projects/soc2010/extfs/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/soc2010/extfs/arm/at91/at91_twi.c#2 integrate .. //depot/projects/soc2010/extfs/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/soc2010/extfs/arm/conf/HL200#2 integrate .. //depot/projects/soc2010/extfs/arm/conf/HL201#2 integrate .. //depot/projects/soc2010/extfs/arm/conf/KB920X#2 integrate .. //depot/projects/soc2010/extfs/arm/conf/QILA9G20#2 integrate .. //depot/projects/soc2010/extfs/arm/conf/SAM9G20EK#2 integrate .. //depot/projects/soc2010/extfs/arm/econa/if_ece.c#2 integrate .. //depot/projects/soc2010/extfs/arm/include/proc.h#2 integrate .. //depot/projects/soc2010/extfs/arm/include/vmparam.h#2 integrate .. //depot/projects/soc2010/extfs/arm/mv/common.c#2 integrate .. //depot/projects/soc2010/extfs/arm/mv/mv_machdep.c#2 integrate .. //depot/projects/soc2010/extfs/arm/xscale/ixp425/avila_gpio.c#2 integrate .. //depot/projects/soc2010/extfs/boot/arm/ixp425/boot2/boot2.c#2 integrate .. //depot/projects/soc2010/extfs/boot/forth/menu.4th#2 integrate .. //depot/projects/soc2010/extfs/boot/forth/menu.4th.8#2 integrate .. //depot/projects/soc2010/extfs/boot/i386/gptboot/Makefile#2 integrate .. //depot/projects/soc2010/extfs/boot/i386/gptzfsboot/Makefile#2 integrate .. //depot/projects/soc2010/extfs/boot/i386/zfsboot/Makefile#2 integrate .. //depot/projects/soc2010/extfs/boot/zfs/zfstest.c#2 delete .. //depot/projects/soc2010/extfs/cam/cam_ccb.h#2 integrate .. //depot/projects/soc2010/extfs/cam/cam_periph.c#2 integrate .. //depot/projects/soc2010/extfs/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/soc2010/extfs/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/soc2010/extfs/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/soc2010/extfs/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/soc2010/extfs/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/soc2010/extfs/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/soc2010/extfs/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/soc2010/extfs/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/soc2010/extfs/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/soc2010/extfs/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/soc2010/extfs/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c#2 integrate .. //depot/projects/soc2010/extfs/compat/freebsd32/freebsd32_ioctl.c#2 integrate .. //depot/projects/soc2010/extfs/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/soc2010/extfs/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/soc2010/extfs/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/soc2010/extfs/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/soc2010/extfs/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/soc2010/extfs/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/soc2010/extfs/compat/linux/linux_emul.c#2 integrate .. //depot/projects/soc2010/extfs/compat/linux/linux_file.c#2 integrate .. //depot/projects/soc2010/extfs/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/soc2010/extfs/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/soc2010/extfs/compat/linux/linux_misc.c#2 integrate .. //depot/projects/soc2010/extfs/compat/linux/linux_signal.c#2 integrate .. //depot/projects/soc2010/extfs/compat/linux/linux_socket.c#2 integrate .. //depot/projects/soc2010/extfs/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/soc2010/extfs/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/soc2010/extfs/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/soc2010/extfs/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/soc2010/extfs/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/soc2010/extfs/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/soc2010/extfs/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/soc2010/extfs/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/soc2010/extfs/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/soc2010/extfs/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/soc2010/extfs/conf/NOTES#2 integrate .. //depot/projects/soc2010/extfs/conf/files#2 integrate .. //depot/projects/soc2010/extfs/conf/makeLINT.sed#2 integrate .. //depot/projects/soc2010/extfs/conf/newvers.sh#2 integrate .. //depot/projects/soc2010/extfs/conf/options#2 integrate .. //depot/projects/soc2010/extfs/dev/acpica/acpi.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ahci/ahci.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ata/ata-all.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ah_regdomain.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5210/ar5210.h#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5210/ar5210_beacon.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5211/ar5211.h#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5211/ar5211_beacon.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5212/ar5112.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5212/ar5212.h#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5212/ar5212_beacon.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5212/ar5212_xmit.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5312/ar5312_attach.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5416/ar5416.h#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5416/ar5416.ini#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5416/ar5416_attach.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5416/ar5416_beacon.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5416/ar5416_cal.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5416/ar5416_misc.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5416/ar5416_recv.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5416/ar5416_xmit.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5416/ar5416phy.h#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar5416/ar5416reg.h#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar9001/ar9130_attach.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar9001/ar9160_attach.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar9002/ar9280_attach.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar9002/ar9285_attach.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_hal/ar9002/ar9287_attach.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/if_ath.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ath/if_athvar.h#2 integrate .. //depot/projects/soc2010/extfs/dev/bce/if_bce.c#2 integrate .. //depot/projects/soc2010/extfs/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/soc2010/extfs/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/soc2010/extfs/dev/bwi/if_bwi.c#2 integrate .. //depot/projects/soc2010/extfs/dev/bxe/if_bxe.c#2 integrate .. //depot/projects/soc2010/extfs/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ciss/ciss.c#2 integrate .. //depot/projects/soc2010/extfs/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/soc2010/extfs/dev/e1000/if_lem.c#2 integrate .. //depot/projects/soc2010/extfs/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/soc2010/extfs/dev/fb/machfb.c#2 integrate .. //depot/projects/soc2010/extfs/dev/firewire/sbp.c#2 integrate .. //depot/projects/soc2010/extfs/dev/firewire/sbp_targ.c#2 integrate .. //depot/projects/soc2010/extfs/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/soc2010/extfs/dev/hwpmc/hwpmc_mips24k.h#2 integrate .. //depot/projects/soc2010/extfs/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/soc2010/extfs/dev/iir/iir.c#2 integrate .. //depot/projects/soc2010/extfs/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/soc2010/extfs/dev/iscsi/initiator/iscsi_subr.c#2 integrate .. //depot/projects/soc2010/extfs/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/soc2010/extfs/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/soc2010/extfs/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/soc2010/extfs/dev/mfi/mfi.c#2 integrate .. //depot/projects/soc2010/extfs/dev/mfi/mfivar.h#2 integrate .. //depot/projects/soc2010/extfs/dev/mly/mly.c#2 integrate .. //depot/projects/soc2010/extfs/dev/mps/mps_sas.c#2 integrate .. //depot/projects/soc2010/extfs/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/soc2010/extfs/dev/ppbus/ppb_msq.c#2 integrate .. //depot/projects/soc2010/extfs/dev/puc/pucdata.c#2 integrate .. //depot/projects/soc2010/extfs/dev/smc/if_smc.c#2 integrate .. //depot/projects/soc2010/extfs/dev/sound/midi/midi.c#2 integrate .. //depot/projects/soc2010/extfs/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/soc2010/extfs/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/soc2010/extfs/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/soc2010/extfs/dev/syscons/scmouse.c#2 integrate .. //depot/projects/soc2010/extfs/dev/syscons/syscons.c#2 integrate .. //depot/projects/soc2010/extfs/dev/tws/tws.c#1 branch .. //depot/projects/soc2010/extfs/dev/tws/tws.h#1 branch .. //depot/projects/soc2010/extfs/dev/tws/tws_cam.c#1 branch .. //depot/projects/soc2010/extfs/dev/tws/tws_hdm.c#1 branch .. //depot/projects/soc2010/extfs/dev/tws/tws_hdm.h#1 branch .. //depot/projects/soc2010/extfs/dev/tws/tws_services.c#1 branch .. //depot/projects/soc2010/extfs/dev/tws/tws_services.h#1 branch .. //depot/projects/soc2010/extfs/dev/tws/tws_user.c#1 branch .. //depot/projects/soc2010/extfs/dev/tws/tws_user.h#1 branch .. //depot/projects/soc2010/extfs/dev/usb/input/uhid.c#2 integrate .. //depot/projects/soc2010/extfs/dev/usb/quirk/usb_quirk.c#2 integrate .. //depot/projects/soc2010/extfs/dev/usb/storage/umass.c#2 integrate .. //depot/projects/soc2010/extfs/dev/usb/usb_dev.c#2 integrate .. //depot/projects/soc2010/extfs/dev/usb/usb_device.c#2 integrate .. //depot/projects/soc2010/extfs/dev/usb/usb_device.h#2 integrate .. //depot/projects/soc2010/extfs/dev/usb/usb_dynamic.c#2 integrate .. //depot/projects/soc2010/extfs/dev/usb/usb_dynamic.h#2 integrate .. //depot/projects/soc2010/extfs/dev/usb/usb_freebsd.h#2 integrate .. //depot/projects/soc2010/extfs/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/soc2010/extfs/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/soc2010/extfs/dev/usb/usb_transfer.c#2 integrate .. //depot/projects/soc2010/extfs/dev/usb/usbdevs#2 integrate .. //depot/projects/soc2010/extfs/dev/usb/usbdi.h#2 integrate .. //depot/projects/soc2010/extfs/dev/vge/if_vge.c#2 integrate .. //depot/projects/soc2010/extfs/dev/vge/if_vgereg.h#2 integrate .. //depot/projects/soc2010/extfs/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/soc2010/extfs/dev/xen/blkfront/block.h#2 integrate .. //depot/projects/soc2010/extfs/dev/xen/console/console.c#2 integrate .. //depot/projects/soc2010/extfs/dev/xen/control/control.c#2 integrate .. //depot/projects/soc2010/extfs/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/soc2010/extfs/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/soc2010/extfs/fs/nfsserver/nfs_nfsdport.c#2 integrate .. //depot/projects/soc2010/extfs/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/soc2010/extfs/fs/procfs/procfs_ioctl.c#2 integrate .. //depot/projects/soc2010/extfs/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/soc2010/extfs/i386/conf/GENERIC#2 integrate .. //depot/projects/soc2010/extfs/i386/i386/machdep.c#2 integrate .. //depot/projects/soc2010/extfs/i386/i386/pmap.c#2 integrate .. //depot/projects/soc2010/extfs/i386/i386/trap.c#2 integrate .. //depot/projects/soc2010/extfs/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/soc2010/extfs/i386/ibcs2/ibcs2_ipc.c#2 integrate .. //depot/projects/soc2010/extfs/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/soc2010/extfs/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/soc2010/extfs/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/soc2010/extfs/i386/ibcs2/ibcs2_signal.c#2 integrate .. //depot/projects/soc2010/extfs/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/soc2010/extfs/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/soc2010/extfs/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/soc2010/extfs/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/soc2010/extfs/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/soc2010/extfs/i386/include/proc.h#2 integrate .. //depot/projects/soc2010/extfs/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/soc2010/extfs/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/soc2010/extfs/i386/xen/pmap.c#2 integrate .. //depot/projects/soc2010/extfs/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/soc2010/extfs/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/soc2010/extfs/ia64/ia64/machdep.c#2 integrate .. //depot/projects/soc2010/extfs/ia64/ia64/pmap.c#2 integrate .. //depot/projects/soc2010/extfs/ia64/ia64/trap.c#2 integrate .. //depot/projects/soc2010/extfs/ia64/include/proc.h#2 integrate .. //depot/projects/soc2010/extfs/kern/init_main.c#2 integrate .. //depot/projects/soc2010/extfs/kern/init_sysent.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_acct.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_clock.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_context.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_cpuset.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_ctf.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_descrip.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_environment.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_event.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_exec.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_exit.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_fork.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_jail.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_ktrace.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_linker.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_loginclass.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_module.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_ntptime.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_proc.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_prot.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_racct.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_rctl.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_resource.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_shutdown.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_sig.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_synch.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_sysctl.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_thr.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_time.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_umtx.c#2 integrate .. //depot/projects/soc2010/extfs/kern/kern_uuid.c#2 integrate .. //depot/projects/soc2010/extfs/kern/makesyscalls.sh#2 integrate .. //depot/projects/soc2010/extfs/kern/p1003_1b.c#2 integrate .. //depot/projects/soc2010/extfs/kern/sched_ule.c#2 integrate .. //depot/projects/soc2010/extfs/kern/subr_acl_nfs4.c#2 integrate .. //depot/projects/soc2010/extfs/kern/subr_bus.c#2 integrate .. //depot/projects/soc2010/extfs/kern/subr_kdb.c#2 integrate .. //depot/projects/soc2010/extfs/kern/subr_prof.c#2 integrate .. //depot/projects/soc2010/extfs/kern/subr_syscall.c#1 branch .. //depot/projects/soc2010/extfs/kern/subr_taskqueue.c#2 integrate .. //depot/projects/soc2010/extfs/kern/subr_trap.c#2 integrate .. //depot/projects/soc2010/extfs/kern/sys_capability.c#2 integrate .. //depot/projects/soc2010/extfs/kern/sys_generic.c#2 integrate .. //depot/projects/soc2010/extfs/kern/sys_pipe.c#2 integrate .. //depot/projects/soc2010/extfs/kern/sys_procdesc.c#2 integrate .. //depot/projects/soc2010/extfs/kern/sys_process.c#2 integrate .. //depot/projects/soc2010/extfs/kern/sysv_msg.c#2 integrate .. //depot/projects/soc2010/extfs/kern/sysv_sem.c#2 integrate .. //depot/projects/soc2010/extfs/kern/sysv_shm.c#2 integrate .. //depot/projects/soc2010/extfs/kern/tty.c#2 integrate .. //depot/projects/soc2010/extfs/kern/tty_pts.c#2 integrate .. //depot/projects/soc2010/extfs/kern/uipc_mqueue.c#2 integrate .. //depot/projects/soc2010/extfs/kern/uipc_sem.c#2 integrate .. //depot/projects/soc2010/extfs/kern/uipc_shm.c#2 integrate .. //depot/projects/soc2010/extfs/kern/uipc_syscalls.c#2 integrate .. //depot/projects/soc2010/extfs/kern/uipc_usrreq.c#2 integrate .. //depot/projects/soc2010/extfs/kern/vfs_acl.c#2 integrate .. //depot/projects/soc2010/extfs/kern/vfs_aio.c#2 integrate .. //depot/projects/soc2010/extfs/kern/vfs_bio.c#2 integrate .. //depot/projects/soc2010/extfs/kern/vfs_cache.c#2 integrate .. //depot/projects/soc2010/extfs/kern/vfs_extattr.c#2 integrate .. //depot/projects/soc2010/extfs/kern/vfs_init.c#2 integrate .. //depot/projects/soc2010/extfs/kern/vfs_mount.c#2 integrate .. //depot/projects/soc2010/extfs/kern/vfs_subr.c#2 integrate .. //depot/projects/soc2010/extfs/kern/vfs_syscalls.c#2 integrate .. //depot/projects/soc2010/extfs/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2010/extfs/kgssapi/gss_impl.c#2 integrate .. //depot/projects/soc2010/extfs/libkern/strnlen.c#1 branch .. //depot/projects/soc2010/extfs/mips/cavium/asm_octeon.S#2 integrate .. //depot/projects/soc2010/extfs/mips/cavium/if_octm.c#2 integrate .. //depot/projects/soc2010/extfs/mips/cavium/octe/ethernet-common.c#2 integrate .. //depot/projects/soc2010/extfs/mips/cavium/octe/ethernet.c#2 integrate .. //depot/projects/soc2010/extfs/mips/cavium/octeon_ebt3000_cf.c#2 integrate .. //depot/projects/soc2010/extfs/mips/cavium/octeon_mp.c#2 integrate .. //depot/projects/soc2010/extfs/mips/cavium/octeon_pcmap_regs.h#2 integrate .. //depot/projects/soc2010/extfs/mips/conf/OCTEON1#2 integrate .. //depot/projects/soc2010/extfs/mips/conf/XLP#2 integrate .. //depot/projects/soc2010/extfs/mips/conf/XLP64#2 integrate .. //depot/projects/soc2010/extfs/mips/conf/XLPN32#2 integrate .. //depot/projects/soc2010/extfs/mips/include/param.h#2 integrate .. //depot/projects/soc2010/extfs/mips/include/proc.h#2 integrate .. //depot/projects/soc2010/extfs/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/soc2010/extfs/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/soc2010/extfs/mips/mips/machdep.c#2 integrate .. //depot/projects/soc2010/extfs/mips/mips/pm_machdep.c#2 integrate .. //depot/projects/soc2010/extfs/mips/mips/pmap.c#2 integrate .. //depot/projects/soc2010/extfs/mips/mips/trap.c#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/board.c#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/board.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/bus_space_rmi.c#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/bus_space_rmi_pci.c#1 branch .. //depot/projects/soc2010/extfs/mips/nlm/clock.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/cms.c#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/files.xlp#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/hal/bridge.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/hal/cop0.h#2 delete .. //depot/projects/soc2010/extfs/mips/nlm/hal/cop2.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/hal/cpucontrol.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/hal/fmn.c#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/hal/fmn.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/hal/haldefs.h#1 branch .. //depot/projects/soc2010/extfs/mips/nlm/hal/iomap.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/hal/mips-extns.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/hal/mmio.h#2 delete .. //depot/projects/soc2010/extfs/mips/nlm/hal/mmu.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/hal/pcibus.h#1 branch .. //depot/projects/soc2010/extfs/mips/nlm/hal/pic.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/hal/sys.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/hal/uart.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/hal/usb.h#1 branch .. //depot/projects/soc2010/extfs/mips/nlm/intern_dev.c#1 branch .. //depot/projects/soc2010/extfs/mips/nlm/interrupt.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/intr_machdep.c#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/iodi.c#2 delete .. //depot/projects/soc2010/extfs/mips/nlm/mpreset.S#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/msgring.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/uart_bus_xlp_iodi.c#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/uart_cpu_mips_xlp.c#2 delete .. //depot/projects/soc2010/extfs/mips/nlm/uart_cpu_xlp.c#1 branch .. //depot/projects/soc2010/extfs/mips/nlm/uart_pci_xlp.c#1 branch .. //depot/projects/soc2010/extfs/mips/nlm/usb_init.c#1 branch .. //depot/projects/soc2010/extfs/mips/nlm/xlp.h#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/xlp_machdep.c#2 integrate .. //depot/projects/soc2010/extfs/mips/nlm/xlp_pci.c#1 branch .. //depot/projects/soc2010/extfs/modules/Makefile#2 integrate .. //depot/projects/soc2010/extfs/modules/ipfw/Makefile#2 integrate .. //depot/projects/soc2010/extfs/modules/netgraph/ipfw/Makefile#2 integrate .. //depot/projects/soc2010/extfs/modules/tws/Makefile#1 branch .. //depot/projects/soc2010/extfs/net/if_bridge.c#2 integrate .. //depot/projects/soc2010/extfs/net/if_llatbl.h#2 integrate .. //depot/projects/soc2010/extfs/net/radix.h#2 integrate .. //depot/projects/soc2010/extfs/net/raw_cb.h#2 integrate .. //depot/projects/soc2010/extfs/net/raw_usrreq.c#2 integrate .. //depot/projects/soc2010/extfs/net/route.c#2 integrate .. //depot/projects/soc2010/extfs/net/route.h#2 integrate .. //depot/projects/soc2010/extfs/net/rtsock.c#2 integrate .. //depot/projects/soc2010/extfs/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/soc2010/extfs/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/soc2010/extfs/net80211/ieee80211_tdma.c#2 integrate .. //depot/projects/soc2010/extfs/netgraph/ng_ipfw.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/in.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/ipfw/ip_fw2.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/ipfw/ip_fw_dynamic.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/ipfw/ip_fw_log.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/ipfw/ip_fw_pfil.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/ipfw/ip_fw_sockopt.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/ipfw/ip_fw_table.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/raw_ip.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/sctp.h#2 integrate .. //depot/projects/soc2010/extfs/netinet/sctp_asconf.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/sctp_constants.h#2 integrate .. //depot/projects/soc2010/extfs/netinet/sctp_output.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/sctp_pcb.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/sctp_pcb.h#2 integrate .. //depot/projects/soc2010/extfs/netinet/sctp_structs.h#2 integrate .. //depot/projects/soc2010/extfs/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/sctputil.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/tcp_input.c#2 integrate .. //depot/projects/soc2010/extfs/netinet/tcp_reass.c#2 integrate .. //depot/projects/soc2010/extfs/netinet6/in6.c#2 integrate .. //depot/projects/soc2010/extfs/netinet6/in6.h#2 integrate .. //depot/projects/soc2010/extfs/netinet6/in6_proto.c#2 integrate .. //depot/projects/soc2010/extfs/netinet6/ip6_output.c#2 integrate .. //depot/projects/soc2010/extfs/netinet6/ip6_var.h#2 integrate .. //depot/projects/soc2010/extfs/netinet6/nd6.c#2 integrate .. //depot/projects/soc2010/extfs/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/soc2010/extfs/netipsec/key.c#2 integrate .. //depot/projects/soc2010/extfs/nfs/nfs_nfssvc.c#2 integrate .. //depot/projects/soc2010/extfs/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/soc2010/extfs/nlm/nlm_prot_impl.c#2 integrate .. //depot/projects/soc2010/extfs/pc98/conf/GENERIC#2 integrate .. //depot/projects/soc2010/extfs/pc98/pc98/machdep.c#2 integrate .. //depot/projects/soc2010/extfs/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/soc2010/extfs/powerpc/aim/mmu_oea64.c#2 integrate .. //depot/projects/soc2010/extfs/powerpc/aim/trap.c#2 integrate .. //depot/projects/soc2010/extfs/powerpc/booke/pmap.c#2 integrate .. //depot/projects/soc2010/extfs/powerpc/booke/trap.c#2 integrate .. //depot/projects/soc2010/extfs/powerpc/include/proc.h#2 integrate .. //depot/projects/soc2010/extfs/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/soc2010/extfs/powerpc/powerpc/exec_machdep.c#2 integrate .. //depot/projects/soc2010/extfs/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/soc2010/extfs/powerpc/ps3/ps3cdrom.c#2 integrate .. //depot/projects/soc2010/extfs/rpc/rpcsec_gss/svc_rpcsec_gss.c#2 integrate .. //depot/projects/soc2010/extfs/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/soc2010/extfs/security/mac/mac_framework.h#2 integrate .. //depot/projects/soc2010/extfs/security/mac/mac_policy.h#2 integrate .. //depot/projects/soc2010/extfs/security/mac/mac_posix_shm.c#2 integrate .. //depot/projects/soc2010/extfs/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/soc2010/extfs/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/soc2010/extfs/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/soc2010/extfs/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/soc2010/extfs/security/mac_test/mac_test.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/central/central.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2010/extfs/sparc64/conf/GENERIC#2 integrate .. //depot/projects/soc2010/extfs/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/include/asmacros.h#2 integrate .. //depot/projects/soc2010/extfs/sparc64/include/atomic.h#2 integrate .. //depot/projects/soc2010/extfs/sparc64/include/bus.h#2 integrate .. //depot/projects/soc2010/extfs/sparc64/include/bus_private.h#2 integrate .. //depot/projects/soc2010/extfs/sparc64/include/proc.h#2 integrate .. //depot/projects/soc2010/extfs/sparc64/pci/apb.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/pci/fire.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/pci/firevar.h#2 integrate .. //depot/projects/soc2010/extfs/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/pci/psycho.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/soc2010/extfs/sparc64/pci/sbbc.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/pci/schizo.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/pci/schizovar.h#2 integrate .. //depot/projects/soc2010/extfs/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/soc2010/extfs/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/soc2010/extfs/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/soc2010/extfs/sparc64/sparc64/upa.c#2 integrate .. //depot/projects/soc2010/extfs/sys/buf.h#2 integrate .. //depot/projects/soc2010/extfs/sys/conf.h#2 integrate .. //depot/projects/soc2010/extfs/sys/libkern.h#2 integrate .. //depot/projects/soc2010/extfs/sys/msgbuf.h#2 integrate .. //depot/projects/soc2010/extfs/sys/param.h#2 integrate .. //depot/projects/soc2010/extfs/sys/pipe.h#2 integrate .. //depot/projects/soc2010/extfs/sys/posix4.h#2 integrate .. //depot/projects/soc2010/extfs/sys/proc.h#2 integrate .. //depot/projects/soc2010/extfs/sys/racct.h#2 integrate .. //depot/projects/soc2010/extfs/sys/signalvar.h#2 integrate .. //depot/projects/soc2010/extfs/sys/sysent.h#2 integrate .. //depot/projects/soc2010/extfs/sys/sysproto.h#2 integrate .. //depot/projects/soc2010/extfs/teken/libteken/Symbol.map#2 integrate .. //depot/projects/soc2010/extfs/teken/stress/teken_stress.c#2 integrate .. //depot/projects/soc2010/extfs/teken/teken_subr.h#2 integrate .. //depot/projects/soc2010/extfs/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/soc2010/extfs/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/soc2010/extfs/vm/swap_pager.c#2 integrate .. //depot/projects/soc2010/extfs/vm/vm_fault.c#2 integrate .. //depot/projects/soc2010/extfs/vm/vm_mmap.c#2 integrate .. //depot/projects/soc2010/extfs/vm/vm_object.c#2 integrate .. //depot/projects/soc2010/extfs/vm/vm_page.c#2 integrate .. //depot/projects/soc2010/extfs/vm/vm_page.h#2 integrate .. //depot/projects/soc2010/extfs/vm/vm_pageout.c#2 integrate .. //depot/projects/soc2010/extfs/vm/vm_unix.c#2 integrate .. //depot/projects/soc2010/extfs/vm/vnode_pager.c#2 integrate .. //depot/projects/soc2010/extfs/x86/acpica/srat.c#2 integrate .. //depot/projects/soc2010/extfs/xen/xenbus/xenbusb.c#2 integrate .. //depot/projects/soc2010/extfs/xen/xenbus/xenbusb_back.c#2 integrate .. //depot/projects/soc2010/extfs/xen/xenbus/xenbusb_front.c#2 integrate .. //depot/projects/soc2010/extfs/xen/xenstore/xenstore.c#2 integrate Differences ... ==== //depot/projects/soc2010/extfs/amd64/amd64/exception.S#2 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.155 2011/04/08 21:26:50 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.158 2011/09/15 09:53:04 kib Exp $ */ #include "opt_atpic.h" @@ -380,8 +380,11 @@ movl $TF_HASSEGS,TF_FLAGS(%rsp) cld FAKE_MCOUNT(TF_RIP(%rsp)) - movq %rsp,%rdi - call syscall + movq PCPU(CURTHREAD),%rdi + movq %rsp,TD_FRAME(%rdi) + movl TF_RFLAGS(%rsp),%esi + andl $PSL_T,%esi + call amd64_syscall 1: movq PCPU(CURPCB),%rax /* Disable interrupts before testing PCB_FULL_IRET. */ cli @@ -390,29 +393,25 @@ /* Check for and handle AST's on return to userland. */ movq PCPU(CURTHREAD),%rax testl $TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%rax) - je 2f - sti - movq %rsp, %rdi - call ast - jmp 1b -2: /* Restore preserved registers. */ + jne 2f + /* Restore preserved registers. */ MEXITCOUNT movq TF_RDI(%rsp),%rdi /* bonus; preserve arg 1 */ movq TF_RSI(%rsp),%rsi /* bonus: preserve arg 2 */ movq TF_RDX(%rsp),%rdx /* return value 2 */ movq TF_RAX(%rsp),%rax /* return value 1 */ - movq TF_RBX(%rsp),%rbx /* C preserved */ - movq TF_RBP(%rsp),%rbp /* C preserved */ - movq TF_R12(%rsp),%r12 /* C preserved */ - movq TF_R13(%rsp),%r13 /* C preserved */ - movq TF_R14(%rsp),%r14 /* C preserved */ - movq TF_R15(%rsp),%r15 /* C preserved */ movq TF_RFLAGS(%rsp),%r11 /* original %rflags */ movq TF_RIP(%rsp),%rcx /* original %rip */ - movq TF_RSP(%rsp),%r9 /* user stack pointer */ - movq %r9,%rsp /* original %rsp */ + movq TF_RSP(%rsp),%rsp /* user stack pointer */ swapgs sysretq + +2: /* AST scheduled. */ + sti + movq %rsp,%rdi + call ast + jmp 1b + 3: /* Requested full context restore, use doreti for that. */ MEXITCOUNT jmp doreti ==== //depot/projects/soc2010/extfs/amd64/amd64/genassym.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.186 2011/07/18 15:19:40 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.187 2011/09/11 16:08:10 kib Exp $"); #include "opt_compat.h" #include "opt_hwpmc_hooks.h" @@ -87,6 +87,7 @@ ASSYM(TD_PFLAGS, offsetof(struct thread, td_pflags)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_TID, offsetof(struct thread, td_tid)); +ASSYM(TD_FRAME, offsetof(struct thread, td_frame)); ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); ==== //depot/projects/soc2010/extfs/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.753 2011/08/20 19:21:46 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.755 2011/10/03 14:23:00 attilio Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -421,7 +421,7 @@ * MPSAFE */ int -sigreturn(td, uap) +sys_sigreturn(td, uap) struct thread *td; struct sigreturn_args /* { const struct __ucontext *sigcntxp; @@ -517,7 +517,7 @@ freebsd4_sigreturn(struct thread *td, struct freebsd4_sigreturn_args *uap) { - return sigreturn(td, (struct sigreturn_args *)uap); + return sys_sigreturn(td, (struct sigreturn_args *)uap); } #endif @@ -609,7 +609,7 @@ cpu_halt(void) { for (;;) - __asm__ ("hlt"); + halt(); } void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */ @@ -630,6 +630,8 @@ state = (int *)PCPU_PTR(monitorbuf); *state = STATE_SLEEPING; + + /* See comments in cpu_idle_hlt(). */ disable_intr(); if (sched_runnable()) enable_intr(); @@ -647,9 +649,22 @@ state = (int *)PCPU_PTR(monitorbuf); *state = STATE_SLEEPING; + /* - * We must absolutely guarentee that hlt is the next instruction - * after sti or we introduce a timing window. + * Since we may be in a critical section from cpu_idle(), if + * an interrupt fires during that critical section we may have + * a pending preemption. If the CPU halts, then that thread + * may not execute until a later interrupt awakens the CPU. + * To handle this race, check for a runnable thread after + * disabling interrupts and immediately return if one is + * found. Also, we must absolutely guarentee that hlt is + * the next instruction after sti. This ensures that any + * interrupt that fires after the call to disable_intr() will + * immediately awaken the CPU from hlt. Finally, please note + * that on x86 this works fine because of interrupts enabled only + * after the instruction following sti takes place, while IF is set + * to 1 immediately, allowing hlt instruction to acknowledge the + * interrupt. */ disable_intr(); if (sched_runnable()) @@ -675,11 +690,19 @@ state = (int *)PCPU_PTR(monitorbuf); *state = STATE_MWAIT; - if (!sched_runnable()) { - cpu_monitor(state, 0, 0); - if (*state == STATE_MWAIT) - cpu_mwait(0, MWAIT_C1); + + /* See comments in cpu_idle_hlt(). */ + disable_intr(); + if (sched_runnable()) { + enable_intr(); + *state = STATE_RUNNING; + return; } + cpu_monitor(state, 0, 0); + if (*state == STATE_MWAIT) + __asm __volatile("sti; mwait" : : "a" (MWAIT_C1), "c" (0)); + else + enable_intr(); *state = STATE_RUNNING; } @@ -691,6 +714,12 @@ state = (int *)PCPU_PTR(monitorbuf); *state = STATE_RUNNING; + + /* + * The sched_runnable() call is racy but as long as there is + * a loop missing it one time will have just a little impact if any + * (and it is much better than missing the check at all). + */ for (i = 0; i < 1000; i++) { if (sched_runnable()) return; ==== //depot/projects/soc2010/extfs/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.725 2011/08/09 21:01:36 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.726 2011/09/06 10:30:11 kib Exp $"); /* * Manages physical address maps. @@ -2123,7 +2123,7 @@ KASSERT((tpte & PG_W) == 0, ("pmap_collect: wired pte %#lx", tpte)); if (tpte & PG_A) - vm_page_flag_set(m, PG_REFERENCED); + vm_page_aflag_set(m, PGA_REFERENCED); if ((tpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); free = NULL; @@ -2137,7 +2137,7 @@ } if (TAILQ_EMPTY(&m->md.pv_list) && TAILQ_EMPTY(&pa_to_pvh(VM_PAGE_TO_PHYS(m))->pv_list)) - vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_aflag_clear(m, PGA_WRITEABLE); } } @@ -2391,7 +2391,7 @@ if (TAILQ_EMPTY(&m->md.pv_list)) { pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); if (TAILQ_EMPTY(&pvh->pv_list)) - vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_aflag_clear(m, PGA_WRITEABLE); } } @@ -2615,10 +2615,10 @@ if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); if (oldpde & PG_A) - vm_page_flag_set(m, PG_REFERENCED); + vm_page_aflag_set(m, PGA_REFERENCED); if (TAILQ_EMPTY(&m->md.pv_list) && TAILQ_EMPTY(&pvh->pv_list)) - vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_aflag_clear(m, PGA_WRITEABLE); } } if (pmap == kernel_pmap) { @@ -2659,7 +2659,7 @@ if ((oldpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); if (oldpte & PG_A) - vm_page_flag_set(m, PG_REFERENCED); + vm_page_aflag_set(m, PGA_REFERENCED); pmap_remove_entry(pmap, m, va); } return (pmap_unuse_pt(pmap, va, ptepde, free)); @@ -2872,7 +2872,7 @@ if (tpte & PG_W) pmap->pm_stats.wired_count--; if (tpte & PG_A) - vm_page_flag_set(m, PG_REFERENCED); + vm_page_aflag_set(m, PGA_REFERENCED); /* * Update the vm_page_t clean and reference bits. @@ -2885,7 +2885,7 @@ free_pv_entry(pmap, pv); PMAP_UNLOCK(pmap); } - vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_aflag_clear(m, PGA_WRITEABLE); vm_page_unlock_queues(); pmap_free_zero_pages(free); } @@ -3301,7 +3301,7 @@ if ((prot & VM_PROT_WRITE) != 0) { newpte |= PG_RW; if ((newpte & PG_MANAGED) != 0) - vm_page_flag_set(m, PG_WRITEABLE); + vm_page_aflag_set(m, PGA_WRITEABLE); } if ((prot & VM_PROT_EXECUTE) == 0) newpte |= pg_nx; @@ -3325,7 +3325,7 @@ origpte = pte_load_store(pte, newpte); if (origpte & PG_A) { if (origpte & PG_MANAGED) - vm_page_flag_set(om, PG_REFERENCED); + vm_page_aflag_set(om, PGA_REFERENCED); if (opa != VM_PAGE_TO_PHYS(m) || ((origpte & PG_NX) == 0 && (newpte & PG_NX))) invlva = TRUE; @@ -3339,7 +3339,7 @@ if ((origpte & PG_MANAGED) != 0 && TAILQ_EMPTY(&om->md.pv_list) && TAILQ_EMPTY(&pa_to_pvh(opa)->pv_list)) - vm_page_flag_clear(om, PG_WRITEABLE); + vm_page_aflag_clear(om, PGA_WRITEABLE); if (invlva) pmap_invalidate_page(pmap, va); } else @@ -4147,7 +4147,7 @@ if (TAILQ_EMPTY(&pvh->pv_list)) { for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++) if (TAILQ_EMPTY(&mt->md.pv_list)) - vm_page_flag_clear(mt, PG_WRITEABLE); + vm_page_aflag_clear(mt, PGA_WRITEABLE); } mpte = pmap_lookup_pt_page(pmap, pv->pv_va); if (mpte != NULL) { @@ -4165,7 +4165,7 @@ if (TAILQ_EMPTY(&m->md.pv_list)) { pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); if (TAILQ_EMPTY(&pvh->pv_list)) - vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_aflag_clear(m, PGA_WRITEABLE); } } pmap_unuse_pt(pmap, pv->pv_va, ptepde, &free); @@ -4203,13 +4203,13 @@ ("pmap_is_modified: page %p is not managed", m)); /* - * If the page is not VPO_BUSY, then PG_WRITEABLE cannot be - * concurrently set while the object is locked. Thus, if PG_WRITEABLE + * If the page is not VPO_BUSY, then PGA_WRITEABLE cannot be + * concurrently set while the object is locked. Thus, if PGA_WRITEABLE * is clear, no PTEs can have PG_M set. */ VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); if ((m->oflags & VPO_BUSY) == 0 && - (m->flags & PG_WRITEABLE) == 0) + (m->aflags & PGA_WRITEABLE) == 0) return (FALSE); vm_page_lock_queues(); rv = pmap_is_modified_pvh(&m->md) || @@ -4332,13 +4332,13 @@ ("pmap_remove_write: page %p is not managed", m)); /* - * If the page is not VPO_BUSY, then PG_WRITEABLE cannot be set by - * another thread while the object is locked. Thus, if PG_WRITEABLE + * If the page is not VPO_BUSY, then PGA_WRITEABLE cannot be set by + * another thread while the object is locked. Thus, if PGA_WRITEABLE * is clear, no page table entries need updating. */ VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); if ((m->oflags & VPO_BUSY) == 0 && - (m->flags & PG_WRITEABLE) == 0) + (m->aflags & PGA_WRITEABLE) == 0) return; vm_page_lock_queues(); pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); @@ -4370,7 +4370,7 @@ } PMAP_UNLOCK(pmap); } - vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_aflag_clear(m, PGA_WRITEABLE); vm_page_unlock_queues(); } @@ -4478,11 +4478,11 @@ ("pmap_clear_modify: page %p is busy", m)); /* - * If the page is not PG_WRITEABLE, then no PTEs can have PG_M set. + * If the page is not PGA_WRITEABLE, then no PTEs can have PG_M set. * If the object containing the page is locked and the page is not - * VPO_BUSY, then PG_WRITEABLE cannot be concurrently set. + * VPO_BUSY, then PGA_WRITEABLE cannot be concurrently set. */ - if ((m->flags & PG_WRITEABLE) == 0) + if ((m->aflags & PGA_WRITEABLE) == 0) return; vm_page_lock_queues(); pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); ==== //depot/projects/soc2010/extfs/amd64/amd64/trap.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.354 2011/04/08 14:39:41 rstone Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.358 2011/10/03 17:01:31 kib Exp $"); /* * AMD64 Trap and System call handling @@ -674,6 +674,19 @@ goto nogo; map = &vm->vm_map; + + /* + * When accessing a usermode address, kernel must be + * ready to accept the page fault, and provide a + * handling routine. Since accessing the address + * without the handler is a bug, do not try to handle + * it normally, and panic immediately. + */ + if (!usermode && (td->td_intr_nesting_level != 0 || + PCPU_GET(curpcb)->pcb_onfault == NULL)) { + trap_fatal(frame, eva); + return (-1); + } } /* @@ -883,41 +896,37 @@ return (error); } +#include "../../kern/subr_syscall.c" + /* * syscall - system call request C handler * * A system call is essentially treated as a trap. */ void -syscall(struct trapframe *frame) +amd64_syscall(struct thread *td, int traced) { - struct thread *td; struct syscall_args sa; - register_t orig_tf_rflags; int error; ksiginfo_t ksi; #ifdef DIAGNOSTIC - if (ISPL(frame->tf_cs) != SEL_UPL) { + if (ISPL(td->td_frame->tf_cs) != SEL_UPL) { panic("syscall"); /* NOT REACHED */ } #endif - orig_tf_rflags = frame->tf_rflags; - td = curthread; - td->td_frame = frame; - error = syscallenter(td, &sa); /* * Traced syscall. */ - if (orig_tf_rflags & PSL_T) { - frame->tf_rflags &= ~PSL_T; + if (__predict_false(traced)) { + td->td_frame->tf_rflags &= ~PSL_T; ksiginfo_init_trap(&ksi); ksi.ksi_signo = SIGTRAP; ksi.ksi_code = TRAP_TRACE; - ksi.ksi_addr = (void *)frame->tf_rip; + ksi.ksi_addr = (void *)td->td_frame->tf_rip; trapsignal(td, &ksi); } ==== //depot/projects/soc2010/extfs/amd64/conf/GENERIC#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.567 2011/08/26 21:22:34 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.569 2011/10/04 21:40:25 delphij Exp $ cpu HAMMER ident GENERIC @@ -151,6 +151,7 @@ #XXX pointer/int warnings #device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID +device tws # LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller @@ -326,7 +327,7 @@ device upgt # Conexant/Intersil PrismGT wireless NICs. device ural # Ralink Technology RT2500USB wireless NICs device urtw # Realtek RTL8187B/L wireless NICs -device zyd # ZyDAS zb1211/zb1211b wireless NICs +device zyd # ZyDAS zd1211/zd1211b wireless NICs # FireWire support device firewire # FireWire bus code ==== //depot/projects/soc2010/extfs/amd64/ia32/ia32_syscall.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.24 2011/04/01 11:16:29 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.25 2011/09/11 16:05:09 kib Exp $"); /* * 386 Trap and System call handling @@ -163,6 +163,8 @@ return (error); } +#include "../../kern/subr_syscall.c" + void ia32_syscall(struct trapframe *frame) { ==== //depot/projects/soc2010/extfs/amd64/include/md_var.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 8 10:52:31 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 150341065673; Sat, 8 Oct 2011 10:52:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBBB9106566C for ; Sat, 8 Oct 2011 10:52:30 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8159F8FC13 for ; Sat, 8 Oct 2011 10:52:30 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p98AqU5I056121 for ; Sat, 8 Oct 2011 10:52:30 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p98AqUkg056118 for perforce@freebsd.org; Sat, 8 Oct 2011 10:52:30 GMT (envelope-from lz@FreeBSD.org) Date: Sat, 8 Oct 2011 10:52:30 GMT Message-Id: <201110081052.p98AqUkg056118@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 199901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2011 10:52:31 -0000 http://p4web.freebsd.org/@@199901?ac=10 Change 199901 by lz@freebsd-dev on 2011/10/08 10:52:25 IFC. Affected files ... .. //depot/projects/soc2010/extfs/security/mac_mls/mac_mls.c#3 integrate Differences ... ==== //depot/projects/soc2010/extfs/security/mac_mls/mac_mls.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.115 2011/09/02 17:40:39 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.116 2011/10/08 09:14:18 brueffer Exp $ */ /* @@ -1636,9 +1636,6 @@ subj = SLOT(cred->cr_label); obj = SLOT(shmlabel); - subj = SLOT(cred->cr_label); - obj = SLOT(shmlabel); - if (accmode & (VREAD | VEXEC | VSTAT_PERMS)) { if (!mls_dominate_effective(subj, obj)) return (EACCES);