Conflict handling

name

-Copyright (c) 1996-2010 Wolfram Schneider
+Copyright (c) 1996-2011 Wolfram Schneider
 Copyright (c) 1993-1995 Berkeley Software Design, Inc.
 
 This data is part of a licensed program from BERKELEY SOFTWARE

==== //depot/projects/docproj_nl/www/en/cgi/mid.cgi#4 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -T
 #
-# Copyright (c) March 1998-2010 Wolfram Schneider . Berlin.
+# Copyright (c) March 1998-2011 Wolfram Schneider . Berlin.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 #
 # Search a mail by Message-ID, References or In-Reply-To field
 #
-# $FreeBSD: www/en/cgi/mid.cgi,v 1.18 2009/12/31 16:37:18 wosch Exp $
+# $FreeBSD: www/en/cgi/mid.cgi,v 1.19 2011/01/08 14:58:27 wosch Exp $
 
 require "./cgi-lib.pl";
 require "./cgi-style.pl";

==== //depot/projects/docproj_nl/www/en/cgi/mirror.cgi#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# (c) 1996-2010 Wolfram Schneider. Public domain.
+# (c) 1996-2011 Wolfram Schneider. Public domain.
 #
 # FreeBSD WWW mirror redirect
 #

==== //depot/projects/docproj_nl/www/en/cgi/missing_handler.cgi#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# Copyright (c) July 1997-2010. Wolfram Schneider 
+# Copyright (c) July 1997-2011. Wolfram Schneider 
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,7 @@
 #
 #     _________________________________________________________________
 #
-# $FreeBSD: www/en/cgi/missing_handler.cgi,v 1.20 2009/12/31 16:37:18 wosch Exp $
+# $FreeBSD: www/en/cgi/missing_handler.cgi,v 1.21 2011/01/08 14:58:27 wosch Exp $
 # ----------------------------------------------------------------------
 
 sub escape($) { $_ = $_[0]; s/&/&/g; s//>/g; $_; }

==== //depot/projects/docproj_nl/www/en/cgi/pds.cgi#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# Copyright (c) 1997-2010 Wolfram Schneider , Berlin.
+# Copyright (c) 1997-2011 Wolfram Schneider , Berlin.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 # pds.cgi - FreeBSD Ports download sources cgi script
 #	    print a list of source files for a port
 #
-# $FreeBSD: www/en/cgi/pds.cgi,v 1.13 2009/12/31 16:37:18 wosch Exp $
+# $FreeBSD: www/en/cgi/pds.cgi,v 1.14 2011/01/08 14:58:27 wosch Exp $
 
 sub escape($) { $_ = $_[0]; s/&/&/g; s//>/g; $_; }
 

==== //depot/projects/docproj_nl/www/en/cgi/ports.cgi#6 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -T
 #
-# Copyright (c) 1996-2010 Wolfram Schneider 
+# Copyright (c) 1996-2011 Wolfram Schneider 
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: www/en/cgi/ports.cgi,v 1.100 2010/12/29 12:48:29 wosch Exp $
+# $FreeBSD: www/en/cgi/ports.cgi,v 1.101 2011/01/08 14:58:27 wosch Exp $
 #
 # ports.cgi - search engine for FreeBSD ports
 #             	o search for a port by name or description
@@ -515,10 +515,10 @@
 
     print qq{
 
-© 1996-2010 by Wolfram Schneider. All rights reserved.

+© 1996-2011 by Wolfram Schneider. All rights reserved.

 };
 
-#print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.100 2010/12/29 12:48:29 wosch Exp $} . "
\n";
+#print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.101 2011/01/08 14:58:27 wosch Exp $} . "
\n";
     print qq{Please direct questions about this service to
 $mailto
\n};
     print qq{General questions about FreeBSD ports should be sent to }

==== //depot/projects/docproj_nl/www/en/cgi/url.cgi#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -T
 #
-# Copyright (c) Oct 1997-1999 Wolfram Schneider . Berlin.
+# Copyright (c) Oct 1997-2011 Wolfram Schneider . Berlin.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 #
 # url.cgi - make plain text URLs clickable
 #
-# $FreeBSD: www/en/cgi/url.cgi,v 1.37 2010/08/28 19:15:22 wosch Exp $
+# $FreeBSD: www/en/cgi/url.cgi,v 1.38 2011/01/08 14:58:27 wosch Exp $
 
 use strict;
 

==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#38 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
  %developers;
@@ -2823,6 +2823,18 @@
      fjoe 
      received 
   
+
+  
+     Anton Shterenlikht 
+     1x Asus WL-107g (Ralink RT2560 + RT2525, ral(4))

+         1x MSI CB54G2 (Ralink RT2560 + RT2525, ral(4))

+         1x Sitecom WL-112 (Ralink RT2560 + RT2525, ral(4))

+         1x Zonet ZEW1500 (PRISM GT/ISL3890, no driver)

+         1x Linksys WPC11v4 (Realtek RTL8180L, no driver)
+     bschmidt 
+     received 
+  
+
 
 
 &footer;

==== //depot/projects/docproj_nl/www/en/gnome/docs/gnome1_porting.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -52,12 +52,6 @@
 			
 
 			
-			  glibwww
-			  www/glibwww
-			  gnomelibs
-			
-
-			
 			  gnomecanvas
 			  graphics/gnomecanvas
 			  gnomelibs gdkpixbuf
@@ -94,24 +88,12 @@
 			
 
 			
-			  gtkhtml
-			  www/gtkhtml
-			  glibwww gal libghttp libcapplet
-			
-
-			
 			  imlib
 			  graphics/imlib
 			  gtk12
 			
 
 			
-			  libcapplet
-			  x11/libcapplet
-			  gnomelibs
-			
-
-			
 			  libgda
 			  databases/libgda
 			  gconf bonobo
@@ -148,12 +130,6 @@
 			
 
 			
-			  pygnome
-			  x11-toolkits/py-gnome
-			  gtkhtml pygtk
-			
-
-			
 			  pygtk
 			  x11-toolkits/py-gtk
 			  gnomelibs gdkpixbuf libglade

==== //depot/projects/docproj_nl/www/en/index.xsl#7 (text+ko) ====

@@ -4,7 +4,7 @@
 
 ]>
 
-
+
 
 
   
@@ -334,7 +334,7 @@
 			  
 			    	
 				  
-				    More
+				    More
 				  
 				  
 				    

==== //depot/projects/docproj_nl/www/en/releases/index.sgml#12 (text+ko) ====

@@ -1,10 +1,10 @@
 
-
+
 
 
 ]>
-
+
 
 
 &header;
@@ -250,7 +250,7 @@
 	
       
 
-      4.11 (Jan, 2005)
+      
4.11 (January, 2005)
 	
 	  Announcement:
 	  Release Notes:

==== //depot/projects/docproj_nl/www/en/security/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/security/Makefile,v 1.17 2008/06/20 20:03:28 danger Exp $
+# $FreeBSD: www/en/security/Makefile,v 1.18 2011/01/04 20:14:36 jkois Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -11,21 +11,30 @@
 DOCS=	charter.sgml
 DOCS+=	security.sgml
 DOCS+=	advisories.sgml
+DOCS+=  notices.sgml
 
 advisories.sgml: advisories.html.inc
 
+notices.sgml: notices.html.inc
+
 INDEXLINK=	security.html
 
-security.html: advisories.html.inc advisories.rdf
-
 DEPENDSET.DEFAULT=	advisories
 DEPENDSET.errata-rss=	notices
+DEPENDSET.notices=	notices
 XML.DEFAULT=		${XML_ADVISORIES}
 
 XMLDOCS=	advisories:mkindex.xsl::advisories.html.inc
+PARAMS.advisories=	--param type "'advisory'"
 NO_DATA.advisories=	yes
 NO_TIDY.advisories=	yes
 
+XMLDOCS+=	notices:mkindex.xsl::notices.html.inc
+PARAMS.notices=		--param advisories.xml "'${XML_NOTICES}'"
+PARAMS.notices+=	--param type "'notice'"
+NO_DATA.notices=	yes
+NO_TIDY.notices=	yes
+
 XMLDOCS+=	advisories-rdf:security-rdf.xsl::advisories.rdf
 XMLDOCS+=	advisories-rss:security-rss.xsl::rss.xml
 XMLDOCS+=	errata-rss:errata-rss.xsl::errata.xml

==== //depot/projects/docproj_nl/www/en/security/mkindex.xsl#2 (text+ko) ====

@@ -5,7 +5,7 @@
 
 ]>
 
-
+
 
 
   
@@ -16,6 +16,7 @@
   
     
        
+       
     
   
 

==== //depot/projects/docproj_nl/www/en/security/security.sgml#16 (text+ko) ====

@@ -1,12 +1,11 @@
 
-
+
 
 
  %developers;
-
 ]>
-
+
 
 
   &header;
@@ -32,6 +31,7 @@
   
     Charter for the Security Officer and Team
     List of FreeBSD Security Advisories
+    List of FreeBSD Errata Notices
     
         Reading FreeBSD Security Advisories
   
@@ -318,6 +318,126 @@
       href="http://security.FreeBSD.org/patches/">patches
     subdirectories.
 
+  
+  Unsupported FreeBSD Releases
+
+  The following releases are no longer supported but are listed
+    here for reference purposes.
+  
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+    
+  Branch Release Type Release Date EoL
RELENG_4 n/a n/a n/a January 31, 2007
RELENG_4_11 4.11-RELEASE Extended January 25, 2005 January 31, 2007
RELENG_5 n/a n/a n/a May 31, 2008
RELENG_5_3 5.3-RELEASE Extended November 6, 2004 October 31, 2006
RELENG_5_4 5.4-RELEASE Normal May 9, 2005 October 31, 2006
RELENG_5_5 5.5-RELEASE Extended May 25, 2006 May 31, 2008
RELENG_6 n/a n/a n/a November 30, 2010
RELENG_6_0 6.0-RELEASE Normal November 4, 2005 January 31, 2007
RELENG_6_1 6.1-RELEASE Extended May 9, 2006 May 31, 2008
RELENG_6_2 6.2-RELEASE Normal January 15, 2007 May 31, 2008
RELENG_6_3 6.3-RELEASE Extended January 18, 2008 January 31, 2010
RELENG_6_4 6.4-RELEASE Extended November 28, 2008 November 30, 2010
RELENG_7_0 7.0-RELEASE Normal February 27, 2008 April 30, 2009
RELENG_7_2 7.2-RELEASE Normal May 4, 2009 June 30, 2010
RELENG_8_0 8.0-RELEASE Normal November 25, 2009 November 30, 2010
+
   &footer;
 
 

==== //depot/projects/docproj_nl/www/nl/where.sgml#25 (text+ko) ====

@@ -1,5 +1,5 @@
 
+
 
 
 

==== //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#21 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
-
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.61 2010/10/23 19:19:59 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.62 2011/01/04 19:05:02 jkois Exp $
     
   
 
@@ -190,6 +190,17 @@
     
   
 
+  
+    Midland Computers
+    http://www.midlandcomputers.com/
+    
+      Midland Computers is a UK based FreeBSD hosting provider.  We
+      offer hosting solutions ranging from shared hosting to
+      dedicated servers, all running FreeBSD and we run our own secure
+      data center.
+    
+  
+
   
     Hostpoint AG
     http://www.hostpoint.ch/

==== //depot/projects/docproj_nl/www/share/sgml/libcommon.xsl#9 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
-
+
 
 
         
           
+          
           
           
         
       
 
       
-	
-
-	  
-
-	  
-	    
-	    
-	    
-	  
-
-	  
-	    
-	  
-	
-
 	
-	  
+	  
+	  
 	  
 	  
 	
@@ -798,12 +782,13 @@
 
   
     
+    
     
     
 
     
       
-        
+        
           
           

==== //depot/projects/docproj_nl/www/share/sgml/navibar.ent#9 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 Security Information
     
       Advisories
+      Errata Notices
     
     Bug Reports
       
From trasz at FreeBSD.org  Sat Jan 15 12:50:59 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sat Jan 15 12:51:00 2011
Subject: PERFORCE change 187838 for review
Message-ID: <201101151250.p0FCowKr022780@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@187838?ac=10

Change 187838 by trasz@trasz_victim on 2011/01/15 12:50:18

	Use FEATURE().

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#52 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#8 edit
.. //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#7 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#52 (text+ko) ====

@@ -62,6 +62,8 @@
 
 #ifdef CONTAINERS
 
+FEATURE(containers, "Resource Containers");
+
 static struct mtx container_lock;
 MTX_SYSINIT(container_lock, &container_lock, "container lock", MTX_DEF);
 

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#8 (text+ko) ====

@@ -63,13 +63,15 @@
 #error "The RCTL option requires the CONTAINERS option"
 #endif
 
+FEATURE(rctl, "Resource Limits");
+
 #define	HRF_DEFAULT		0
 #define	HRF_DONT_INHERIT	1
 #define	HRF_DONT_ACCUMULATE	2
 
 /* Default buffer size for rctl_get_rules(2). */
 #define	RCTL_DEFAULT_BUFSIZE	4096
-#define	RCTL_LOG_BUFSIZE		128
+#define	RCTL_LOG_BUFSIZE	128
 
 /*
  * 'rctl_rule_link' connects a rule with every container it's related to.

==== //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#7 (text+ko) ====

@@ -49,6 +49,12 @@
 [  "$wait" ">" 0 ] || wait="0"
 [  "$count" ">" 0 ] || count="0"
 
+sysctl kern.features.rctl > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+	echo "no RCTL support in the kernel" 2>&1
+	exit 1
+fi
+
 n=0
 while :; do
 	if [ "`basename $0`" = "jailstat" ]; then
From trasz at FreeBSD.org  Sun Jan 16 14:45:08 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Jan 16 14:45:10 2011
Subject: PERFORCE change 187860 for review
Message-ID: <201101161445.p0GEj7H6048739@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@187860?ac=10

Change 187860 by trasz@trasz_victim on 2011/01/16 14:44:46

	When credential changes, the per-process list of applicable RCTL rules
	needs to be updated, which requires memory allocation.  We can't return
	error there, so M_NOWAIT cannot be used.  Rework this piece of code
	so that we use M_WAITOK.  It cannot be called with proc lock held,
	so it cannot be called from change_cred().  Thus, retire change_cred()
	altogether.
	
	This was probably the last large known problem with rctl.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/fs/unionfs/union_subr.c#12 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#53 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exec.c#23 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#31 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#26 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#32 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#9 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/container.h#21 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#3 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/ucred.h#11 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/fs/unionfs/union_subr.c#12 (text+ko) ====

@@ -775,6 +775,11 @@
 	/* Authority change to root */
 	rootinfo = uifind((uid_t)0);
 	cred = crdup(cnp->cn_cred);
+	/*
+	 * The calls to chgproccnt() are needed to compensate for change_ruid()
+	 * calling chgproccnt().
+	 */
+	chgproccnt(cred->cr_ruidinfo, 1, 0);
 	change_euid(cred, rootinfo);
 	change_ruid(cred, rootinfo);
 	change_svuid(cred, (uid_t)0);
@@ -824,6 +829,7 @@
 
 unionfs_mkshadowdir_abort:
 	cnp->cn_cred = credbk;
+	chgproccnt(cred->cr_ruidinfo, -1, 0);
 	crfree(cred);
 
 	return (error);

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#53 (text+ko) ====

@@ -623,24 +623,25 @@
 }
 
 /*
- * Called before credentials change, to move resource utilisation
+ * Called after credentials change, to move resource utilisation
  * between containers.
  */
 void
-container_proc_ucred_changing(struct proc *p, struct ucred *newcred)
+container_proc_ucred_changed(struct proc *p, struct ucred *oldcred,
+    struct ucred *newcred)
 {
 	struct uidinfo *olduip, *newuip;
 	struct loginclass *oldlc, *newlc;
 	struct prison *oldpr, *newpr, *pr;
 
-	PROC_LOCK_ASSERT(p, MA_OWNED);
+	PROC_LOCK_ASSERT(p, MA_NOTOWNED);
 
 	newuip = newcred->cr_ruidinfo;
-	olduip = p->p_ucred->cr_ruidinfo;
+	olduip = oldcred->cr_ruidinfo;
 	newlc = newcred->cr_loginclass;
-	oldlc = p->p_ucred->cr_loginclass;
+	oldlc = oldcred->cr_loginclass;
 	newpr = newcred->cr_prison;
-	oldpr = p->p_ucred->cr_prison;
+	oldpr = oldcred->cr_prison;
 
 	mtx_lock(&container_lock);
 	if (newuip != olduip) {
@@ -660,7 +661,7 @@
 	mtx_unlock(&container_lock);
 
 #ifdef RCTL
-	rctl_proc_ucred_changing(p, newcred);
+	rctl_proc_ucred_changed(p, newcred);
 #endif
 }
 

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_exec.c#23 (text+ko) ====

@@ -698,7 +698,7 @@
 		 */
 		change_svuid(newcred, newcred->cr_uid);
 		change_svgid(newcred, newcred->cr_gid);
-		change_cred(p, newcred);
+		p->p_ucred = newcred;
 		newcred = NULL;
 	} else {
 		if (oldcred->cr_uid == oldcred->cr_ruid &&
@@ -720,7 +720,7 @@
 		    oldcred->cr_svgid != oldcred->cr_gid) {
 			change_svuid(newcred, newcred->cr_uid);
 			change_svgid(newcred, newcred->cr_gid);
-			change_cred(p, newcred);
+			p->p_ucred = newcred;
 			newcred = NULL;
 		}
 	}

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#31 (text+ko) ====

@@ -2294,8 +2294,11 @@
 	setsugid(p);
 	crcopy(newcred, oldcred);
 	newcred->cr_prison = pr;
-	change_cred(p, newcred);
+	p->p_ucred = newcred;
 	PROC_UNLOCK(p);
+#ifdef CONTAINERS
+	container_proc_ucred_changed(p, oldcred, newcred);
+#endif
 	crfree(oldcred);
 	prison_deref(ppr, PD_DEREF | PD_DEUREF);
 	return (0);

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#26 (text+ko) ====

@@ -202,8 +202,11 @@
 	PROC_LOCK(p);
 	oldcred = crcopysafe(p, newcred);
 	newcred->cr_loginclass = newlc;
-	change_cred(p, newcred);
+	p->p_ucred = newcred;
 	PROC_UNLOCK(p);
+#ifdef CONTAINERS
+	container_proc_ucred_changed(p, oldcred, newcred);
+#endif
 
 	loginclass_release(oldcred->cr_loginclass);
 	crfree(oldcred);

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#32 (text+ko) ====

@@ -578,8 +578,11 @@
 		change_euid(newcred, uip);
 		setsugid(p);
 	}
-	change_cred(p, newcred);
+	p->p_ucred = newcred;
 	PROC_UNLOCK(p);
+#ifdef CONTAINERS
+	container_proc_ucred_changed(p, oldcred, newcred);
+#endif
 	uifree(uip);
 	crfree(oldcred);
 	return (0);
@@ -634,7 +637,7 @@
 		change_euid(newcred, euip);
 		setsugid(p);
 	}
-	change_cred(p, newcred);
+	p->p_ucred = newcred;
 	PROC_UNLOCK(p);
 	uifree(euip);
 	crfree(oldcred);
@@ -734,7 +737,7 @@
 		change_egid(newcred, gid);
 		setsugid(p);
 	}
-	change_cred(p, newcred);
+	p->p_ucred = newcred;
 	PROC_UNLOCK(p);
 	crfree(oldcred);
 	return (0);
@@ -780,7 +783,7 @@
 		change_egid(newcred, egid);
 		setsugid(p);
 	}
-	change_cred(p, newcred);
+	p->p_ucred = newcred;
 	PROC_UNLOCK(p);
 	crfree(oldcred);
 	return (0);
@@ -853,7 +856,7 @@
 		crsetgroups_locked(newcred, ngrp, groups);
 	}
 	setsugid(p);
-	change_cred(p, newcred);
+	p->p_ucred = newcred;
 	PROC_UNLOCK(p);
 	crfree(oldcred);
 	return (0);
@@ -916,8 +919,11 @@
 		change_svuid(newcred, newcred->cr_uid);
 		setsugid(p);
 	}
-	change_cred(p, newcred);
+	p->p_ucred = newcred;
 	PROC_UNLOCK(p);
+#ifdef CONTAINERS
+	container_proc_ucred_changed(p, oldcred, newcred);
+#endif
 	uifree(ruip);
 	uifree(euip);
 	crfree(oldcred);
@@ -980,7 +986,7 @@
 		change_svgid(newcred, newcred->cr_groups[0]);
 		setsugid(p);
 	}
-	change_cred(p, newcred);
+	p->p_ucred = newcred;
 	PROC_UNLOCK(p);
 	crfree(oldcred);
 	return (0);
@@ -1054,8 +1060,11 @@
 		change_svuid(newcred, suid);
 		setsugid(p);
 	}
-	change_cred(p, newcred);
+	p->p_ucred = newcred;
 	PROC_UNLOCK(p);
+#ifdef CONTAINERS
+	container_proc_ucred_changed(p, oldcred, newcred);
+#endif
 	uifree(ruip);
 	uifree(euip);
 	crfree(oldcred);
@@ -1130,7 +1139,7 @@
 		change_svgid(newcred, sgid);
 		setsugid(p);
 	}
-	change_cred(p, newcred);
+	p->p_ucred = newcred;
 	PROC_UNLOCK(p);
 	crfree(oldcred);
 	return (0);
@@ -2116,26 +2125,6 @@
 		p->p_stops = 0;
 }
 
-/*
- * Assign new credential to the process, fixing up RCTL accounting
- * as neccessary.
- */
-void
-change_cred(struct proc *p, struct ucred *newcred)
-{
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-
-	if (p->p_ucred->cr_ruidinfo != newcred->cr_ruidinfo) {
-		chgproccnt(p->p_ucred->cr_ruidinfo, -1, 0);
-		chgproccnt(newcred->cr_ruidinfo, 1, 0);
-	}
-
-#ifdef CONTAINERS
-	container_proc_ucred_changing(p, newcred);
-#endif
-	p->p_ucred = newcred;
-}
-
 /*-
  * Change a process's effective uid.
  * Side effects: newcred->cr_uid and newcred->cr_uidinfo will be modified.
@@ -2177,10 +2166,12 @@
 change_ruid(struct ucred *newcred, struct uidinfo *ruip)
 {
 
+	(void)chgproccnt(newcred->cr_ruidinfo, -1, 0);
 	newcred->cr_ruid = ruip->ui_uid;
 	uihold(ruip);
 	uifree(newcred->cr_ruidinfo);
 	newcred->cr_ruidinfo = ruip;
+	(void)chgproccnt(newcred->cr_ruidinfo, 1, 0);
 }
 
 /*-

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#9 (text+ko) ====

@@ -1414,82 +1414,145 @@
 	return (error);
 }
 
+/*
+ * Update RCTL rule list after credential change.
+ */
 void
-rctl_proc_ucred_changing(struct proc *p, struct ucred *newcred)
+rctl_proc_ucred_changed(struct proc *p, struct ucred *newcred)
 {
-	int error;
-	struct rctl_rule_link *link;
-	struct uidinfo *olduip, *newuip;
-	struct loginclass *oldlc, *newlc;
-	struct prison *oldpr, *newpr;
+	int rulecnt, i;
+	struct rctl_rule_link *link, *newlink;
+	struct uidinfo *newuip;
+	struct loginclass *newlc;
+	struct prison *newpr;
+	LIST_HEAD(, rctl_rule_link) newrules;
 
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-
 	newuip = newcred->cr_ruidinfo;
-	olduip = p->p_ucred->cr_ruidinfo;
 	newlc = newcred->cr_loginclass;
-	oldlc = p->p_ucred->cr_loginclass;
 	newpr = newcred->cr_prison;
-	oldpr = p->p_ucred->cr_prison;
+	
+	LIST_INIT(&newrules);
 
+again:
 	/*
-	 * Remove rules that are no longer applicable with the new ucred.
+	 * First, count the rules that apply to the process with new
+	 * credentials.
 	 */
-	rw_wlock(&rctl_lock);
+	rulecnt = 0;
+	rw_rlock(&rctl_lock);
 	LIST_FOREACH(link, &p->p_container.c_rule_links, rctl_next) {
-		switch (link->rctl_rule->hr_subject_type) {
-		case RCTL_SUBJECT_TYPE_PROCESS:
-			continue;
-		case RCTL_SUBJECT_TYPE_USER:
-			if (newuip == olduip)
-				continue;
-			break;
-		case RCTL_SUBJECT_TYPE_LOGINCLASS:
-			if (newlc == oldlc)
-				continue;
-			break;
-		case RCTL_SUBJECT_TYPE_JAIL:
-			if (newpr == oldpr)
-				continue;
-			break;
-		default:
-			panic("rctl_proc_ucred_changing: unknown subject %d",
-			    link->rctl_rule->hr_subject_type);
-		}
+		if (link->rctl_rule->hr_subject_type ==
+		    RCTL_SUBJECT_TYPE_PROCESS)
+			rulecnt++;
+	}
+	LIST_FOREACH(link, &newuip->ui_container.c_rule_links, rctl_next)
+		rulecnt++;
+	LIST_FOREACH(link, &newlc->lc_container.c_rule_links, rctl_next)
+		rulecnt++;
+	LIST_FOREACH(link, &newpr->pr_container.c_rule_links, rctl_next)
+		rulecnt++;
+	rw_runlock(&rctl_lock);
 
-		LIST_REMOVE(link, rctl_next);
-		rctl_rule_release(link->rctl_rule);
-		uma_zfree(rctl_rule_link_zone, link);
+	/*
+	 * Create temporary list.  We've dropped the rctl_lock in order
+	 * to use M_WAITOK.
+	 */
+	for (i = 0; i < rulecnt; i++) {
+		newlink = uma_zalloc(rctl_rule_link_zone, M_WAITOK);
+		newlink->rctl_rule = NULL;
+		LIST_INSERT_HEAD(&newrules, newlink, rctl_next);
 	}
-	rw_wunlock(&rctl_lock);
-	
+
+	newlink = LIST_FIRST(&newrules);
+
 	/*
-	 * Add rules for the new ucred and move between containers where applicable.
+	 * Assign rules to the newly allocated list entries.
 	 */
-	if (newuip != olduip) {
-		rw_wlock(&rctl_lock);
-		LIST_FOREACH(link, &newuip->ui_container.c_rule_links, rctl_next) {
-			error = rctl_container_add_rule_locked(&p->p_container, link->rctl_rule);
-			KASSERT(error == 0, ("XXX: better error handling needed"));
+	rw_wlock(&rctl_lock);
+	LIST_FOREACH(link, &p->p_container.c_rule_links, rctl_next) {
+		if (link->rctl_rule->hr_subject_type ==
+		    RCTL_SUBJECT_TYPE_PROCESS) {
+			if (newlink == NULL)
+				goto goaround;
+			rctl_rule_acquire(link->rctl_rule);
+			newlink->rctl_rule = link->rctl_rule;
+			newlink = LIST_NEXT(newlink, rctl_next);
+			rulecnt--;
 		}
-		rw_wunlock(&rctl_lock);
+	}
+	
+	LIST_FOREACH(link, &newuip->ui_container.c_rule_links, rctl_next) {
+		if (newlink == NULL)
+			goto goaround;
+		rctl_rule_acquire(link->rctl_rule);
+		newlink->rctl_rule = link->rctl_rule;
+		newlink = LIST_NEXT(newlink, rctl_next);
+		rulecnt--;
+	}
+
+	LIST_FOREACH(link, &newlc->lc_container.c_rule_links, rctl_next) {
+		if (newlink == NULL)
+			goto goaround;
+		rctl_rule_acquire(link->rctl_rule);
+		newlink->rctl_rule = link->rctl_rule;
+		newlink = LIST_NEXT(newlink, rctl_next);
+		rulecnt--;
+	}
+
+	LIST_FOREACH(link, &newpr->pr_container.c_rule_links, rctl_next) {
+		if (newlink == NULL)
+			goto goaround;
+		rctl_rule_acquire(link->rctl_rule);
+		newlink->rctl_rule = link->rctl_rule;
+		newlink = LIST_NEXT(newlink, rctl_next);
+		rulecnt--;
 	}
-	if (newlc != oldlc) {
-		rw_wlock(&rctl_lock);
-		LIST_FOREACH(link, &newlc->lc_container.c_rule_links, rctl_next) {
-			error = rctl_container_add_rule_locked(&p->p_container, link->rctl_rule);
-			KASSERT(error == 0, ("XXX: better error handling needed"));
+
+	if (rulecnt == 0) {
+		/*
+		 * Free the old rule list.
+		 */
+		while (!LIST_EMPTY(&p->p_container.c_rule_links)) {
+			link = LIST_FIRST(&p->p_container.c_rule_links);
+			LIST_REMOVE(link, rctl_next);
+			rctl_rule_release(link->rctl_rule);
+			uma_zfree(rctl_rule_link_zone, link);
+		}
+
+		/*
+		 * Replace lists and we're done.
+		 *
+		 * XXX: Is there any way to switch list heads instead
+		 *      of iterating here?
+		 */
+		while (!LIST_EMPTY(&newrules)) {
+			newlink = LIST_FIRST(&newrules);
+			LIST_REMOVE(newlink, rctl_next);
+			LIST_INSERT_HEAD(&p->p_container.c_rule_links,
+			    newlink, rctl_next);
 		}
+
 		rw_wunlock(&rctl_lock);
+
+		return;
 	}
-	if (newpr != oldpr) {
-		rw_wlock(&rctl_lock);
-		LIST_FOREACH(link, &newpr->pr_container.c_rule_links, rctl_next) {
-			error = rctl_container_add_rule_locked(&p->p_container, link->rctl_rule);
-			KASSERT(error == 0, ("XXX: better error handling needed"));
-		}
-		rw_wunlock(&rctl_lock);
+
+goaround:
+	rw_wunlock(&rctl_lock);
+
+	/*
+	 * Rule list changed while we were not holding the rctl_lock.
+	 * Free the new list and try again.
+	 */
+	while (!LIST_EMPTY(&newrules)) {
+		newlink = LIST_FIRST(&newrules);
+		LIST_REMOVE(newlink, rctl_next);
+		if (newlink->rctl_rule != NULL)
+			rctl_rule_release(newlink->rctl_rule);
+		uma_zfree(rctl_rule_link_zone, newlink);
 	}
+
+	goto again;
 }
 
 /*

==== //depot/projects/soc2009/trasz_limits/sys/sys/container.h#21 (text+ko) ====

@@ -109,6 +109,7 @@
 int	container_proc_fork(struct proc *parent, struct proc *child);
 void	container_proc_exit(struct proc *p);
 
-void	container_proc_ucred_changing(struct proc *p, struct ucred *newcred);
+void	container_proc_ucred_changed(struct proc *p, struct ucred *oldcred,
+	    struct ucred *newcred);
 
 #endif /* !_CONTAINER_H_ */

==== //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#3 (text+ko) ====

@@ -110,7 +110,7 @@
 
 #ifdef _KERNEL
 
-void	rctl_proc_ucred_changing(struct proc *p, struct ucred *newcred);
+void	rctl_proc_ucred_changed(struct proc *p, struct ucred *newcred);
 
 struct rctl_rule	*rctl_rule_alloc(int flags);
 struct rctl_rule	*rctl_rule_duplicate(const struct rctl_rule *rule, int flags);

==== //depot/projects/soc2009/trasz_limits/sys/sys/ucred.h#11 (text+ko) ====

@@ -91,7 +91,6 @@
 struct thread;
 struct proc;
 
-void	change_cred(struct proc *p, struct ucred *newcred);
 void	change_egid(struct ucred *newcred, gid_t egid);
 void	change_euid(struct ucred *newcred, struct uidinfo *euip);
 void	change_rgid(struct ucred *newcred, gid_t rgid);
From trasz at FreeBSD.org  Sun Jan 16 14:51:41 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Jan 16 14:51:43 2011
Subject: PERFORCE change 187861 for review
Message-ID: <201101161451.p0GEpejR050617@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@187861?ac=10

Change 187861 by trasz@trasz_victim on 2011/01/16 14:50:56

	Update TODO.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/TODO#39 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/TODO#39 (text+ko) ====

@@ -32,8 +32,6 @@
    level containers could overflow), and atomic(9) doesn't support 64 bit values
    on 32 bit platforms.
 
- - Rethink HRL locking.
-
  - Consider replacing proc pointer with thread pointer in rusage_add(9) et al.
    In most cases caller uses 'td->td_proc' anyway, and passing thread would
    allow the HRL code to send a signal to the offending thread instead of the
@@ -102,7 +100,7 @@
 
 HRL-specific issues:
 
- - Reconsider setrlimit(2) handling.
+ - Reconsider bringing back setrlimit(2) handling.
 
  - Reconsider bringing back per-group limits.
 
@@ -112,7 +110,3 @@
    if one adds rule with 'sig*' action, the signal will be sent to the parent
    instead of the child.
 
- - Add sorting to hrl(8).
-
- - Should priv(9) checking be done by HRL, or by the callers?
-
From trasz at FreeBSD.org  Sun Jan 16 17:48:02 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Jan 16 17:48:04 2011
Subject: PERFORCE change 187864 for review
Message-ID: <201101161748.p0GHm1ZB087209@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@187864?ac=10

Change 187864 by trasz@trasz_victim on 2011/01/16 17:47:36

	Fix prefixes for structure element names, broken after last renaming.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#54 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#10 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#4 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#54 (text+ko) ====

@@ -474,7 +474,7 @@
 	return (UINT64_MAX);
 #endif
 }
-	
+
 /*
  * Decrease allocation of 'resource' by 'amount' for process 'p'.
  */

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#10 (text+ko) ====

@@ -79,8 +79,8 @@
  * with uidinfo for user X, and to each process of that user.
  */
 struct rctl_rule_link {
-	LIST_ENTRY(rctl_rule_link)	rctl_next;
-	struct rctl_rule		*rctl_rule;
+	LIST_ENTRY(rctl_rule_link)	rrl_next;
+	struct rctl_rule		*rrl_rule;
 };
 
 struct dict {
@@ -216,27 +216,27 @@
 
 	rw_assert(&rctl_lock, RA_LOCKED);
 
-	resource = rule->hr_resource;
-	switch (rule->hr_per) {
+	resource = rule->rr_resource;
+	switch (rule->rr_per) {
 	case RCTL_SUBJECT_TYPE_PROCESS:
-		available = rule->hr_amount -
+		available = rule->rr_amount -
 		    p->p_container.c_resources[resource];
 		break;
 	case RCTL_SUBJECT_TYPE_USER:
-		available = rule->hr_amount -
+		available = rule->rr_amount -
 		    cred->cr_ruidinfo->ui_container.c_resources[resource];
 		break;
 	case RCTL_SUBJECT_TYPE_LOGINCLASS:
-		available = rule->hr_amount -
+		available = rule->rr_amount -
 		    cred->cr_loginclass->lc_container.c_resources[resource];
 		break;
 	case RCTL_SUBJECT_TYPE_JAIL:
-		available = rule->hr_amount -
+		available = rule->rr_amount -
 		    cred->cr_prison->pr_container.c_resources[resource];
 		break;
 	default:
 		panic("rctl_compute_available: unknown per %d",
-		    rule->hr_per);
+		    rule->rr_per);
 	}
 
 	return (available);
@@ -263,8 +263,8 @@
 	 */
 	if (available < 0) {
 #ifdef notyet
-		KASSERT(rule->hr_action != RCTL_ACTION_DENY ||
-		    !container_resource_deniable(rule->hr_resource),
+		KASSERT(rule->rr_action != RCTL_ACTION_DENY ||
+		    !container_resource_deniable(rule->rr_resource),
 		    ("rctl_would_exceed: deny rule already exceeded"));
 #endif
 		return (0);
@@ -295,14 +295,14 @@
 	 * There may be more than one matching rule; go through all of them.
 	 * Denial should be done last, after logging and sending signals.
 	 */
-	LIST_FOREACH(link, &p->p_container.c_rule_links, rctl_next) {
-		rule = link->rctl_rule;
-		if (rule->hr_resource != resource)
+	LIST_FOREACH(link, &p->p_container.c_rule_links, rrl_next) {
+		rule = link->rrl_rule;
+		if (rule->rr_resource != resource)
 			continue;
 		if (!rctl_would_exceed(p, rule, amount))
 			continue;
 
-		switch (rule->hr_action) {
+		switch (rule->rr_action) {
 		case RCTL_ACTION_DENY:
 			should_deny = 1;
 			continue;
@@ -344,7 +344,7 @@
 			continue;
 		default:
 			panic("rctl_enforce_proc: unknown action %d",
-			    rule->hr_action);
+			    rule->rr_action);
 		}
 	}
 
@@ -374,14 +374,14 @@
 	 * There may be more than one matching rule; go through all of them.
 	 * Denial should be done last, after logging and sending signals.
 	 */
-	LIST_FOREACH(link, &p->p_container.c_rule_links, rctl_next) {
-		rule = link->rctl_rule;
-		if (rule->hr_resource != resource)
+	LIST_FOREACH(link, &p->p_container.c_rule_links, rrl_next) {
+		rule = link->rrl_rule;
+		if (rule->rr_resource != resource)
 			continue;
-		if (rule->hr_action != RCTL_ACTION_DENY)
+		if (rule->rr_action != RCTL_ACTION_DENY)
 			continue;
-		if (rule->hr_amount < amount)
-			amount = rule->hr_amount;
+		if (rule->rr_amount < amount)
+			amount = rule->rr_amount;
 	}
 
 	rw_runlock(&rctl_lock);
@@ -393,58 +393,58 @@
 rctl_rule_matches(const struct rctl_rule *rule, const struct rctl_rule *filter)
 {
 
-	if (filter->hr_subject_type != RCTL_SUBJECT_TYPE_UNDEFINED) {
-		if (rule->hr_subject_type != filter->hr_subject_type)
+	if (filter->rr_subject_type != RCTL_SUBJECT_TYPE_UNDEFINED) {
+		if (rule->rr_subject_type != filter->rr_subject_type)
 			return (0);
 
-		switch (filter->hr_subject_type) {
+		switch (filter->rr_subject_type) {
 		case RCTL_SUBJECT_TYPE_PROCESS:
-			if (filter->hr_subject.hs_proc != NULL &&
-			    rule->hr_subject.hs_proc !=
-			    filter->hr_subject.hs_proc)
+			if (filter->rr_subject.rs_proc != NULL &&
+			    rule->rr_subject.rs_proc !=
+			    filter->rr_subject.rs_proc)
 				return (0);
 			break;
 		case RCTL_SUBJECT_TYPE_USER:
-			if (filter->hr_subject.hs_uip != NULL &&
-			    rule->hr_subject.hs_uip !=
-			    filter->hr_subject.hs_uip)
+			if (filter->rr_subject.rs_uip != NULL &&
+			    rule->rr_subject.rs_uip !=
+			    filter->rr_subject.rs_uip)
 				return (0);
 			break;
 		case RCTL_SUBJECT_TYPE_LOGINCLASS:
-			if (filter->hr_subject.hs_loginclass != NULL &&
-			    rule->hr_subject.hs_loginclass !=
-			    filter->hr_subject.hs_loginclass)
+			if (filter->rr_subject.hr_loginclass != NULL &&
+			    rule->rr_subject.hr_loginclass !=
+			    filter->rr_subject.hr_loginclass)
 				return (0);
 			break;
 		case RCTL_SUBJECT_TYPE_JAIL:
-			if (filter->hr_subject.hs_prison != NULL &&
-			    rule->hr_subject.hs_prison !=
-			    filter->hr_subject.hs_prison)
+			if (filter->rr_subject.rs_prison != NULL &&
+			    rule->rr_subject.rs_prison !=
+			    filter->rr_subject.rs_prison)
 				return (0);
 			break;
 		default:
 			panic("rctl_rule_matches: unknown subject type %d",
-			    filter->hr_subject_type);
+			    filter->rr_subject_type);
 		}
 	}
 
-	if (filter->hr_resource != RUSAGE_UNDEFINED) {
-		if (rule->hr_resource != filter->hr_resource)
+	if (filter->rr_resource != RUSAGE_UNDEFINED) {
+		if (rule->rr_resource != filter->rr_resource)
 			return (0);
 	}
 
-	if (filter->hr_action != RCTL_ACTION_UNDEFINED) {
-		if (rule->hr_action != filter->hr_action)
+	if (filter->rr_action != RCTL_ACTION_UNDEFINED) {
+		if (rule->rr_action != filter->rr_action)
 			return (0);
 	}
 
-	if (filter->hr_amount != RCTL_AMOUNT_UNDEFINED) {
-		if (rule->hr_amount != filter->hr_amount)
+	if (filter->rr_amount != RCTL_AMOUNT_UNDEFINED) {
+		if (rule->rr_amount != filter->rr_amount)
 			return (0);
 	}
 
-	if (filter->hr_per != RCTL_SUBJECT_TYPE_UNDEFINED) {
-		if (rule->hr_per != filter->hr_per)
+	if (filter->rr_per != RCTL_SUBJECT_TYPE_UNDEFINED) {
+		if (rule->rr_per != filter->rr_per)
 			return (0);
 	}
 
@@ -511,10 +511,10 @@
 
 	rctl_rule_acquire(rule);
 	link = uma_zalloc(rctl_rule_link_zone, M_WAITOK);
-	link->rctl_rule = rule;
+	link->rrl_rule = rule;
 
 	rw_wlock(&rctl_lock);
-	LIST_INSERT_HEAD(&container->c_rule_links, link, rctl_next);
+	LIST_INSERT_HEAD(&container->c_rule_links, link, rrl_next);
 	rw_wunlock(&rctl_lock);
 }
 
@@ -530,9 +530,9 @@
 	if (link == NULL)
 		return (ENOMEM);
 	rctl_rule_acquire(rule);
-	link->rctl_rule = rule;
+	link->rrl_rule = rule;
 
-	LIST_INSERT_HEAD(&container->c_rule_links, link, rctl_next);
+	LIST_INSERT_HEAD(&container->c_rule_links, link, rrl_next);
 	return (0);
 }
 
@@ -550,12 +550,12 @@
 
 	rw_assert(&rctl_lock, RA_WLOCKED);
 
-	LIST_FOREACH_SAFE(link, &container->c_rule_links, rctl_next, linktmp) {
-		if (!rctl_rule_matches(link->rctl_rule, filter))
+	LIST_FOREACH_SAFE(link, &container->c_rule_links, rrl_next, linktmp) {
+		if (!rctl_rule_matches(link->rrl_rule, filter))
 			continue;
 
-		LIST_REMOVE(link, rctl_next);
-		rctl_rule_release(link->rctl_rule);
+		LIST_REMOVE(link, rrl_next);
+		rctl_rule_release(link->rrl_rule);
 		uma_zfree(rctl_rule_link_zone, link);
 		removed++;
 	}
@@ -566,25 +566,25 @@
 rctl_rule_acquire_subject(struct rctl_rule *rule)
 {
 
-	switch (rule->hr_subject_type) {
+	switch (rule->rr_subject_type) {
 	case RCTL_SUBJECT_TYPE_UNDEFINED:
 	case RCTL_SUBJECT_TYPE_PROCESS:
 		break;
 	case RCTL_SUBJECT_TYPE_USER:
-		if (rule->hr_subject.hs_uip != NULL)
-			uihold(rule->hr_subject.hs_uip);
+		if (rule->rr_subject.rs_uip != NULL)
+			uihold(rule->rr_subject.rs_uip);
 		break;
 	case RCTL_SUBJECT_TYPE_LOGINCLASS:
-		if (rule->hr_subject.hs_loginclass != NULL)
-			loginclass_acquire(rule->hr_subject.hs_loginclass);
+		if (rule->rr_subject.hr_loginclass != NULL)
+			loginclass_acquire(rule->rr_subject.hr_loginclass);
 		break;
 	case RCTL_SUBJECT_TYPE_JAIL:
-		if (rule->hr_subject.hs_loginclass != NULL)
-			prison_hold(rule->hr_subject.hs_prison);
+		if (rule->rr_subject.hr_loginclass != NULL)
+			prison_hold(rule->rr_subject.rs_prison);
 		break;
 	default:
 		panic("rctl_rule_acquire_subject: unknown subject type %d",
-		    rule->hr_subject_type);
+		    rule->rr_subject_type);
 	}
 }
 
@@ -592,25 +592,25 @@
 rctl_rule_release_subject(struct rctl_rule *rule)
 {
 
-	switch (rule->hr_subject_type) {
+	switch (rule->rr_subject_type) {
 	case RCTL_SUBJECT_TYPE_UNDEFINED:
 	case RCTL_SUBJECT_TYPE_PROCESS:
 		break;
 	case RCTL_SUBJECT_TYPE_USER:
-		if (rule->hr_subject.hs_uip != NULL)
-			uifree(rule->hr_subject.hs_uip);
+		if (rule->rr_subject.rs_uip != NULL)
+			uifree(rule->rr_subject.rs_uip);
 		break;
 	case RCTL_SUBJECT_TYPE_LOGINCLASS:
-		if (rule->hr_subject.hs_loginclass != NULL)
-			loginclass_release(rule->hr_subject.hs_loginclass);
+		if (rule->rr_subject.hr_loginclass != NULL)
+			loginclass_release(rule->rr_subject.hr_loginclass);
 		break;
 	case RCTL_SUBJECT_TYPE_JAIL:
-		if (rule->hr_subject.hs_prison != NULL)
-			prison_free(rule->hr_subject.hs_prison);
+		if (rule->rr_subject.rs_prison != NULL)
+			prison_free(rule->rr_subject.rs_prison);
 		break;
 	default:
 		panic("rctl_rule_release_subject: unknown subject type %d",
-		    rule->hr_subject_type);
+		    rule->rr_subject_type);
 	}
 }
 
@@ -622,16 +622,16 @@
 	rule = uma_zalloc(rctl_rule_zone, flags);
 	if (rule == NULL)
 		return (NULL);
-	rule->hr_subject_type = RCTL_SUBJECT_TYPE_UNDEFINED;
-	rule->hr_subject.hs_proc = NULL;
-	rule->hr_subject.hs_uip = NULL;
-	rule->hr_subject.hs_loginclass = NULL;
-	rule->hr_subject.hs_prison = NULL;
-	rule->hr_per = RCTL_SUBJECT_TYPE_UNDEFINED;
-	rule->hr_resource = RUSAGE_UNDEFINED;
-	rule->hr_action = RCTL_ACTION_UNDEFINED;
-	rule->hr_amount = RCTL_AMOUNT_UNDEFINED;
-	refcount_init(&rule->hr_refcount, 1);
+	rule->rr_subject_type = RCTL_SUBJECT_TYPE_UNDEFINED;
+	rule->rr_subject.rs_proc = NULL;
+	rule->rr_subject.rs_uip = NULL;
+	rule->rr_subject.hr_loginclass = NULL;
+	rule->rr_subject.rs_prison = NULL;
+	rule->rr_per = RCTL_SUBJECT_TYPE_UNDEFINED;
+	rule->rr_resource = RUSAGE_UNDEFINED;
+	rule->rr_action = RCTL_ACTION_UNDEFINED;
+	rule->rr_amount = RCTL_AMOUNT_UNDEFINED;
+	refcount_init(&rule->rr_refcount, 1);
 
 	return (rule);
 }
@@ -644,16 +644,16 @@
 	copy = uma_zalloc(rctl_rule_zone, flags);
 	if (copy == NULL)
 		return (NULL);
-	copy->hr_subject_type = rule->hr_subject_type;
-	copy->hr_subject.hs_proc = rule->hr_subject.hs_proc;
-	copy->hr_subject.hs_uip = rule->hr_subject.hs_uip;
-	copy->hr_subject.hs_loginclass = rule->hr_subject.hs_loginclass;
-	copy->hr_subject.hs_prison = rule->hr_subject.hs_prison;
-	copy->hr_per = rule->hr_per;
-	copy->hr_resource = rule->hr_resource;
-	copy->hr_action = rule->hr_action;
-	copy->hr_amount = rule->hr_amount;
-	refcount_init(©->hr_refcount, 1);
+	copy->rr_subject_type = rule->rr_subject_type;
+	copy->rr_subject.rs_proc = rule->rr_subject.rs_proc;
+	copy->rr_subject.rs_uip = rule->rr_subject.rs_uip;
+	copy->rr_subject.hr_loginclass = rule->rr_subject.hr_loginclass;
+	copy->rr_subject.rs_prison = rule->rr_subject.rs_prison;
+	copy->rr_per = rule->rr_per;
+	copy->rr_resource = rule->rr_resource;
+	copy->rr_action = rule->rr_action;
+	copy->rr_amount = rule->rr_amount;
+	refcount_init(©->rr_refcount, 1);
 	rctl_rule_acquire_subject(copy);
 
 	return (copy);
@@ -663,18 +663,18 @@
 rctl_rule_acquire(struct rctl_rule *rule)
 {
 
-	KASSERT(rule->hr_refcount > 0, ("rule->hr_refcount > 0"));
+	KASSERT(rule->rr_refcount > 0, ("rule->rr_refcount > 0"));
 
-	refcount_acquire(&rule->hr_refcount);
+	refcount_acquire(&rule->rr_refcount);
 }
 
 void
 rctl_rule_release(struct rctl_rule *rule)
 {
 
-	KASSERT(rule->hr_refcount > 0, ("rule->hr_refcount > 0"));
+	KASSERT(rule->rr_refcount > 0, ("rule->rr_refcount > 0"));
 
-	if (refcount_release(&rule->hr_refcount)) {
+	if (refcount_release(&rule->rr_refcount)) {
 		rctl_rule_release_subject(rule);
 		uma_zfree(rctl_rule_zone, rule);
 	}
@@ -684,36 +684,36 @@
 rctl_rule_fully_specified(const struct rctl_rule *rule)
 {
 
-	switch (rule->hr_subject_type) {
+	switch (rule->rr_subject_type) {
 	case RCTL_SUBJECT_TYPE_UNDEFINED:
 		return (0);
 	case RCTL_SUBJECT_TYPE_PROCESS:
-		if (rule->hr_subject.hs_proc == NULL)
+		if (rule->rr_subject.rs_proc == NULL)
 			return (0);
 		break;
 	case RCTL_SUBJECT_TYPE_USER:
-		if (rule->hr_subject.hs_uip == NULL)
+		if (rule->rr_subject.rs_uip == NULL)
 			return (0);
 		break;
 	case RCTL_SUBJECT_TYPE_LOGINCLASS:
-		if (rule->hr_subject.hs_loginclass == NULL)
+		if (rule->rr_subject.hr_loginclass == NULL)
 			return (0);
 		break;
 	case RCTL_SUBJECT_TYPE_JAIL:
-		if (rule->hr_subject.hs_prison == NULL)
+		if (rule->rr_subject.rs_prison == NULL)
 			return (0);
 		break;
 	default:
 		panic("rctl_rule_fully_specified: unknown subject type %d",
-		    rule->hr_subject_type);
+		    rule->rr_subject_type);
 	}
-	if (rule->hr_resource == RUSAGE_UNDEFINED)
+	if (rule->rr_resource == RUSAGE_UNDEFINED)
 		return (0);
-	if (rule->hr_action == RCTL_ACTION_UNDEFINED)
+	if (rule->rr_action == RCTL_ACTION_UNDEFINED)
 		return (0);
-	if (rule->hr_amount == RCTL_AMOUNT_UNDEFINED)
+	if (rule->rr_amount == RCTL_AMOUNT_UNDEFINED)
 		return (0);
-	if (rule->hr_per == RCTL_SUBJECT_TYPE_UNDEFINED)
+	if (rule->rr_per == RCTL_SUBJECT_TYPE_UNDEFINED)
 		return (0);
 
 	return (1);
@@ -738,95 +738,95 @@
 	perstr = rulestr;
 
 	if (subjectstr == NULL || subjectstr[0] == '\0')
-		rule->hr_subject_type = RCTL_SUBJECT_TYPE_UNDEFINED;
+		rule->rr_subject_type = RCTL_SUBJECT_TYPE_UNDEFINED;
 	else {
-		error = str2value(subjectstr, &rule->hr_subject_type, subjectnames);
+		error = str2value(subjectstr, &rule->rr_subject_type, subjectnames);
 		if (error != 0)
 			goto out;
 	}
 
 	if (subject_idstr == NULL || subject_idstr[0] == '\0') {
-		rule->hr_subject.hs_proc = NULL;
-		rule->hr_subject.hs_uip = NULL;
-		rule->hr_subject.hs_loginclass = NULL;
-		rule->hr_subject.hs_prison = NULL;
+		rule->rr_subject.rs_proc = NULL;
+		rule->rr_subject.rs_uip = NULL;
+		rule->rr_subject.hr_loginclass = NULL;
+		rule->rr_subject.rs_prison = NULL;
 	} else {
 
 		/*
 		 * Loginclasses don't have any numerical ID's.
 		 */
-		if (rule->hr_subject_type != RCTL_SUBJECT_TYPE_LOGINCLASS) {
+		if (rule->rr_subject_type != RCTL_SUBJECT_TYPE_LOGINCLASS) {
 			error = str2id(subject_idstr, &id);
 			if (error != 0)
 				goto out;
 		}
-		switch (rule->hr_subject_type) {
+		switch (rule->rr_subject_type) {
 		case RCTL_SUBJECT_TYPE_UNDEFINED:
 			error = EINVAL;
 			goto out;
 		case RCTL_SUBJECT_TYPE_PROCESS:
 			sx_assert(&allproc_lock, SA_LOCKED);
-			rule->hr_subject.hs_proc = pfind(id);
-			if (rule->hr_subject.hs_proc == NULL) {
+			rule->rr_subject.rs_proc = pfind(id);
+			if (rule->rr_subject.rs_proc == NULL) {
 				error = ESRCH;
 				goto out;
 			}
-			PROC_UNLOCK(rule->hr_subject.hs_proc);
+			PROC_UNLOCK(rule->rr_subject.rs_proc);
 			break;
 		case RCTL_SUBJECT_TYPE_USER:
-			rule->hr_subject.hs_uip = uifind(id);
+			rule->rr_subject.rs_uip = uifind(id);
 			break;
 		case RCTL_SUBJECT_TYPE_LOGINCLASS:
-			rule->hr_subject.hs_loginclass = loginclass_find(subject_idstr);
+			rule->rr_subject.hr_loginclass = loginclass_find(subject_idstr);
 			break;
 		case RCTL_SUBJECT_TYPE_JAIL:
 			sx_slock(&allprison_lock);
-			rule->hr_subject.hs_prison = prison_find(id);
-			if (rule->hr_subject.hs_prison == NULL) {
+			rule->rr_subject.rs_prison = prison_find(id);
+			if (rule->rr_subject.rs_prison == NULL) {
 				sx_sunlock(&allprison_lock);
 				error = ESRCH;
 				goto out;
 			}
-			prison_hold_locked(rule->hr_subject.hs_prison);
+			prison_hold_locked(rule->rr_subject.rs_prison);
 			/* prison_find() returns with mutex held. */
-			mtx_unlock(&rule->hr_subject.hs_prison->pr_mtx);
+			mtx_unlock(&rule->rr_subject.rs_prison->pr_mtx);
 			sx_sunlock(&allprison_lock);
 			break;
                default:
                        panic("rctl_rule_from_string: unknown subject type %d",
-                           rule->hr_subject_type);
+                           rule->rr_subject_type);
                }
 	}
 
 	if (resourcestr == NULL || resourcestr[0] == '\0')
-		rule->hr_resource = RUSAGE_UNDEFINED;
+		rule->rr_resource = RUSAGE_UNDEFINED;
 	else {
-		error = str2value(resourcestr, &rule->hr_resource,
+		error = str2value(resourcestr, &rule->rr_resource,
 		    resourcenames);
 		if (error != 0)
 			goto out;
 	}
 
 	if (actionstr == NULL || actionstr[0] == '\0')
-		rule->hr_action = RCTL_ACTION_UNDEFINED;
+		rule->rr_action = RCTL_ACTION_UNDEFINED;
 	else {
-		error = str2value(actionstr, &rule->hr_action, actionnames);
+		error = str2value(actionstr, &rule->rr_action, actionnames);
 		if (error != 0)
 			goto out;
 	}
 
 	if (amountstr == NULL || amountstr[0] == '\0')
-		rule->hr_amount = RCTL_AMOUNT_UNDEFINED;
+		rule->rr_amount = RCTL_AMOUNT_UNDEFINED;
 	else {
-		error = str2int64(amountstr, &rule->hr_amount);
+		error = str2int64(amountstr, &rule->rr_amount);
 		if (error != 0)
 			goto out;
 	}
 
 	if (perstr == NULL || perstr[0] == '\0')
-		rule->hr_per = RCTL_SUBJECT_TYPE_UNDEFINED;
+		rule->rr_per = RCTL_SUBJECT_TYPE_UNDEFINED;
 	else {
-		error = str2value(perstr, &rule->hr_per, subjectnames);
+		error = str2value(perstr, &rule->rr_per, subjectnames);
 		if (error != 0)
 			goto out;
 	}
@@ -855,7 +855,7 @@
 
 	KASSERT(rctl_rule_fully_specified(rule), ("rule not fully specified"));
 
-	if (rule->hr_action == RCTL_ACTION_DELAY)
+	if (rule->rr_action == RCTL_ACTION_DELAY)
 		return (EOPNOTSUPP);
 
 	/*
@@ -863,9 +863,9 @@
 	 */
 	rctl_rule_remove(rule);
 
-	switch (rule->hr_subject_type) {
+	switch (rule->rr_subject_type) {
 	case RCTL_SUBJECT_TYPE_PROCESS:
-		p = rule->hr_subject.hs_proc;
+		p = rule->rr_subject.rs_proc;
 		KASSERT(p != NULL, ("rctl_rule_add: NULL proc"));
 		rctl_container_add_rule(&p->p_container, rule);
 		/*
@@ -877,26 +877,26 @@
 		return (0);
 
 	case RCTL_SUBJECT_TYPE_USER:
-		uip = rule->hr_subject.hs_uip;
+		uip = rule->rr_subject.rs_uip;
 		KASSERT(uip != NULL, ("rctl_rule_add: NULL uip"));
 		rctl_container_add_rule(&uip->ui_container, rule);
 		break;
 
 	case RCTL_SUBJECT_TYPE_LOGINCLASS:
-		lc = rule->hr_subject.hs_loginclass;
+		lc = rule->rr_subject.hr_loginclass;
 		KASSERT(lc != NULL, ("rctl_rule_add: NULL loginclass"));
 		rctl_container_add_rule(&lc->lc_container, rule);
 		break;
 
 	case RCTL_SUBJECT_TYPE_JAIL:
-		pr = rule->hr_subject.hs_prison;
+		pr = rule->rr_subject.rs_prison;
 		KASSERT(pr != NULL, ("rctl_rule_add: NULL pr"));
 		rctl_container_add_rule(&pr->pr_container, rule);
 		break;
 
 	default:
 		panic("rctl_rule_add: unknown subject type %d",
-		    rule->hr_subject_type);
+		    rule->rr_subject_type);
 	}
 
 	/*
@@ -906,20 +906,20 @@
 	sx_assert(&allproc_lock, SA_LOCKED);
 	FOREACH_PROC_IN_SYSTEM(p) {
 		cred = p->p_ucred;
-		switch (rule->hr_subject_type) {
+		switch (rule->rr_subject_type) {
 		case RCTL_SUBJECT_TYPE_USER:
-			if (cred->cr_uidinfo == rule->hr_subject.hs_uip ||
-			    cred->cr_ruidinfo == rule->hr_subject.hs_uip)
+			if (cred->cr_uidinfo == rule->rr_subject.rs_uip ||
+			    cred->cr_ruidinfo == rule->rr_subject.rs_uip)
 				break;
 			continue;
 		case RCTL_SUBJECT_TYPE_LOGINCLASS:
-			if (cred->cr_loginclass == rule->hr_subject.hs_loginclass)
+			if (cred->cr_loginclass == rule->rr_subject.hr_loginclass)
 				break;
 			continue;
 		case RCTL_SUBJECT_TYPE_JAIL:
 			match = 0;
 			for (pr = cred->cr_prison; pr != NULL; pr = pr->pr_parent) {
-				if (pr == rule->hr_subject.hs_prison) {
+				if (pr == rule->rr_subject.rs_prison) {
 					match = 1;
 					break;
 				}
@@ -929,7 +929,7 @@
 			continue;
 		default:
 			panic("rctl_rule_add: unknown subject type %d",
-			    rule->hr_subject_type);
+			    rule->rr_subject_type);
 		}
 
 		rctl_container_add_rule(&p->p_container, rule);
@@ -962,9 +962,9 @@
 	int error, found = 0;
 	struct proc *p;
 
-	if (filter->hr_subject_type == RCTL_SUBJECT_TYPE_PROCESS &&
-	    filter->hr_subject.hs_proc != NULL) {
-		p = filter->hr_subject.hs_proc;
+	if (filter->rr_subject_type == RCTL_SUBJECT_TYPE_PROCESS &&
+	    filter->rr_subject.rs_proc != NULL) {
+		p = filter->rr_subject.rs_proc;
 		rw_wlock(&rctl_lock);
 		found = rctl_container_remove_rules(&p->p_container, filter);
 		rw_wunlock(&rctl_lock);
@@ -1002,45 +1002,45 @@
 rctl_rule_to_sbuf(struct sbuf *sb, const struct rctl_rule *rule)
 {
 
-	sbuf_printf(sb, "%s:", rctl_subject_type_name(rule->hr_subject_type));
+	sbuf_printf(sb, "%s:", rctl_subject_type_name(rule->rr_subject_type));
 
-	switch (rule->hr_subject_type) {
+	switch (rule->rr_subject_type) {
 	case RCTL_SUBJECT_TYPE_PROCESS:
-		if (rule->hr_subject.hs_proc == NULL)
+		if (rule->rr_subject.rs_proc == NULL)
 			sbuf_printf(sb, ":");
 		else
-			sbuf_printf(sb, "%d:", rule->hr_subject.hs_proc->p_pid);
+			sbuf_printf(sb, "%d:", rule->rr_subject.rs_proc->p_pid);
 		break;
 	case RCTL_SUBJECT_TYPE_USER:
-		if (rule->hr_subject.hs_uip == NULL)
+		if (rule->rr_subject.rs_uip == NULL)
 			sbuf_printf(sb, ":");
 		else
-			sbuf_printf(sb, "%d:", rule->hr_subject.hs_uip->ui_uid);
+			sbuf_printf(sb, "%d:", rule->rr_subject.rs_uip->ui_uid);
 		break;
 	case RCTL_SUBJECT_TYPE_LOGINCLASS:
-		if (rule->hr_subject.hs_loginclass == NULL)
+		if (rule->rr_subject.hr_loginclass == NULL)
 			sbuf_printf(sb, ":");
 		else
-			sbuf_printf(sb, "%s:", rule->hr_subject.hs_loginclass->lc_name);
+			sbuf_printf(sb, "%s:", rule->rr_subject.hr_loginclass->lc_name);
 		break;
 	case RCTL_SUBJECT_TYPE_JAIL:
-		if (rule->hr_subject.hs_prison == NULL)
+		if (rule->rr_subject.rs_prison == NULL)
 			sbuf_printf(sb, ":");
 		else
-			sbuf_printf(sb, "%d:", rule->hr_subject.hs_prison->pr_id);
+			sbuf_printf(sb, "%d:", rule->rr_subject.rs_prison->pr_id);
 		break;
 	default:
 		panic("rctl_rule_to_sbuf: unknown subject type %d",
-		    rule->hr_subject_type);
+		    rule->rr_subject_type);
 	}
 
 	sbuf_printf(sb, "%s:%s=%jd",
-	    rctl_resource_name(rule->hr_resource),
-	    rctl_action_name(rule->hr_action),
-	    rule->hr_amount);
+	    rctl_resource_name(rule->rr_resource),
+	    rctl_action_name(rule->rr_action),
+	    rule->rr_amount);
 
-	if (rule->hr_per != rule->hr_subject_type)
-		sbuf_printf(sb, "/%s", rctl_subject_type_name(rule->hr_per));
+	if (rule->rr_per != rule->rr_subject_type)
+		sbuf_printf(sb, "/%s", rctl_subject_type_name(rule->rr_per));
 }
 
 /*
@@ -1128,9 +1128,9 @@
 		return (EINVAL);
 	}
 
-	switch (filter->hr_subject_type) {
+	switch (filter->rr_subject_type) {
 	case RCTL_SUBJECT_TYPE_PROCESS:
-		p = filter->hr_subject.hs_proc;
+		p = filter->rr_subject.rs_proc;
 		if (p == NULL) {
 			error = EINVAL;
 			goto out;
@@ -1138,7 +1138,7 @@
 		outputsbuf = rctl_container_to_sbuf(&p->p_container);
 		break;
 	case RCTL_SUBJECT_TYPE_USER:
-		uip = filter->hr_subject.hs_uip;
+		uip = filter->rr_subject.rs_uip;
 		if (uip == NULL) {
 			error = EINVAL;
 			goto out;
@@ -1146,7 +1146,7 @@
 		outputsbuf = rctl_container_to_sbuf(&uip->ui_container);
 		break;
 	case RCTL_SUBJECT_TYPE_LOGINCLASS:
-		lc = filter->hr_subject.hs_loginclass;
+		lc = filter->rr_subject.hr_loginclass;
 		if (lc == NULL) {
 			error = EINVAL;
 			goto out;
@@ -1154,7 +1154,7 @@
 		outputsbuf = rctl_container_to_sbuf(&lc->lc_container);
 		break;
 	case RCTL_SUBJECT_TYPE_JAIL:
-		pr = filter->hr_subject.hs_prison;
+		pr = filter->rr_subject.rs_prison;
 		if (pr == NULL) {
 			error = EINVAL;
 			goto out;
@@ -1183,10 +1183,10 @@
 	struct sbuf *sb = (struct sbuf *)arg3;
 
 	rw_rlock(&rctl_lock);
-	LIST_FOREACH(link, &container->c_rule_links, rctl_next) {
-		if (!rctl_rule_matches(link->rctl_rule, filter))
+	LIST_FOREACH(link, &container->c_rule_links, rrl_next) {
+		if (!rctl_rule_matches(link->rrl_rule, filter))
 			continue;
-		rctl_rule_to_sbuf(sb, link->rctl_rule);
+		rctl_rule_to_sbuf(sb, link->rrl_rule);
 		sbuf_printf(sb, ",");
 	}
 	rw_runlock(&rctl_lock);
@@ -1225,16 +1225,16 @@
 	sx_assert(&allproc_lock, SA_LOCKED);
 	FOREACH_PROC_IN_SYSTEM(p) {
 		rw_rlock(&rctl_lock);
-		LIST_FOREACH(link, &p->p_container.c_rule_links, rctl_next) {
+		LIST_FOREACH(link, &p->p_container.c_rule_links, rrl_next) {
 			/*
 			 * Non-process rules will be added to the buffer later.
 			 * Adding them here would result in duplicated output.
 			 */
-			if (link->rctl_rule->hr_subject_type != RCTL_SUBJECT_TYPE_PROCESS)
+			if (link->rrl_rule->rr_subject_type != RCTL_SUBJECT_TYPE_PROCESS)
 				continue;
-			if (!rctl_rule_matches(link->rctl_rule, filter))
+			if (!rctl_rule_matches(link->rrl_rule, filter))
 				continue;
-			rctl_rule_to_sbuf(sb, link->rctl_rule);
+			rctl_rule_to_sbuf(sb, link->rrl_rule);
 			sbuf_printf(sb, ",");
 		}
 		rw_runlock(&rctl_lock);
@@ -1286,17 +1286,17 @@
 		return (EINVAL);
 	}
 
-	if (filter->hr_subject_type == RCTL_SUBJECT_TYPE_UNDEFINED) {
+	if (filter->rr_subject_type == RCTL_SUBJECT_TYPE_UNDEFINED) {
 		rctl_rule_release(filter);
 		sx_sunlock(&allproc_lock);
 		return (EINVAL);
 	}
-	if (filter->hr_subject_type != RCTL_SUBJECT_TYPE_PROCESS) {
+	if (filter->rr_subject_type != RCTL_SUBJECT_TYPE_PROCESS) {
 		rctl_rule_release(filter);
 		sx_sunlock(&allproc_lock);
 		return (EOPNOTSUPP);
 	}
-	if (filter->hr_subject.hs_proc == NULL) {
+	if (filter->rr_subject.rs_proc == NULL) {
 		rctl_rule_release(filter);
 		sx_sunlock(&allproc_lock);
 		return (EINVAL);
@@ -1308,8 +1308,8 @@
 	KASSERT(sb != NULL, ("sbuf_new failed"));
 
 	rw_rlock(&rctl_lock);
-	LIST_FOREACH(link, &filter->hr_subject.hs_proc->p_container.c_rule_links, rctl_next) {
-		rctl_rule_to_sbuf(sb, link->rctl_rule);
+	LIST_FOREACH(link, &filter->rr_subject.rs_proc->p_container.c_rule_links, rrl_next) {
+		rctl_rule_to_sbuf(sb, link->rrl_rule);
 		sbuf_printf(sb, ",");
 	}
 	rw_runlock(&rctl_lock);
@@ -1358,15 +1358,15 @@
 	/*
 	 * The 'per' part of a rule is optional.
 	 */
-	if (rule->hr_per == RCTL_SUBJECT_TYPE_UNDEFINED &&
-	    rule->hr_subject_type != RCTL_SUBJECT_TYPE_UNDEFINED)
-		rule->hr_per = rule->hr_subject_type;
+	if (rule->rr_per == RCTL_SUBJECT_TYPE_UNDEFINED &&
+	    rule->rr_subject_type != RCTL_SUBJECT_TYPE_UNDEFINED)
+		rule->rr_per = rule->rr_subject_type;
 
 	/*
 	 * Some rules just don't make sense.
 	 */
-	if (rule->hr_resource == RUSAGE_CPU &&
-	    rule->hr_action == RCTL_ACTION_DENY) {
+	if (rule->rr_resource == RUSAGE_CPU &&
+	    rule->rr_action == RCTL_ACTION_DENY) {
 		error = EINVAL;
 		goto out;
 	}
@@ -1440,16 +1440,16 @@
 	 */
 	rulecnt = 0;
 	rw_rlock(&rctl_lock);
-	LIST_FOREACH(link, &p->p_container.c_rule_links, rctl_next) {
-		if (link->rctl_rule->hr_subject_type ==
+	LIST_FOREACH(link, &p->p_container.c_rule_links, rrl_next) {
+		if (link->rrl_rule->rr_subject_type ==
 		    RCTL_SUBJECT_TYPE_PROCESS)
 			rulecnt++;
 	}
-	LIST_FOREACH(link, &newuip->ui_container.c_rule_links, rctl_next)
+	LIST_FOREACH(link, &newuip->ui_container.c_rule_links, rrl_next)
 		rulecnt++;
-	LIST_FOREACH(link, &newlc->lc_container.c_rule_links, rctl_next)
+	LIST_FOREACH(link, &newlc->lc_container.c_rule_links, rrl_next)
 		rulecnt++;
-	LIST_FOREACH(link, &newpr->pr_container.c_rule_links, rctl_next)
+	LIST_FOREACH(link, &newpr->pr_container.c_rule_links, rrl_next)
 		rulecnt++;
 	rw_runlock(&rctl_lock);
 
@@ -1459,8 +1459,8 @@
 	 */
 	for (i = 0; i < rulecnt; i++) {
 		newlink = uma_zalloc(rctl_rule_link_zone, M_WAITOK);
-		newlink->rctl_rule = NULL;
-		LIST_INSERT_HEAD(&newrules, newlink, rctl_next);
+		newlink->rrl_rule = NULL;
+		LIST_INSERT_HEAD(&newrules, newlink, rrl_next);
 	}
 
 	newlink = LIST_FIRST(&newrules);
@@ -1469,42 +1469,42 @@
 	 * Assign rules to the newly allocated list entries.
 	 */
 	rw_wlock(&rctl_lock);
-	LIST_FOREACH(link, &p->p_container.c_rule_links, rctl_next) {
-		if (link->rctl_rule->hr_subject_type ==
+	LIST_FOREACH(link, &p->p_container.c_rule_links, rrl_next) {
+		if (link->rrl_rule->rr_subject_type ==
 		    RCTL_SUBJECT_TYPE_PROCESS) {
 			if (newlink == NULL)
 				goto goaround;
-			rctl_rule_acquire(link->rctl_rule);
-			newlink->rctl_rule = link->rctl_rule;
-			newlink = LIST_NEXT(newlink, rctl_next);
+			rctl_rule_acquire(link->rrl_rule);
+			newlink->rrl_rule = link->rrl_rule;
+			newlink = LIST_NEXT(newlink, rrl_next);
 			rulecnt--;
 		}
 	}
 	
-	LIST_FOREACH(link, &newuip->ui_container.c_rule_links, rctl_next) {
+	LIST_FOREACH(link, &newuip->ui_container.c_rule_links, rrl_next) {
 		if (newlink == NULL)
 			goto goaround;
-		rctl_rule_acquire(link->rctl_rule);
-		newlink->rctl_rule = link->rctl_rule;
-		newlink = LIST_NEXT(newlink, rctl_next);
+		rctl_rule_acquire(link->rrl_rule);
+		newlink->rrl_rule = link->rrl_rule;
+		newlink = LIST_NEXT(newlink, rrl_next);
 		rulecnt--;
 	}
 
-	LIST_FOREACH(link, &newlc->lc_container.c_rule_links, rctl_next) {
+	LIST_FOREACH(link, &newlc->lc_container.c_rule_links, rrl_next) {
 		if (newlink == NULL)
 			goto goaround;
-		rctl_rule_acquire(link->rctl_rule);
-		newlink->rctl_rule = link->rctl_rule;
-		newlink = LIST_NEXT(newlink, rctl_next);
+		rctl_rule_acquire(link->rrl_rule);
+		newlink->rrl_rule = link->rrl_rule;
+		newlink = LIST_NEXT(newlink, rrl_next);
 		rulecnt--;
 	}
 
-	LIST_FOREACH(link, &newpr->pr_container.c_rule_links, rctl_next) {
+	LIST_FOREACH(link, &newpr->pr_container.c_rule_links, rrl_next) {
 		if (newlink == NULL)
 			goto goaround;
-		rctl_rule_acquire(link->rctl_rule);
-		newlink->rctl_rule = link->rctl_rule;
-		newlink = LIST_NEXT(newlink, rctl_next);
+		rctl_rule_acquire(link->rrl_rule);
+		newlink->rrl_rule = link->rrl_rule;
+		newlink = LIST_NEXT(newlink, rrl_next);
 		rulecnt--;
 	}
 
@@ -1514,8 +1514,8 @@
 		 */
 		while (!LIST_EMPTY(&p->p_container.c_rule_links)) {
 			link = LIST_FIRST(&p->p_container.c_rule_links);
-			LIST_REMOVE(link, rctl_next);
-			rctl_rule_release(link->rctl_rule);
+			LIST_REMOVE(link, rrl_next);
+			rctl_rule_release(link->rrl_rule);
 			uma_zfree(rctl_rule_link_zone, link);
 		}
 
@@ -1527,9 +1527,9 @@
 		 */
 		while (!LIST_EMPTY(&newrules)) {
 			newlink = LIST_FIRST(&newrules);
-			LIST_REMOVE(newlink, rctl_next);
+			LIST_REMOVE(newlink, rrl_next);
 			LIST_INSERT_HEAD(&p->p_container.c_rule_links,
-			    newlink, rctl_next);
+			    newlink, rrl_next);
 		}
 
 		rw_wunlock(&rctl_lock);
@@ -1546,9 +1546,9 @@
 	 */
 	while (!LIST_EMPTY(&newrules)) {
 		newlink = LIST_FIRST(&newrules);
-		LIST_REMOVE(newlink, rctl_next);
-		if (newlink->rctl_rule != NULL)
-			rctl_rule_release(newlink->rctl_rule);
+		LIST_REMOVE(newlink, rrl_next);
+		if (newlink->rrl_rule != NULL)
+			rctl_rule_release(newlink->rrl_rule);
 		uma_zfree(rctl_rule_link_zone, newlink);
 	}
 
@@ -1576,22 +1576,22 @@
 	/*
 	 * Go through limits applicable to the parent and assign them to the child.
 	 * Rules with 'process' subject have to be duplicated in order to make their
-	 * hr_subject point to the new process.
+	 * rr_subject point to the new process.
 	 */
-	LIST_FOREACH(link, &parent->p_container.c_rule_links, rctl_next) {
-		if (link->rctl_rule->hr_subject_type == RCTL_SUBJECT_TYPE_PROCESS) {
-			rule = rctl_rule_duplicate(link->rctl_rule, M_NOWAIT);
+	LIST_FOREACH(link, &parent->p_container.c_rule_links, rrl_next) {

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From trasz at FreeBSD.org  Sun Jan 16 18:04:28 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Sun Jan 16 18:04:30 2011
Subject: PERFORCE change 187865 for review
Message-ID: <201101161804.p0GI4RRp091590@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@187865?ac=10

Change 187865 by trasz@trasz_victim on 2011/01/16 18:03:31

	Make routine names less confusing.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#55 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#11 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#5 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#55 (text+ko) ====

@@ -311,7 +311,7 @@
 
 	mtx_lock(&container_lock);
 #ifdef RCTL
-	error = rctl_enforce_proc(p, resource, amount);
+	error = rctl_enforce(p, resource, amount);
 	if (error && container_resource_deniable(resource)) {
 		SDT_PROBE(container, kernel, rusage, add_failure, p, resource, amount, 0, 0);
 		mtx_unlock(&container_lock);
@@ -402,7 +402,7 @@
 #endif
 #ifdef RCTL
 	if (diff > 0) {
-		error = rctl_enforce_proc(p, resource, diff);
+		error = rctl_enforce(p, resource, diff);
 		if (error && container_resource_deniable(resource)) {
 			SDT_PROBE(container, kernel, rusage, set_failure, p, resource, amount, 0, 0);
 			return (error);
@@ -462,14 +462,15 @@
 /*
  * Returns amount of 'resource' the process 'p' can keep allocated.
  * Allocating more than that would be denied, unless the resource
- * is marked undeniable.
+ * is marked undeniable.  Amount of already allocated resource does
+ * not matter.
  */
 uint64_t
 rusage_get_limit(struct proc *p, int resource)
 {
 
 #ifdef RCTL
-	return (rctl_available_proc(p, resource));
+	return (rctl_get_limit(p, resource));
 #else
 	return (UINT64_MAX);
 #endif

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#11 (text+ko) ====

@@ -279,7 +279,7 @@
  * be denied, 0 otherwise.
  */
 int
-rctl_enforce_proc(struct proc *p, int resource, uint64_t amount)
+rctl_enforce(struct proc *p, int resource, uint64_t amount)
 {
 	struct rctl_rule *rule;
 	struct rctl_rule_link *link;
@@ -312,7 +312,7 @@
 
 			buf = malloc(RCTL_LOG_BUFSIZE, M_RCTL, M_NOWAIT);
 			if (buf == NULL) {
-				printf("rctl_enforce_proc: out of memory\n");
+				printf("rctl_enforce: out of memory\n");
 				continue;
 			}
 			sbuf_new(&sb, buf, RCTL_LOG_BUFSIZE, SBUF_FIXEDLEN);
@@ -343,7 +343,7 @@
 			rctl_deferred_psignal(p, SIGXFSZ);
 			continue;
 		default:
-			panic("rctl_enforce_proc: unknown action %d",
+			panic("rctl_enforce: unknown action %d",
 			    rule->rr_action);
 		}
 	}
@@ -362,7 +362,7 @@
 }
 
 uint64_t
-rctl_available_proc(struct proc *p, int resource)
+rctl_get_limit(struct proc *p, int resource)
 {
 	struct rctl_rule *rule;
 	struct rctl_rule_link *link;

==== //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#5 (text+ko) ====

@@ -119,8 +119,8 @@
 int	rctl_rule_add(struct rctl_rule *rule);
 int	rctl_rule_remove(struct rctl_rule *filter);
 
-int	rctl_enforce_proc(struct proc *p, int resource, uint64_t amount);
-uint64_t	rctl_available_proc(struct proc *p, int resource);
+int	rctl_enforce(struct proc *p, int resource, uint64_t amount);
+uint64_t	rctl_get_limit(struct proc *p, int resource);
 const char	*rctl_resource_name(int resource);
 int	rctl_proc_fork(struct proc *parent, struct proc *child);
 void	rctl_proc_exit(struct proc *p);
From trasz at FreeBSD.org  Tue Jan 18 06:21:23 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Tue Jan 18 06:21:30 2011
Subject: PERFORCE change 187905 for review
Message-ID: <201101180621.p0I6LLFg043158@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@187905?ac=10

Change 187905 by trasz@trasz_victim on 2011/01/18 06:20:34

	IFC.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/Makefile#9 integrate
.. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#33 integrate
.. //depot/projects/soc2009/trasz_limits/UPDATING#32 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#20 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/trap.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/binutils/ld/emultempl/ppc64elf.em#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/binutils/ld/ldemul.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/CHANGES#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/COPYING#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/README#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/VERSION#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/aclocal.m4#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/arrows.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/buttons.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/calendar.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/checklist.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/columns.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/config.guess#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/config.hin#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/config.sub#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/configure#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/configure.in#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog-config.in#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog.1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog.3#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog.h#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog.lsm#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/dialog.pl#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/dlg_colors.h#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/dlg_keys.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/dlg_keys.h#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/editbox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/formbox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/fselect.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/guage.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/headers-sh.in#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/inputbox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/inputstr.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/install-sh#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/makefile.in#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/menubox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/mixedform.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/mixedgauge.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/mouse.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/mousewget.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/msgbox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/pause.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/POTFILES.in#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ar.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/bg.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ca.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/cs.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/cy.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/da.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/de.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/dialog.pot#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/el.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/eo.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/es.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/et.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/eu.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/fi.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/fr.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ga.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/gl.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/hi.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/hr.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/hu.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/id.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/is.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/it.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ja.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ku.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/lt.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/lv.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/makefile.inn#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/mg.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/mk.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ms.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/nb.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/nl.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/pl.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/pt.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/pt_BR.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/rm.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ro.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/ru.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/rw.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/sq.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/sr.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/sv.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/sw.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/th.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/tr.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/uk.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/vi.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/wa.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/zh_CN.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/po/zh_TW.po#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/progressbox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/rc.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/README#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/calendar#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/calendar-stdout#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/calendar2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/calendar2-stdout#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/calendar3#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/calendar3-stdout#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist-8bit#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist-utf8#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist10#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist11#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist3#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist4#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist5#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist6#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist7#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist8#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist9#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/checklist9.txt#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/admin.funcs#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/common.funcs#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.funcs#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.ifman1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.ifman2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.ifmcfg2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.ifmcfg4#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.ifmcfg5#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.ifpoll1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.ifpoll2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.ifreq1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.ifreq2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.rcnews#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.sendifm1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.sendifm2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.trnrc#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/copi.wheel#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copifuncs/ifpatch#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/copismall#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/debian.rc#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/dialog.py#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/dselect#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/editbox#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/editbox-utf8#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/editbox2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/editbox3#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/editbox4#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/form1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/form1-both#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/form1-extra#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/form1-help#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/form1-utf8#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/form2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/form3#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/form4#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/form5#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/form6#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/fselect#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/fselect-stdout#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/fselect1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/fselect1-stdout#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/fselect2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/fselect2-stdout#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/gauge#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/gauge0#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/gauge0-input-fd#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/gauge2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/infobox#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/infobox1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/infobox2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/infobox3#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/infobox4#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/infobox5#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/infobox6#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputbox#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputbox-both#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputbox-extra#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputbox-help#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputbox1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputbox2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputbox3#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputbox4#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputbox5#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputbox6-8bit#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputbox6-utf8#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputbox7#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputmenu#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputmenu-stdout#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputmenu1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputmenu2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputmenu3#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/inputmenu4#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/install/FDISK.TEST#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/install/makefile.in#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/install/setup.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/install/setup.help#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/killall#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/listing#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/menubox#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/menubox-8bit#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/menubox-utf8#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/menubox1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/menubox10#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/menubox2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/menubox3#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/menubox4#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/menubox5#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/menubox6#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/menubox7#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/menubox8#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/menubox9#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/mixedform#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/mixedform2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/mixedgauge#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/msgbox#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/msgbox-help#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/msgbox1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/msgbox2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/msgbox3#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/msgbox4-8bit#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/msgbox4-eucjp#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/msgbox4-utf8#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/msgbox5#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/msgbox6#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/msgbox6a#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/password#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/password1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/password2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/passwordform1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/passwordform1-utf8#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/pause#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/pause-help#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/progress#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/progress2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/radiolist#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/radiolist1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/radiolist10#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/radiolist2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/radiolist3#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/radiolist4#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/report-button#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/report-edit#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/report-string#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/report-tempfile#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/report-yesno#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/rotated-data#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/setup-edit#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/setup-tempfile#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/setup-utf8#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/setup-vars#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/slackware.rc#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/sourcemage.rc#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/suse.rc#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/tailbox#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/tailboxbg#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/tailboxbg1#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/tailboxbg2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/testdata-8bit#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/textbox#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/textbox.txt#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/textbox2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/textbox3#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/timebox#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/timebox-stdout#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/timebox2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/timebox2-stdout#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/wheel#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/whiptail.rc#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/yesno#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/yesno-both#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/yesno-extra#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/yesno-help#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/yesno-utf8#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/yesno2#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/yesno3#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/samples/yesno4#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/tailbox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/textbox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/timebox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/trace.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/ui_getc.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/util.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/version.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/dialog/yesno.c#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/rs6000/crtsavres.asm#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/rs6000/freebsd.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/rs6000/rs6000.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/rs6000/tramp.asm#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/mtree/BSD.usr.dist#11 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/lib/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/CHANGES#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/COPYING#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/README#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/Makefile#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/check1.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/check2.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/check3.c#3 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/dselect.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/fselect.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/ftree1.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/ftree1.test#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/ftree2.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/ftree2.test#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/gauge.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/input1.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/input2.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/menu1.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/menu2.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/menu3.c#3 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/msg.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/prgbox.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/radio1.c#3 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/radio2.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/radio3.c#3 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/text.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/tree.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TESTS/yesno.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/TODO#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/checklist.c#3 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/colors.h#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/dialog.3#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/dialog.h#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/dialog.priv.h#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/dir.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/dir.h#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/dlg_config.h#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/fselect.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/gauge.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/help.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/inputbox.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/kernel.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/lineedit.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/menubox.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/msgbox.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/notify.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/prgbox.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/radiolist.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/raw_popen.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/rc.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/rc.h#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/textbox.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/tree.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/ui_objects.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/ui_objects.h#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libdialog/yesno.c#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/CHANGES#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/COPYING#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/README#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/check1.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/check2.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/check3.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/dselect.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/fselect.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/ftree1.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/ftree1.test#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/ftree2.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/ftree2.test#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/gauge.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/input1.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/input2.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/menu1.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/menu2.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/menu3.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/msg.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/prgbox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/radio1.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/radio2.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/radio3.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/text.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/tree.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TESTS/yesno.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/TODO#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/checklist.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/colors.h#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/dialog.3#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/dialog.h#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/dialog.priv.h#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/dir.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/dir.h#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/fselect.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/gauge.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/help.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/inputbox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/kernel.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/lineedit.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/menubox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/msgbox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/notify.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/prgbox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/radiolist.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/raw_popen.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/rc.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/rc.h#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/textbox.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/tree.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/ui_objects.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/ui_objects.h#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libodialog/yesno.c#1 branch
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/COPYING#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/README#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/README.lib#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/TESTS/Makefile#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/TESTS/README#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/TESTS/checklist#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/TESTS/ftreebox#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/TESTS/infobox#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/TESTS/inputbox#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/TESTS/menubox#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/TESTS/msgbox#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/TESTS/prgbox#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/TESTS/radiolist#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/TESTS/textbox#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/TESTS/treebox#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/TESTS/yesno#2 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/dialog.1#3 delete
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/dialog/dialog.c#2 delete
.. //depot/projects/soc2009/trasz_limits/lib/csu/amd64/Makefile#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/csu/arm/Makefile#5 integrate
.. //depot/projects/soc2009/trasz_limits/lib/csu/common/crtbrand.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/csu/i386-elf/Makefile#5 integrate
.. //depot/projects/soc2009/trasz_limits/lib/csu/i386-elf/crt1_s.S#5 integrate
.. //depot/projects/soc2009/trasz_limits/lib/csu/ia64/Makefile#5 integrate
.. //depot/projects/soc2009/trasz_limits/lib/csu/mips/Makefile#5 integrate
.. //depot/projects/soc2009/trasz_limits/lib/csu/powerpc/Makefile#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/csu/powerpc/crti.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/csu/powerpc/crtn.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/csu/powerpc64/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/csu/powerpc64/crti.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/csu/powerpc64/crtn.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc/gen/_ctx_start.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc/gen/_setjmp.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc/gen/fabs.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc/gen/setjmp.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc/gen/sigsetjmp.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc/sys/brk.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc/sys/cerror.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc/sys/exect.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc/sys/pipe.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc/sys/ptrace.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc/sys/sbrk.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc/sys/setlogin.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/_ctx_start.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/_setjmp.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/fabs.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/setjmp.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/gen/sigsetjmp.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/brk.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/cerror.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/exect.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/pipe.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/ptrace.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/sbrk.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/powerpc64/sys/setlogin.S#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/sys/mknod.2#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libcompiler_rt/Makefile#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libfetch/ftp.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_sig.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_stack.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/powerpc/rtld_start.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/powerpc64/rtld_start.S#3 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/rtld.c#16 integrate
.. //depot/projects/soc2009/trasz_limits/release/amd64/boot_crunch.conf#5 integrate
.. //depot/projects/soc2009/trasz_limits/release/i386/boot_crunch.conf#5 integrate
.. //depot/projects/soc2009/trasz_limits/release/ia64/boot_crunch.conf#4 integrate
.. //depot/projects/soc2009/trasz_limits/release/pc98/boot_crunch.conf#5 integrate
.. //depot/projects/soc2009/trasz_limits/release/powerpc/boot_crunch.conf#6 integrate
.. //depot/projects/soc2009/trasz_limits/release/sparc64/boot_crunch.conf#6 integrate
.. //depot/projects/soc2009/trasz_limits/release/sun4v/boot_crunch.conf#5 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/geom/class/part/gpart.8#11 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/geom/class/raid3/geom_raid3.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/geom/class/raid3/graid3.8#4 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/hastd.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/hooks.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man3/queue.3#5 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/Makefile#29 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/axe.4#5 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/miibus.4#6 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/nfe.4#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/nve.4#3 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/re.4#6 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/rgephy.4#1 branch
.. //depot/projects/soc2009/trasz_limits/share/man/man4/run.4#5 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/runfw.4#1 branch
.. //depot/projects/soc2009/trasz_limits/share/man/man4/sge.4#3 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/uplcom.4#4 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man5/xfs.5#3 integrate
.. //depot/projects/soc2009/trasz_limits/share/mk/bsd.libnames.mk#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/acpi_machdep.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/amd64_mem.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/apic_vector.S#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/mp_machdep.c#16 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/ia32/ia32_signal.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_sysvec.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/econa/ehci_ebus.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/econa/ohci_ec.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/include/metadata.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_xpt.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cam/cam_periph.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cam/cam_xpt.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cam/scsi/scsi_da.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#16 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files#43 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/acpica_prep.sh#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/changes.txt#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/adfile.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/adisasm.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/adwalk.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmextern.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmrestag.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmtable.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmtbdump.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmtbinfo.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/getopt.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslanalyze.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcodegen.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcompile.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcompiler.h#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcompiler.l#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcompiler.y#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asldefine.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslerror.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslfiles.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslfold.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslglobal.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asllength.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asllisting.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslload.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asllookup.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslmain.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslmap.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslmessages.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslopcodes.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asloperands.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslopt.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslpredef.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslresource.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslrestype1.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslrestype1i.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslrestype2.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslrestype2d.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslrestype2e.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslrestype2q.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslrestype2w.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslstartup.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslstubs.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asltransform.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asltree.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asltypes.h#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslutils.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/asluuid.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtcompile.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtcompiler.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtfield.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtio.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtsubtable.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dttable.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dttemplate.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dttemplate.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/dtutils.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbcmds.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbdisply.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbexec.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbfileio.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbhistry.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbinput.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbstats.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbutils.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbxface.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/disassembler/dmbuffer.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/disassembler/dmnames.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/disassembler/dmobject.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/disassembler/dmopcode.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/disassembler/dmresrc.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/disassembler/dmresrcl.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/disassembler/dmresrcs.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/disassembler/dmutils.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/disassembler/dmwalk.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dsfield.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dsinit.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dsmethod.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dsobject.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dsopcode.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dsutils.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dswexec.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dswload.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dswscope.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/dispatcher/dswstate.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evevent.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evgpe.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evgpeblk.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evgpeinit.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evgpeutil.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evmisc.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evregion.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evrgnini.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evsci.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evxface.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evxfevnt.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evxfgpe.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evxfregn.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exconfig.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exconvrt.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/excreate.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exdebug.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exdump.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exfield.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exfldio.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exmisc.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exmutex.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exnames.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exoparg1.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exoparg2.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exoparg3.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exoparg6.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exprep.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exregion.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exresnte.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exresolv.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exresop.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exstore.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exstoren.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exstorob.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exsystem.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exutils.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/hardware/hwacpi.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/hardware/hwgpe.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/hardware/hwpci.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/hardware/hwregs.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/hardware/hwsleep.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/hardware/hwtimer.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/hardware/hwvalid.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/hardware/hwxface.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acapps.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/accommon.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acconfig.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acdebug.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acdisasm.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acdispat.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acevents.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acexcep.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acglobal.h#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/achware.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acinterp.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/aclocal.h#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acmacros.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acnames.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acnamesp.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acobject.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acopcode.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acoutput.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acparser.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acpi.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acpiosxf.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acpixf.h#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acpredef.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acresrc.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acrestyp.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acstruct.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/actables.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/actbl.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/actbl1.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/actbl2.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/actypes.h#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acutils.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/amlcode.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/amlresrc.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/platform/acenv.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/platform/acfreebsd.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/platform/acgcc.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsaccess.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsalloc.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsdump.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsdumpdv.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nseval.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsinit.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsload.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsnames.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsobject.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsparse.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nspredef.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsrepair.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsrepair2.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nssearch.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsutils.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nswalk.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsxfeval.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsxfname.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/namespace/nsxfobj.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/osunixxf.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/parser/psargs.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/parser/psloop.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/parser/psopcode.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/parser/psparse.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/parser/psscope.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/parser/pstree.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/parser/psutils.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/parser/pswalk.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/parser/psxface.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/resources/rsaddr.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/resources/rscalc.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/resources/rscreate.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/resources/rsdump.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/resources/rsinfo.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/resources/rsio.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/resources/rsirq.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/resources/rslist.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/resources/rsmemory.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/resources/rsmisc.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/resources/rsutils.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/resources/rsxface.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/tables/tbfadt.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/tables/tbfind.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/tables/tbinstal.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/tables/tbutils.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/tables/tbxface.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/tables/tbxfroot.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utalloc.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utcache.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utcopy.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utdebug.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utdelete.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/uteval.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utglobal.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utids.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utinit.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utlock.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utmath.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utmisc.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utmutex.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utobject.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utosi.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utresrc.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utstate.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/uttrack.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utxface.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utxferror.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/contrib/pf/net/pf_osfp.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ddb/db_capture.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpi_support/acpi_ibm.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/Osd/OsdInterrupt.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi.c#20 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpivar.h#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ae/if_ae.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/age/if_age.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ahci/ahci.c#19 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/alc/if_alc.c#16 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/alc/if_alcvar.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ale/if_ale.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath.c#19 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bce/if_bce.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bge/if_bge.c#24 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bwi/if_bwi.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/bwn/if_bwn.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_main.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_sge.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/dc/dcphy.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/dc/pnphy.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_em.c#22 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_igb.c#25 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_lem.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ed/if_ed.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/iicbus/max6690.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/iscsi/initiator/iscsi.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/iwi/if_iwi.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ixgbe/ixgbe.c#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/jme/if_jme.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/jme/if_jmevar.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mii/atphy.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mii/brgphy.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mii/ciphy.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mii/e1000phy.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mii/ip1000phy.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mii/jmphy.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mii/mii_physubr.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mii/rgephy.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mii/xmphy.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mmc/mmc.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mps.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt_raid.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/nfe/if_nfe.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/pccbb/pccbb.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/re/if_re.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pcm/buffer.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/sound/pcm/sound.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/sound/usb/uaudio.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ste/if_ste.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/txp/if_txp.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/at91dci.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/at91dci_atmelarm.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/atmegadci.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/atmegadci_atmelarm.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/avr32dci.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci.c#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci_ixp4xx.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci_mv.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci_pci.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/musb_otg.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/musb_otg_atmelarm.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ohci.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ohci_atmelarm.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ohci_pci.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ohci_s3c24x0.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/uhci.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/uhci_pci.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/usb_controller.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/uss820dci.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/uss820dci_atmelarm.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/xhci.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/xhci.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/xhci_pci.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/atp.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/uhid.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/ukbd.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/ums.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/misc/udbp.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/misc/ufm.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_aue.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_axe.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_cdce.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_cue.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_ipheth.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_kue.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_rue.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_udav.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/usb_ethernet.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/quirk/usb_quirk.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/u3g.c#19 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uark.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ubsa.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ubser.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uchcom.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ucycom.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ufoma.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uftdi.c#19 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ugensa.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uipaq.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ulpt.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umct.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umodem.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umoscom.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uplcom.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/usb_serial.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uslcom.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uvisor.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uvscom.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/umass.c#16 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/urio.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/ustorage_fs.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/template/usb_template.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/template/usb_template_cdce.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/template/usb_template_msc.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/template/usb_template_mtp.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_busdma.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_compat_linux.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_core.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_debug.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_dev.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_device.c#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_dynamic.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_error.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_generic.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_handle_request.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_hid.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_hub.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_lookup.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_mbuf.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_msctest.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_parse.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_process.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_process.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_request.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_transfer.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_util.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_var.h#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdcache.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdkrpc.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdport.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdstate.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/nop/g_nop.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/raid3/g_raid3.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/sched/g_sched.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/sched/gs_rr.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/apic_vector.s#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/i686_mem.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ia64/acpica/OsdEnvironment.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_clocksource.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_et.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hhook.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_intr.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_lock.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_mib.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_ntptime.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sx.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/sched_4bsd.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/sched_ule.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_kobj.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_lock.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_pcpu.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_sleepqueue.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/subr_smp.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_subr.c#23 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/if_octm.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/octe/ethernet-tx.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/octeon_wdog.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/octopci.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/usb/octusb.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/cavium/usb/octusb_octeon.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/_types.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/cpufunc.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/md_var.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/param.h#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/pmap.h#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/proc.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/pte.h#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/dump_machdep.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/exception.S#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/machdep.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/pmap.c#23 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/swtch.S#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/trap.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/xlr_machdep.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/xls_ehci.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/if.c#25 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/netisr.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/route.c#17 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net/vnet.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_amrr.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_freebsd.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/common/ng_bluetooth.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_socket.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/cc/cc_htcp.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/if_ether.c#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_dn_io.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_dummynet.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_fw_dynamic.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_cc_functions.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_hostcache.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_subr.c#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_syncache.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_var.h#16 integrate
.. //depot/projects/soc2009/trasz_limits/sys/nfs/nfs_nfssvc.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/nfs/nfssvc.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/nlm/nlm_prot_impl.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/pci/if_rlreg.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/mmu_oea64.c#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/slb.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/trap.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/metadata.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/spr.h#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/vmparam.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/fcu.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/elf32_machdep.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/elf64_machdep.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/exec_machdep.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/ehci_ps3.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/rpc/clnt_dg.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/rpc/clnt_vc.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/rpc/svc.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/rpc/svc_vc.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/security/mac/mac_framework.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/db_trace.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/tlb.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/tsb.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/vm_machdep.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sun4v/sun4v/db_interface.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sun4v/sun4v/db_trace.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sun4v/sun4v/vm_machdep.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/param.h#30 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/priority.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/sysctl.h#12 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From afiveg at FreeBSD.org  Tue Jan 18 14:21:03 2011
From: afiveg at FreeBSD.org (Alexandre Fiveg)
Date: Tue Jan 18 14:21:06 2011
Subject: PERFORCE change 187913 for review
Message-ID: <201101181421.p0IEL2XE043919@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@187913?ac=10

Change 187913 by afiveg@cottonmouth on 2011/01/18 14:19:59

	deleting ringmap* files from -STABLE tree. I'll make a branch 
	for these files from -CURRENT to -STABLE

Affected files ...

.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#56 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#55 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#24 edit
.. //depot/projects/soc2010/ringmap/stable_8/contrib/libringmap/libringmap.c#2 edit
.. //depot/projects/soc2010/ringmap/stable_8/contrib/libringmap/libringmap.h#2 edit
.. //depot/projects/soc2010/ringmap/stable_8/sys/net/ringmap.c#5 delete
.. //depot/projects/soc2010/ringmap/stable_8/sys/net/ringmap.h#4 delete
.. //depot/projects/soc2010/ringmap/stable_8/sys/net/ringmap_kernel.h#4 delete

Differences ...

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#56 (text+ko) ====

@@ -61,7 +61,7 @@
 	.d_open 	= ringmap_open,
 	.d_close 	= ringmap_close,
 	.d_ioctl	= ringmap_ioctl,
-	.d_read		= ringmap_read,		/* Tell to user ring physical addr */
+	.d_read		= ringmap_read,	
 	.d_name 	= "ringmap_cdev"
 };
 
@@ -70,9 +70,9 @@
 
 
 /*
- * The function should be called from the attach function of generic network
- * driver. Here the ringmap structure is allocated and the character special
- * device for the communication with user is created. Also default ringmap
+ * The function is called from the attach function of generic network
+ * driver. Here is the ringmap structure allocated and the character special
+ * device for the communication with user created. Also default ringmap
  * functions are set.
  */
 struct ringmap *
@@ -116,7 +116,7 @@
 	/* 
 	 * Initialize the list of capturing objects. Each object represents the
 	 * thread that capture traffic and its ring. The objects werden created 
-	 * by open(2): see ringmap_open() further.
+	 * by open(2): see ringmap_open().
 	 */
 	SLIST_INIT(&rm->object_list);
 

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#55 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#24 (text+ko) ====


==== //depot/projects/soc2010/ringmap/stable_8/contrib/libringmap/libringmap.c#2 (text+ko) ====

@@ -1,0 +1,45 @@
+#include "libringmap.h"
+
+struct ring_handle * get_ring_handle(ringhandle_t);
+
+struct ring_handle {
+
+	ringhandle_t handle;
+
+	/* String that specifies the network device */
+	char *iface;		
+
+	/* 
+	 * File descriptor of character special device for communication with
+	 * ringmap in the kernel
+	 */
+	int cdev_fd;			
+
+	/* Each ring is with an unique integer number associated */
+	int ringnum;
+
+	/* Type of ring (queue) RX or TX */
+	int ringtype;
+
+	/* 
+	 * The number of slot in the ring buffer that is currently taken for
+	 * reading by userspace process
+	 */
+	unsigned int current_buffer;
+
+	/*
+	 * Pointer to the structure that represents the shared packet ring buffer
+	 */
+	struct ring *ring;
+
+	/* not in use yet */
+	int status;
+};
+
+
+int 
+get_ring_size(ringhandle_t)
+{
+
+	return (0);
+}

==== //depot/projects/soc2010/ringmap/stable_8/contrib/libringmap/libringmap.h#2 (text+ko) ====

@@ -1,4 +1,3 @@
-
 #define TYPE_RX_RING		0x0001
 #define TYPE_TX_RING		0x0002
 
@@ -6,38 +5,6 @@
 
 struct ring;
 
-struct ring_handle {
-	
-	/* String that specifies the network device */
-	char *iface;		
-
-	/* 
-	 * File descriptor of character special device for communication with
-	 * ringmap in the kernel
-	 */
-	int cdev_fd;			
-
-	/* Each ring is with an unique integer number associated */
-	int ringnum;
-
-	/* Type of ring (queue) RX or TX */
-	int ringtype;
-
-	/* 
-	 * The number of slot in the ring buffer that is currently taken for
-	 * reading by userspace process
-	 */
-	unsigned int current_buffer;
-
-	/*
-	 * Pointer to the structure that represents the shared packet ring buffer
-	 */
-	struct ring *ring;
-
-	/* not in use yet */
-	int status;
-};
-
 /*
  * This structure describes the conditions of an event during 
  * reading the packet in the current_buffer. 
@@ -74,7 +41,7 @@
 	int pktfilter_accept;
 };
 
-/* The handle for a ring (or queue) */
+/* The handle for a ring (a.k.a queue) */
 typedef int ringhandle_t;
 
 /*
@@ -151,12 +118,12 @@
 /*
  * Returns the number of packet buffers in the ring
  */
-int get_ring_size(void);
+int get_ring_size(ringhandle_t);
 
 /*
- * Returns the size of a packet buffer in bytes
+ * Returns the size of a packet buffer (a.k.a. Ring-Slot) in bytes.
  */
-unsigned int get_pktbuf_size(void);
+unsigned int get_pktbuf_size(ringhandle_t);
 
 /*
  * Returns the number of available receive rings
From afiveg at FreeBSD.org  Tue Jan 18 14:54:59 2011
From: afiveg at FreeBSD.org (Alexandre Fiveg)
Date: Tue Jan 18 14:55:01 2011
Subject: PERFORCE change 187915 for review
Message-ID: <201101181454.p0IEswmN050149@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@187915?ac=10

Change 187915 by afiveg@cottonmouth on 2011/01/18 14:53:54

	ringmap files are branched

Affected files ...

.. //depot/projects/soc2010/ringmap/stable_8/sys/net/ringmap.c#6 branch
.. //depot/projects/soc2010/ringmap/stable_8/sys/net/ringmap.h#5 branch
.. //depot/projects/soc2010/ringmap/stable_8/sys/net/ringmap_kernel.h#5 branch

Differences ...
From afiveg at FreeBSD.org  Tue Jan 18 15:58:42 2011
From: afiveg at FreeBSD.org (Alexandre Fiveg)
Date: Tue Jan 18 15:58:44 2011
Subject: PERFORCE change 187920 for review
Message-ID: <201101181558.p0IFwfKe062514@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@187920?ac=10

Change 187920 by afiveg@cottonmouth on 2011/01/18 15:58:37

	The character special device is named now as ringmap_

Affected files ...

.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#57 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#56 edit

Differences ...

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#57 (text+ko) ====

@@ -100,7 +100,7 @@
 	 */
 	rm->cdev = make_dev(&ringmap_devsw, device_get_unit(dev),
 						UID_ROOT, GID_WHEEL, 0666, 
-						device_get_nameunit(dev));
+						RINGMAP_DEVICE(device_get_nameunit(dev)));
 	if (rm->cdev == NULL) {
 		RINGMAP_ERROR(Can not create character device);
 		FREE(rm, M_DEVBUF);

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#56 (text+ko) ====

@@ -12,7 +12,7 @@
  * Prefix for name of device (for example /dev/ringmap_em0 will full name) 
  * currently not used, but it will!
  */
-#define RINGMAP_DEVICE 		"ringmap"
+#define RINGMAP_DEVICE(iface) 		"ringmap_"#iface
 
 /*
  * Default queue number. For multiqueue. Currently not used!
@@ -309,18 +309,18 @@
 
 #define PACKET_ADDR_DEB(ring, i)	\
 	if (__RINGMAP_DEB) {							\
-		printf("=+= packet.user=0x%X, packet.phys=0x%X, packet.kern=0x%X\n",\
-		(unsigned int)ring->slot[i].packet.user, 	\
-		(unsigned int)ring->slot[i].packet.phys, 	\
-		(unsigned int)ring->slot[i].packet.kern);	\
+		printf("=+= packet.user=%p, packet.phys=%p, packet.kern=%p\n",\
+				(void *)ring->slot[i].packet.user, 	\
+				(void *)ring->slot[i].packet.phys, 	\
+				(void *)ring->slot[i].packet.kern);	\
 	};
 
 #define PRINT_MBUF_ADDR(ring, i)	\
 	do {							\
-		printf("=+= mbuf.user=0x%X, mbuf.phys=0x%llX, mbuf.kern=0x%X\n",  \
-		(unsigned int)ring->slot[i].mbuf.user,			\
-		(long long unsigned int)ring->slot[i].mbuf.phys,\
-		(unsigned int)ring->slot[i].mbuf.kern);			\
+		printf("=+= mbuf.user=%p, mbuf.phys=%p, mbuf.kern=%p\n",  \
+				(void *)ring->slot[i].mbuf.user,			\
+				(void *)ring->slot[i].mbuf.phys,			\
+				(void *)ring->slot[i].mbuf.kern);			\
 	} while (0);
 
 #define PRINT_SLOT(ring, i)												\
From lz at FreeBSD.org  Wed Jan 19 07:23:57 2011
From: lz at FreeBSD.org (Zheng Liu)
Date: Wed Jan 19 07:23:59 2011
Subject: PERFORCE change 187944 for review
Message-ID: <201101190723.p0J7Nuug059466@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@187944?ac=10

Change 187944 by lz@gnehzuil-freebsd on 2011/01/19 07:23:26

	       Make 'mount -t ext4fs -r' can work well.
	
	       * Now we can use 'mount -t ext4fs -r /dev/XXX /YYY' to mount an ext4 file system
	         in read-only mode.
	       * Before using this command, You need to do the following steps to compile and
	         install ext4 kernel module:
	         1. enter sys/modules/ext4fs/
	         2. make && make install
	         Then you can use it to mount an ext4 file system.
	       * I don't create a new mount_ext4fs dir in sbin/ because external mount programs
	         needs to get away.

Affected files ...

.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_vfsops.c#3 edit

Differences ...

==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_vfsops.c#3 (text+ko) ====

@@ -92,7 +92,7 @@
 	.vfs_vget =		ext2_vget,
 };
 
-VFS_SET(ext2fs_vfsops, ext2fs, 0);
+VFS_SET(ext2fs_vfsops, ext4fs, 0);
 
 static int	ext2_check_sb_compat(struct ext2fs *es, struct cdev *dev,
 		    int ronly);
From trasz at FreeBSD.org  Wed Jan 19 15:50:22 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Wed Jan 19 15:50:25 2011
Subject: PERFORCE change 187950 for review
Message-ID: <201101191550.p0JFoMlT068739@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@187950?ac=10

Change 187950 by trasz@trasz_victim on 2011/01/19 15:49:16

	Make humanized output the default for userstat(1) and jailstat(1).

Affected files ...

.. //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#8 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#8 (text+ko) ====

@@ -30,13 +30,15 @@
 # $FreeBSD$
 
 usage() {
-	echo "usage: `basename $0` [-h]  [wait [count]]"
+	echo "usage: `basename $0` [-s]  [wait [count]]"
 	exit 1
 }
 
-while getopts 'h' cmd_arg; do
+hflag="-h"
+
+while getopts 's' cmd_arg; do
 	case "${cmd_arg}" in
-	h)	hflag="-h" ;;
+	s)	hflag="" ;;
 	*)	usage ;;
 	esac
 done
From trasz at FreeBSD.org  Wed Jan 19 17:21:26 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Wed Jan 19 17:21:28 2011
Subject: PERFORCE change 187958 for review
Message-ID: <201101191721.p0JHLP50089536@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@187958?ac=10

Change 187958 by trasz@trasz_victim on 2011/01/19 17:20:43

	Disable this piece of code; it's not really neccessary and might
	cause an ugly race condition.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#30 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#30 (text+ko) ====

@@ -3295,7 +3295,9 @@
 	rlim_t stacklim, vmemlim;
 	int is_procstack, rv;
 	struct ucred *cred;
+#ifdef notyet
 	uint64_t limit;
+#endif
 	int error;
 
 Retry:
@@ -3409,9 +3411,11 @@
 		grow_amount = trunc_page((vm_size_t)stacklim) -
 		    ctob(vm->vm_ssize);
 	}
-	limit = rusage_get_limit(p, RUSAGE_STACK);
+#ifdef notyet
+	limit = rusage_get_available(p, RUSAGE_STACK);
 	if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > limit))
 		grow_amount = limit - ctob(vm->vm_ssize);
+#endif
 
 	/* If we would blow our VMEM resource limit, no go */
 	if (map->size + grow_amount > vmemlim) {
From trasz at FreeBSD.org  Wed Jan 19 18:22:50 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Wed Jan 19 18:22:53 2011
Subject: PERFORCE change 187961 for review
Message-ID: <201101191822.p0JIMnD6001904@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@187961?ac=10

Change 187961 by trasz@trasz_victim on 2011/01/19 18:22:01

	Improve RSS enforcement.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#56 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#12 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_sem.c#10 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/container.h#22 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#6 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#23 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#56 (text+ko) ====

@@ -477,6 +477,23 @@
 }
 
 /*
+ * Returns amount of 'resource' the process 'p' can keep allocated.
+ * Allocating more than that would be denied, unless the resource
+ * is marked undeniable.  Amount of already allocated resource does
+ * matter.
+ */
+uint64_t
+rusage_get_available(struct proc *p, int resource)
+{
+
+#ifdef RCTL
+	return (rctl_get_available(p, resource));
+#else
+	return (UINT64_MAX);
+#endif
+}
+
+/*
  * Decrease allocation of 'resource' by 'amount' for process 'p'.
  */
 void
@@ -616,6 +633,7 @@
 	rusage_set(p, RUSAGE_FSIZE, 0);
 	rusage_set(p, RUSAGE_NPTS, 0);
 	rusage_set(p, RUSAGE_NTHR, 0);
+	rusage_set(p, RUSAGE_RSS, 0);
 
 #ifdef RCTL
 	rctl_proc_exit(p);

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#12 (text+ko) ====

@@ -389,6 +389,45 @@
 	return (amount);
 }
 
+uint64_t
+rctl_get_available(struct proc *p, int resource)
+{
+	struct rctl_rule *rule;
+	struct rctl_rule_link *link;
+	int64_t available, minavailable, allocated;
+
+	minavailable = INT64_MAX;
+
+	rw_rlock(&rctl_lock);
+
+	/*
+	 * There may be more than one matching rule; go through all of them.
+	 * Denial should be done last, after logging and sending signals.
+	 */
+	LIST_FOREACH(link, &p->p_container.c_rule_links, rrl_next) {
+		rule = link->rrl_rule;
+		if (rule->rr_resource != resource)
+			continue;
+		if (rule->rr_action != RCTL_ACTION_DENY)
+			continue;
+		available = rctl_available_resource(p, rule);
+		if (available < minavailable)
+			minavailable = available;
+	}
+
+	rw_runlock(&rctl_lock);
+
+	/*
+	 * XXX: Think about this _hard_.
+	 */
+	allocated = p->p_container.c_resources[resource];
+	if (minavailable < INT64_MAX - allocated)
+		minavailable += allocated;
+	if (minavailable < 0)
+		minavailable = 0;
+	return (minavailable);
+}
+
 static int
 rctl_rule_matches(const struct rctl_rule *rule, const struct rctl_rule *filter)
 {

==== //depot/projects/soc2009/trasz_limits/sys/kern/sysv_sem.c#10 (text+ko) ====

@@ -1018,7 +1018,7 @@
 		DPRINTF(("too many sops (max=%d, nsops=%d)\n", seminfo.semopm,
 		    nsops));
 		return (E2BIG);
-	} else if (nsops > rusage_get_limit(td->td_proc, RUSAGE_NSEMOP)) {
+	} else if (nsops > rusage_get_available(td->td_proc, RUSAGE_NSEMOP)) {
 		return (E2BIG);
 	} else
 		sops = malloc(nsops * sizeof(*sops), M_TEMP, M_WAITOK);

==== //depot/projects/soc2009/trasz_limits/sys/sys/container.h#22 (text+ko) ====

@@ -102,6 +102,7 @@
 void	rusage_sub(struct proc *p, int resource, uint64_t amount);
 void	rusage_sub_cred(struct ucred *cred, int resource, uint64_t amount);
 uint64_t	rusage_get_limit(struct proc *p, int resource);
+uint64_t	rusage_get_available(struct proc *p, int resource);
 
 void	container_create(struct container *container);
 void	container_destroy(struct container *container);

==== //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#6 (text+ko) ====

@@ -121,6 +121,7 @@
 
 int	rctl_enforce(struct proc *p, int resource, uint64_t amount);
 uint64_t	rctl_get_limit(struct proc *p, int resource);
+uint64_t	rctl_get_available(struct proc *p, int resource);
 const char	*rctl_resource_name(int resource);
 int	rctl_proc_fork(struct proc *parent, struct proc *child);
 void	rctl_proc_exit(struct proc *p);

==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#23 (text+ko) ====

@@ -1631,8 +1631,8 @@
 	struct proc *p;
 	struct thread *td;
 	struct vmspace *vm;
-	int breakout, swapout_flags;
-	uint64_t maxsize;
+	int breakout, swapout_flags, tryagain;
+	uint64_t rsize, ravailable;
 
 	while (TRUE) {
 		mtx_lock(&vm_daemon_mtx);
@@ -1651,6 +1651,8 @@
 		 * scan the processes for exceeding their rlimits or if
 		 * process is swapped out -- deactivate pages
 		 */
+again:
+		tryagain = 0;
 		sx_slock(&allproc_lock);
 		FOREACH_PROC_IN_SYSTEM(p) {
 			vm_pindex_t limit, size;
@@ -1708,29 +1710,39 @@
 				vm_pageout_map_deactivate_pages(
 				    &vm->vm_map, limit);
 			}
-			rusage_set(p, RUSAGE_RSS, IDX_TO_OFF(size));
-			maxsize = OFF_TO_IDX(rusage_get_limit(p, RUSAGE_RSS));
-			if (size > maxsize) {
+			rsize = IDX_TO_OFF(size);
+			rusage_set(p, RUSAGE_RSS, rsize);
+			ravailable = rusage_get_available(p, RUSAGE_RSS);
+			if (rsize > ravailable) {
 				/*
 				 * Don't be overly aggressive; this might be
 				 * an innocent process, and the limit could've
 				 * been exceeded by some memory hog.  Don't
-				 * try to deactivate more than half of process'
+				 * try to deactivate more than 1/4th of process'
 				 * resident set size.
 				 *
 				 * XXX: Reconsider.
 				 */
-				if (maxsize < size / 2)
-					maxsize = size / 2;
+				if (ravailable < rsize - (rsize / 4))
+					ravailable = rsize - (rsize / 4);
 				vm_pageout_map_deactivate_pages(
-				    &vm->vm_map, maxsize);
+				    &vm->vm_map, OFF_TO_IDX(ravailable));
 				/* Update RSS usage after paging out. */
 				size = vmspace_resident_count(vm);
-				rusage_set(p, RUSAGE_RSS, IDX_TO_OFF(size));
+				rsize = IDX_TO_OFF(size);
+				rusage_set(p, RUSAGE_RSS, rsize);
+				if (rsize > ravailable)
+					tryagain++;
+				if (tryagain > 20) {
+					printf("still too much: rsize = %ld, ravailable = %zd\n", rsize, ravailable);
+					tryagain = 0;
+				}
 			}
 			vmspace_free(vm);
 		}
 		sx_sunlock(&allproc_lock);
+		if (tryagain != 0)
+			goto again;
 	}
 }
 #endif			/* !defined(NO_SWAPPING) */
From kibab at FreeBSD.org  Wed Jan 19 19:50:35 2011
From: kibab at FreeBSD.org (Ilya Bakulin)
Date: Wed Jan 19 19:50:38 2011
Subject: PERFORCE change 187968 for review
Message-ID: <201101191950.p0JJoZgQ018848@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@187968?ac=10

Change 187968 by kibab@kibab_kibab-nb on 2011/01/19 19:50:20

	Fixed typo.

Affected files ...

.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_vol_ffs.c#3 edit

Differences ...

==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_vol_ffs.c#3 (text+ko) ====

@@ -43,7 +43,7 @@
 #include 
 #include 
 
-FEATURE(geom_vol, "Geom support for volume names from UFS superblok");
+FEATURE(geom_vol, "Geom support for volume names from UFS superblock");
 
 #define VOL_FFS_CLASS_NAME "VOL_FFS"
 
From lz at FreeBSD.org  Fri Jan 21 03:21:35 2011
From: lz at FreeBSD.org (Zheng Liu)
Date: Fri Jan 21 03:21:37 2011
Subject: PERFORCE change 188022 for review
Message-ID: <201101210321.p0L3LY5v018048@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@188022?ac=10

Change 188022 by lz@gnehzuil-freebsd on 2011/01/21 03:20:55

	       Add two sysctl variables to control reservation window algorithm.

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#29 edit

Differences ...

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#29 (text+ko) ====

@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -91,6 +92,14 @@
  *   groups without preference.
  */
 
+SYSCTL_NODE(_vfs, OID_AUTO, ext2fs, CTLFLAG_RW, 0, "EXT2FS filesystem");
+
+static int rsv = 1;
+SYSCTL_INT(_vfs_ext2fs, OID_AUTO, rsv, CTLFLAG_RW, &rsv, 0, "");
+
+static int rsv_winsize = 8;
+SYSCTL_UINT(_vfs_ext2fs, OID_AUTO, rsv_winsize, CTLFLAG_RW, &rsv_winsize, 0, "");
+
 /*
  * Allocate a free block.
  *
@@ -206,7 +215,10 @@
 	rp->rsv_start = EXT2_RSV_NOT_ALLOCATED;
 	rp->rsv_end = EXT2_RSV_NOT_ALLOCATED;
 
-	rp->rsv_goal_size = EXT2_RSV_DEFAULT_RESERVE_BLKS;
+        if (rsv_winsize < EXT2_RSV_MAX_RESERVE_BLKS)
+                rp->rsv_goal_size = rsv_winsize;
+        else
+                rp->rsv_goal_size = EXT2_RSV_DEFAULT_RESERVE_BLKS;
 	rp->rsv_alloc_hit = 0;
 
 	ip->i_rsv = rp;
@@ -236,7 +248,10 @@
         EXT2_TREE_LOCK(ip->i_e2fs);
         ext2_remove_rsv_win(ip->i_e2fs, rp);
         EXT2_TREE_UNLOCK(ip->i_e2fs);
-        rp->rsv_goal_size = EXT2_RSV_DEFAULT_RESERVE_BLKS;
+        if (rsv_winsize < EXT2_RSV_MAX_RESERVE_BLKS)
+                rp->rsv_goal_size = rsv_winsize;
+        else
+                rp->rsv_goal_size = EXT2_RSV_DEFAULT_RESERVE_BLKS;
 }
 
 /*
@@ -475,7 +490,7 @@
 /*
  * Allocate a block using reservation window in ext2 file system.
  *
- * NOTE: This function will replace the ext2_alloc() function.
+ * XXX: This function will replace the ext2_alloc() function.
  */
 int
 ext2_alloc_rsv(struct inode *ip, int32_t lbn, int32_t bpref,
@@ -505,6 +520,12 @@
 	else
 		cg = dtog(fs, bpref);
 
+        if (rsv == 0) {
+                bno = (daddr_t)ext2_hashalloc(ip, cg, bpref, fs->e2fs_bsize,
+                                                        ext2_alloccg);
+                goto allocated;
+        }
+
         /* If cg has some free blocks, then try to allocate a free block from this cg */
         if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) {
                 /* Read block bitmap from buffer */
From rwatson at FreeBSD.org  Fri Jan 21 13:39:03 2011
From: rwatson at FreeBSD.org (Robert Watson)
Date: Fri Jan 21 13:39:05 2011
Subject: PERFORCE change 188031 for review
Message-ID: <201101211339.p0LDd2Qk039172@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@188031?ac=10

Change 188031 by rwatson@rwatson_cinnamon on 2011/01/21 13:38:23

	The parts of Capsicum being merged to 9-CURRENT are believed only
	to break your computer system in known ways.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#32 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#30 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#32 (text+ko) ====

@@ -2,10 +2,6 @@
  * Copyright (c) 2008-2009 Robert N. M. Watson
  * All rights reserved.
  *
- * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED
- * ON IN PRODUCTION SYSTEMS.  IT WILL BREAK YOUR SOFTWARE IN NEW AND
- * UNEXPECTED WAYS.
- *
  * This software was developed at the University of Cambridge Computer
  * Laboratory with support from a grant from Google, Inc.
  *
@@ -50,7 +46,7 @@
 #include "opt_capabilities.h"
 
 #include 
-__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#31 $");
+__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#32 $");
 
 #include 
 #include 

==== //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#30 (text+ko) ====

@@ -1,10 +1,6 @@
 /*-
  * Copyright (c) 2008-2009 Robert N. M. Watson
  * All rights reserved.
- *
- * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED
- * ON IN PRODUCTION SYSTEMS.  IT WILL BREAK YOUR SOFTWARE IN NEW AND
- * UNEXPECTED WAYS.
  * 
  * This software was developed at the University of Cambridge Computer
  * Laboratory with support from a grant from Google, Inc. 
@@ -30,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#29 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#30 $
  */
 
 /*
From trasz at FreeBSD.org  Fri Jan 21 16:23:11 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Fri Jan 21 16:23:14 2011
Subject: PERFORCE change 188033 for review
Message-ID: <201101211623.p0LGNAqi074520@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@188033?ac=10

Change 188033 by trasz@trasz_victim on 2011/01/21 16:22:37

	Add manual page for userstat(8).

Affected files ...

.. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#2 edit
.. //depot/projects/soc2009/trasz_limits/usr.bin/userstat/Makefile#2 edit
.. //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.8#1 add

Differences ...

==== //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#2 (text+ko) ====

@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 3, 2009
+.Dd February 13, 2011
 .Dt RCTL 8
 .Os
 .Sh NAME
@@ -98,17 +98,17 @@
 the defined action triggers.
 .Pp
 The per field defines what entity the limit gets accounted for.
-For example, rule "loginclass:users:memoryuse:deny=100M/process" means
-that each process of any user belonging to login class "users" may use up to 100MB
-of memory.
-Rule "loginclass:users:memoryuse:deny=100M/user" would mean that the sum of
-memory used by all processes of any user belonging to the login class "users"
-will not exceed 100MB.
-Rule "loginclass:users:memoryuse:deny=100M/loginclass" would mean that the sum of
-memory used by all processes of all users belonging to that login class will
-not exceed 100MB.
+For example, rule "loginclass:users:vmem:deny=100M/process" means
+that each process of any user belonging to login class "users" may allocate
+up to 100MB of virtual memory.
+Rule "loginclass:users:vmem:deny=100M/user" would mean that for each
+user belonging to the login class "users", the sum of virtual memory allocated
+by all the processes of a that user will not exceed 100MB.
+Rule "loginclass:users:vmem:deny=100M/loginclass" would mean that the sum of
+virtual memory allocated by all processes of all users belonging to that login
+class will not exceed 100MB.
 .Pp
-Valid rule has all of these fields specified, except for the per, which defaults
+Valid rule has all those fields specified, except for the per, which defaults
 to the value of subject.
 .Pp
 A filter is a rule for which one of more fields other than per is left empty.
@@ -119,8 +119,8 @@
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
-.Xr id 1 ,
-.Xr limits 1
+.Xr jailstat 8 ,
+.Xr userstat 8
 .Sh HISTORY
 The
 .Nm

==== //depot/projects/soc2009/trasz_limits/usr.bin/userstat/Makefile#2 (text+ko) ====

@@ -3,8 +3,7 @@
 SCRIPTS= userstat.sh
 LINKS=	${BINDIR}/userstat ${BINDIR}/jailstat
 
-#MAN=	userstat.1
-#MLINKS=	jailstat.1
-MAN=	
+MAN=	userstat.8
+MLINKS=	userstat.8 jailstat.8
 
 .include 
From trasz at FreeBSD.org  Fri Jan 21 16:28:41 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Fri Jan 21 16:28:46 2011
Subject: PERFORCE change 188034 for review
Message-ID: <201101211628.p0LGSes1074578@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@188034?ac=10

Change 188034 by trasz@trasz_victim on 2011/01/21 16:27:49

	Rename userstat/userstat.sh to jailstat/jailstat.sh.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/usr.bin/Makefile#16 edit
.. //depot/projects/soc2009/trasz_limits/usr.bin/jailstat/Makefile#1 add
.. //depot/projects/soc2009/trasz_limits/usr.bin/jailstat/jailstat.8#1 add
.. //depot/projects/soc2009/trasz_limits/usr.bin/jailstat/jailstat.sh#1 branch
.. //depot/projects/soc2009/trasz_limits/usr.bin/userstat/Makefile#3 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.8#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#9 delete

Differences ...

==== //depot/projects/soc2009/trasz_limits/usr.bin/Makefile#16 (text+ko) ====

@@ -64,6 +64,7 @@
 	id \
 	ipcrm \
 	ipcs \
+	jailstat \
 	join \
 	jot \
 	kdump \
From trasz at FreeBSD.org  Fri Jan 21 16:53:54 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Fri Jan 21 16:54:02 2011
Subject: PERFORCE change 188035 for review
Message-ID: <201101211653.p0LGrrLC081131@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@188035?ac=10

Change 188035 by trasz@trasz_victim on 2011/01/21 16:53:15

	Update TODO, expand manual page.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/TODO#40 edit
.. //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#3 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/TODO#40 (text+ko) ====

@@ -1,44 +1,29 @@
-Limits done:
+TODO:
 
- - CPU time (RUSAGE_CPU), in microseconds
- - data size (RUSAGE_DATA), in megabytes
- - maximum file size (RUSAGE_FSIZE), in megabytes
- - number of processes (RUSAGE_NPROC)
- - virtual memory usage (address space limit) (RUSAGE_VMEM), in megabytes
- - maximum core size (RUSAGE_CORE), in megabytes (core, as in ELF program state dump)
- - locked memory usage (RUSAGE_MEMLOCK), in megabytes
- - resident set size (physical memory usage) (RUSAGE_RSS), in megabytes
- - stack size (RUSAGE_STACK), in megabytes,
- - number of file descriptors (RUSAGE_NOFILE)
- - swap usage (RUSAGE_SWAP), in megabytes
- - amount of memory consumed by socket buffers (RUSAGE_SBSIZE), in megabytes
- - number of kernel-visible threads (RUSAGE_NTHR)
- - wallclock time (RUSAGE_WALLCLOCK)
- - %cpu time (RUSAGE_PCTCPU)
- - number of SysV shared memory segments (RUSAGE_NSHM)
- - SysV shared memory size, in megabytes (RUSAGE_SHMSIZE)
- - number of SysV semaphores modified in a single semop(2) call (RUSAGE_NSEMOP)
- - number of SysV semaphores (RUSAGE_NSEM)
- - number of SysV queues (RUSAGE_NMSGQ)
- - number of queued SysV messages (RUSAGE_MSGQQUEUED)
- - SysV message queue size, in megabytes (RUSAGE_MSGQSIZE)
+ - Fix %CPU limits for shortly living processes.
 
-Milestone 3:
+ - Consider replacing proc pointer with thread pointer in rusage_add(9) et al.
+   In most cases caller uses 'td->td_proc' anyway, and passing thread would
+   allow the HRL code to send a signal to the offending thread instead of the
+   offending process.  It would also mean that these the functions would
+   no longer need to be called with proc lock held, because we could use
+   td->td_ucred, which is stable across the syscall.
 
- - Fix %CPU limits for shortly living processes.
-
  - Get rid of container_lock.  Atomic instructions would be nice, but we really
    need 64 bits (per-process counters could be 32 bit, I guess, but the higher
    level containers could overflow), and atomic(9) doesn't support 64 bit values
    on 32 bit platforms.
 
- - Consider replacing proc pointer with thread pointer in rusage_add(9) et al.
-   In most cases caller uses 'td->td_proc' anyway, and passing thread would
-   allow the HRL code to send a signal to the offending thread instead of the
-   offending process.
+ - Don't account resources for system processes.  It's not as easy as checking
+   for P_SYSTEM flag, as the flag will be set for AIO kernel processes.
+
+   Also, try to figure out what's going on with 'intr' p_flag - checking for P_SYSTEM
+   didn't really work for that process.
 
 Issues:
 
+ - Setting RSS limit too low can make the system thrash to death.
+
  - We enforce limits when a process allocates a resource, and when it forks.
    We don't enforce limits when process changes its credentials, though.  This
    might be either a bug or feature, depending on point of view.
@@ -66,24 +51,6 @@
    container mechanism.  This is a part of HRL, and it's outside the scope
    of the containers project.  This means the code is full of "#ifdef CONTAINERS".
 
- - Don't account resources for system processes.  It's not as easy as checking
-   for P_SYSTEM flag, as the flag will be set for AIO kernel processes.
-
-   Also, try to figure out what's going on with 'intr' p_flag - checking for P_SYSTEM
-   didn't really work for that process.
-
- - Right now, the whole containers stuff is under a single mutex.  This is internal
-   to containers, i.e. the API consumers don't need to care, thus it's easy to change.
-
-   I'd need to run benchmarks first, but two strategies come to mind:
-
-   1. Replace container_lock with rmlock, protecting the container hierarchy.  The lock
-      would be acquired for write in operations changing the hierarchy, and for read
-      for all other operations.  When locked for read, the counters would be accessed
-      using atomic instructions.
-
-   2. Replace single container_lock with individual per-container mutexes.
-
  - RUSAGE_NOFILE accounts for size of file descriptor table, rather than the number
    of file descriptors.  This shouldn't be a problem, but might be worth keeping
    in mind.

==== //depot/projects/soc2009/trasz_limits/usr.bin/rctl/rctl.8#3 (text+ko) ====

@@ -116,6 +116,34 @@
 or, in short, ":".  A filter that matches all the login classes would be
 "loginclass:".  A filter that matches all defined limits for maxprocesses
 resource would be "::maxprocesses".
+.Pp
+.Sh RESOURCES
+.Bl -column -offset 3n "msgqqueued"
+.It cpu		CPU time, in microseconds
+.It fsize	maximum file size, in megabytes
+.It data	data size, in megabytes
+.It stack	stack size, in megabytes
+.It core	core dump size, in megabytes
+.It rss		resident set size, in megabytes
+.It memlock	locked memory, in megabytes
+.It nproc	number of processes
+.It nofile	file descriptor table size
+.It sbsize	memory consumed by socket buffers, in megabytes
+.It vmem	address space limit, in megabytes
+.It npts	number of PTYs
+.It swap	swap usage, in megabytes
+.It nthr	number of threads
+.It msgqqueued	number of queued SysV messages
+.It msgqsize	SysV message queue size, in megabytes
+.It nmsgq	number of SysV message queues
+.It nsem	number of SysV semaphores
+.It nsemop	number of SysV semaphores modified in a single semop(2) call
+.It nshm	number of SysV shared memory segments
+.It shmsize	SysV shared memory size, in megabytes
+.It wallclock	wallclock time
+.It pctcpu	%cpu time
+.El
+.Pp
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
From trasz at FreeBSD.org  Fri Jan 21 17:11:29 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Fri Jan 21 17:11:32 2011
Subject: PERFORCE change 188036 for review
Message-ID: <201101211711.p0LHBSRp086159@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@188036?ac=10

Change 188036 by trasz@trasz_victim on 2011/01/21 17:11:09

	Since rusage_{add,sub,set} functions dereference p_ucred, we need
	to keep proc lock held when calling them.  In the future I'll probably
	move to using thread pointers instead of proc pointers, and I'll be
	able to use td_ucred, which is stable; for now, this will have to do.
	
	It's not _that_ ugly.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#23 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#36 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#57 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#19 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#30 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#31 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#13 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sig.c#20 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_thr.c#13 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_msg.c#10 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_sem.c#11 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_shm.c#12 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#24 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_sockbuf.c#8 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#18 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_glue.c#13 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#31 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#23 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#24 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_unix.c#14 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#23 (text+ko) ====

@@ -1105,7 +1105,10 @@
 	hdrsize = 0;
 	__elfN(puthdr)(td, (void *)NULL, &hdrsize, seginfo.count);
 
-	if (rusage_add(td->td_proc, RUSAGE_CORE, hdrsize + seginfo.size)) {
+	PROC_LOCK(td->td_proc);
+	error = rusage_add(td->td_proc, RUSAGE_CORE, hdrsize + seginfo.size);
+	PROC_UNLOCK(td->td_proc);
+	if (error != 0) {
 		error = EFAULT;
 		goto done;
 	}

==== //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#36 (text+ko) ====

@@ -553,7 +553,9 @@
 	 * Charge root for one process.
 	 */
 	(void)chgproccnt(p->p_ucred->cr_ruidinfo, 1, 0);
+	PROC_LOCK(p);
 	rusage_add_force(p, RUSAGE_NPROC, 1);
+	PROC_UNLOCK(p);
 }
 SYSINIT(p0init, SI_SUB_INTRINSIC, SI_ORDER_FIRST, proc0_init, NULL);
 

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#57 (text+ko) ====

@@ -306,6 +306,10 @@
 
 	SDT_PROBE(container, kernel, rusage, add, p, resource, amount, 0, 0);
 
+	/*
+	 * We need proc lock to dereference p->p_ucred.
+	 */
+	PROC_LOCK_ASSERT(p, MA_OWNED);
 	KASSERT(amount >= 0, ("rusage_add: invalid amount for resource %d: %ju",
 	    resource, amount));
 
@@ -369,6 +373,10 @@
 
 	SDT_PROBE(container, kernel, rusage, add_force, p, resource, amount, 0, 0);
 
+	/*
+	 * We need proc lock to dereference p->p_ucred.
+	 */
+	PROC_LOCK_ASSERT(p, MA_OWNED);
 	KASSERT(amount >= 0, ("rusage_add_force: invalid amount for resource %d: %ju",
 	    resource, amount));
 
@@ -391,6 +399,10 @@
 
 	SDT_PROBE(container, kernel, rusage, set, p, resource, amount, 0, 0);
 
+	/*
+	 * We need proc lock to dereference p->p_ucred.
+	 */
+	PROC_LOCK_ASSERT(p, MA_OWNED);
 	KASSERT(amount >= 0, ("rusage_set: invalid amount for resource %d: %ju",
 	    resource, amount));
 
@@ -446,6 +458,10 @@
 
 	SDT_PROBE(container, kernel, rusage, set, p, resource, amount, 0, 0);
 
+	/*
+	 * We need proc lock to dereference p->p_ucred.
+	 */
+	PROC_LOCK_ASSERT(p, MA_OWNED);
 	KASSERT(amount >= 0, ("rusage_set: invalid amount for resource %d: %ju",
 	    resource, amount));
 
@@ -505,6 +521,10 @@
 
 	SDT_PROBE(container, kernel, rusage, sub, p, resource, amount, 0, 0);
 
+	/*
+	 * We need proc lock to dereference p->p_ucred.
+	 */
+	PROC_LOCK_ASSERT(p, MA_OWNED);
 	KASSERT(amount >= 0, ("rusage_sub: invalid amount for resource %d: %ju",
 	    resource, amount));
 	KASSERT(container_resource_reclaimable(resource),
@@ -600,15 +620,10 @@
 	}
 
 out:
-	mtx_unlock(&container_lock);
-	PROC_UNLOCK(child);
-	PROC_UNLOCK(parent);
-
 #ifdef RCTL
 	if (error == 0) {
 		error = rctl_proc_fork(parent, child);
 		if (error != 0) {
-			mtx_lock(&container_lock);
 			/*
 			 * XXX: The only purpose of these two lines is to prevent from
 			 * tripping checks in container_destroy().
@@ -616,11 +631,14 @@
 			for (i = 0; i <= RUSAGE_MAX; i++)
 				rusage_set_locked(child, i, 0);
 			container_destroy_locked(&child->p_container);
-			mtx_unlock(&container_lock);
 		}
 	}
 #endif
 
+	mtx_unlock(&container_lock);
+	PROC_UNLOCK(child);
+	PROC_UNLOCK(parent);
+
 	return (error);
 }
 
@@ -630,10 +648,12 @@
 	/*
 	 * XXX: Free this some other way.
 	 */
+	PROC_LOCK(p);
 	rusage_set(p, RUSAGE_FSIZE, 0);
 	rusage_set(p, RUSAGE_NPTS, 0);
 	rusage_set(p, RUSAGE_NTHR, 0);
 	rusage_set(p, RUSAGE_RSS, 0);
+	PROC_UNLOCK(p);
 
 #ifdef RCTL
 	rctl_proc_exit(p);
@@ -774,11 +794,13 @@
 			else
 				rusage_throttle(p, 0);
 			PROC_SUNLOCK(p);
-			rusage_set(p, RUSAGE_CPU, cputick2usec(p->p_rux.rux_runtime));
 			microuptime(&wallclock);
 			timevalsub(&wallclock, &p->p_stats->p_start);
+			PROC_LOCK(p);
 			rusage_set(p, RUSAGE_WALLCLOCK, wallclock.tv_sec * 1000000 + wallclock.tv_usec);
 			rusage_set(p, RUSAGE_PCTCPU, pctcpu);
+			rusage_set(p, RUSAGE_CPU, cputick2usec(p->p_rux.rux_runtime));
+			PROC_UNLOCK(p);
 		}
 		sx_sunlock(&allproc_lock);
 		pause("-", hz);

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#19 (text+ko) ====

@@ -279,8 +279,8 @@
 	PROC_LOCK(p);
 	td->td_retval[0] =
 	    min((int)lim_cur(p, RLIMIT_NOFILE), maxfilesperproc);
+	lim = rusage_get_limit(td->td_proc, RUSAGE_NOFILE);
 	PROC_UNLOCK(p);
-	lim = rusage_get_limit(td->td_proc, RUSAGE_NOFILE);
 	if (lim < td->td_retval[0])
 		td->td_retval[0] = lim;
 	return (0);
@@ -804,7 +804,10 @@
 			 * descriptors, just put the limit on the size of the file
 			 * descriptor table.
 			 */
-			if (rusage_set(p, RUSAGE_NOFILE, new + 1)) {
+			PROC_LOCK(p);
+			error = rusage_set(p, RUSAGE_NOFILE, new + 1);
+			PROC_UNLOCK(p);
+			if (error != 0) {
 				FILEDESC_XUNLOCK(fdp);
 				fdrop(fp, td);
 				return (EMFILE);
@@ -1456,7 +1459,7 @@
 {
 	struct proc *p = td->td_proc;
 	struct filedesc *fdp = p->p_fd;
-	int fd = -1, maxfd;
+	int fd = -1, maxfd, error;
 
 	FILEDESC_XLOCK_ASSERT(fdp);
 
@@ -1479,7 +1482,10 @@
 			return (EMFILE);
 		if (fd < fdp->fd_nfiles)
 			break;
-		if (rusage_set(p, RUSAGE_NOFILE, min(fdp->fd_nfiles * 2, maxfd)))
+		PROC_LOCK(p);
+		error = rusage_set(p, RUSAGE_NOFILE, min(fdp->fd_nfiles * 2, maxfd));
+		PROC_UNLOCK(p);
+		if (error != 0)
 			return (EMFILE);
 		fdgrowtable(fdp, min(fdp->fd_nfiles * 2, maxfd));
 	}
@@ -1763,7 +1769,9 @@
 	if (fdp == NULL)
 		return;
 
+	PROC_LOCK(td->td_proc);
 	rusage_set(td->td_proc, RUSAGE_NOFILE, 0);
+	PROC_UNLOCK(td->td_proc);
 
 	/* Check for special need to clear POSIX style locks */
 	fdtol = td->td_proc->p_fdtol;

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#30 (text+ko) ====

@@ -741,13 +741,17 @@
 	 * Decrement the count of procs running with this uid.
 	 */
 	(void)chgproccnt(p->p_ucred->cr_ruidinfo, -1, 0);
-	rusage_set(p, RUSAGE_CPU, cputick2usec(p->p_rux.rux_runtime));
-	rusage_sub(p->p_pptr, RUSAGE_NPROC, 1);
 
 	/*
 	 * Destroy resource container associated with the process.
 	 */
+	PROC_LOCK(p);
+	rusage_set(p, RUSAGE_CPU, cputick2usec(p->p_rux.rux_runtime));
+	PROC_UNLOCK(p);
 	container_proc_exit(p);
+	PROC_LOCK(p->p_pptr);
+	rusage_sub(p->p_pptr, RUSAGE_NPROC, 1);
+	PROC_UNLOCK(p->p_pptr);
 
 	/*
 	 * Free credentials, arguments, and sigacts.
@@ -908,10 +912,11 @@
 	if (child->p_pptr == parent)
 		return;
 
-	rusage_sub(child->p_pptr, RUSAGE_NPROC, 1);
+	PROC_LOCK(parent);
 	rusage_add_force(parent, RUSAGE_NPROC, 1);
-
+	PROC_UNLOCK(parent);
 	PROC_LOCK(child->p_pptr);
+	rusage_sub(child->p_pptr, RUSAGE_NPROC, 1);
 	sigqueue_take(child->p_ksi);
 	PROC_UNLOCK(child->p_pptr);
 	LIST_REMOVE(child, p_sibling);

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#31 (text+ko) ====

@@ -712,7 +712,9 @@
 		return (fork_norfproc(td, flags));
 	}
 
+	PROC_LOCK(p1);
 	error = rusage_add(p1, RUSAGE_NPROC, 1);
+	PROC_UNLOCK(p1);
 	if (error != 0)
 		return (error);
 
@@ -801,7 +803,9 @@
 	/*
 	 * After fork, there is exactly one thread running.
 	 */
+	PROC_LOCK(newproc);
 	error = rusage_set(newproc, RUSAGE_NTHR, 1);
+	PROC_UNLOCK(newproc);
 	if (error != 0) {
 		error = EAGAIN;
 		goto fail;
@@ -848,7 +852,9 @@
 		vmspace_free(vm2);
 	uma_zfree(proc_zone, newproc);
 	pause("fork", hz / 2);
+	PROC_LOCK(p1);
 	rusage_sub(p1, RUSAGE_NPROC, 1);
+	PROC_UNLOCK(p1);
 	return (error);
 }
 

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#13 (text+ko) ====

@@ -185,24 +185,6 @@
 	panic("rctl_resource_name: unknown resource %d", resource);
 }
 
-static void
-rctl_deferred_psignal(struct proc *p, int signum)
-{
-	int need_lock;
-
-	/*
-	 * XXX: This is ugly.  Either turn it into a real taskqueue,
-	 *      or think about the locking and don't lock proc here.
-	 */
-	need_lock = !PROC_LOCKED(p);
-
-	if (need_lock)
-		PROC_LOCK(p);
-	psignal(p, signum);
-	if (need_lock)
-		PROC_UNLOCK(p);
-}
-
 /*
  * Return the amount of resource that can be allocated by 'p' before
  * hitting 'rule'.
@@ -325,22 +307,22 @@
 			free(buf, M_RCTL);
 			continue;
 		case RCTL_ACTION_SIGHUP:
-			rctl_deferred_psignal(p, SIGHUP);
+			psignal(p, SIGHUP);
 			continue;
 		case RCTL_ACTION_SIGINT:
-			rctl_deferred_psignal(p, SIGINT);
+			psignal(p, SIGINT);
 			continue;
 		case RCTL_ACTION_SIGKILL:
-			rctl_deferred_psignal(p, SIGKILL);
+			psignal(p, SIGKILL);
 			continue;
 		case RCTL_ACTION_SIGSEGV:
-			rctl_deferred_psignal(p, SIGSEGV);
+			psignal(p, SIGSEGV);
 			continue;
 		case RCTL_ACTION_SIGXCPU:
-			rctl_deferred_psignal(p, SIGXCPU);
+			psignal(p, SIGXCPU);
 			continue;
 		case RCTL_ACTION_SIGXFSZ:
-			rctl_deferred_psignal(p, SIGXFSZ);
+			psignal(p, SIGXFSZ);
 			continue;
 		default:
 			panic("rctl_enforce: unknown action %d",

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_sig.c#20 (text+ko) ====

@@ -3169,15 +3169,15 @@
 	 * if it is larger than the limit.
 	 */
 	limit = (off_t)lim_cur(p, RLIMIT_CORE);
-	PROC_UNLOCK(p);
-	if (limit == 0 && rusage_add(td->td_proc, RUSAGE_CORE, 1) == 0) {
-		rusage_sub(td->td_proc, RUSAGE_CORE, 1);
+	if (limit == 0 && rusage_get_available(p, RUSAGE_CORE) == 0) {
+		PROC_UNLOCK(p);
 #ifdef AUDIT
 		audit_proc_coredump(td, name, EFBIG);
 #endif
 		free(name, M_TEMP);
 		return (EFBIG);
 	}
+	PROC_UNLOCK(p);
 
 restart:
 	NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_SYSSPACE, name, td);

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_thr.c#13 (text+ko) ====

@@ -176,7 +176,11 @@
 			return (EINVAL);
 		}
 	}
-	if (rusage_add(p, RUSAGE_NTHR, 1))
+
+	PROC_LOCK(td->td_proc);
+	error = rusage_add(p, RUSAGE_NTHR, 1);
+	PROC_UNLOCK(td->td_proc);
+	if (error != 0)
 		return (EPROCLIM);
 
 	/* Initialize our td */
@@ -265,7 +269,9 @@
 	return (0);
 
 fail:
+	PROC_LOCK(p);
 	rusage_sub(p, RUSAGE_NTHR, 1);
+	PROC_UNLOCK(p);
 	return (error);
 }
 
@@ -297,9 +303,9 @@
 
 	rw_wlock(&tidhash_lock);
 
+	PROC_LOCK(p);
 	rusage_sub(p, RUSAGE_NTHR, 1);
 
-	PROC_LOCK(p);
 	/*
 	 * Shutting down last thread in the proc.  This will actually
 	 * call exit() in the trampoline when it returns.

==== //depot/projects/soc2009/trasz_limits/sys/kern/sysv_msg.c#10 (text+ko) ====

@@ -618,7 +618,10 @@
 			error = ENOSPC;
 			goto done2;
 		}
-		if (rusage_add(td->td_proc, RUSAGE_NMSGQ, 1)) {
+		PROC_LOCK(td->td_proc);
+		error = rusage_add(td->td_proc, RUSAGE_NMSGQ, 1);
+		PROC_UNLOCK(td->td_proc);
+		if (error != 0) {
 			error = ENOSPC;
 			goto done2;
 		}
@@ -719,16 +722,20 @@
 		goto done2;
 #endif
 
+	PROC_LOCK(td->td_proc);
 	if (rusage_add(td->td_proc, RUSAGE_MSGQQUEUED, 1)) {
+		PROC_UNLOCK(td->td_proc);
 		error = EAGAIN;
 		goto done2;
 	}
 	saved_msgsz = msgsz;
 	if (rusage_add(td->td_proc, RUSAGE_MSGQSIZE, msgsz)) {
 		rusage_sub(td->td_proc, RUSAGE_MSGQQUEUED, 1);
+		PROC_UNLOCK(td->td_proc);
 		error = EAGAIN;
 		goto done2;
 	}
+	PROC_UNLOCK(td->td_proc);
 
 	segs_needed = (msgsz + msginfo.msgssz - 1) / msginfo.msgssz;
 	DPRINTF(("msgsz=%zu, msgssz=%d, segs_needed=%d\n", msgsz,
@@ -984,8 +991,10 @@
 	td->td_retval[0] = 0;
 done3:
 	if (error != 0) {
+		PROC_LOCK(td->td_proc);
 		rusage_sub(td->td_proc, RUSAGE_MSGQQUEUED, 1);
 		rusage_sub(td->td_proc, RUSAGE_MSGQSIZE, saved_msgsz);
+		PROC_UNLOCK(td->td_proc);
 	}
 done2:
 	mtx_unlock(&msq_mtx);

==== //depot/projects/soc2009/trasz_limits/sys/kern/sysv_sem.c#11 (text+ko) ====

@@ -929,7 +929,10 @@
 			error = ENOSPC;
 			goto done2;
 		}
-		if (rusage_add(td->td_proc, RUSAGE_NSEM, nsems)) {
+		PROC_LOCK(td->td_proc);
+		error = rusage_add(td->td_proc, RUSAGE_NSEM, nsems);
+		PROC_UNLOCK(td->td_proc);
+		if (error != 0) {
 			error = ENOSPC;
 			goto done2;
 		}
@@ -1018,10 +1021,16 @@
 		DPRINTF(("too many sops (max=%d, nsops=%d)\n", seminfo.semopm,
 		    nsops));
 		return (E2BIG);
-	} else if (nsops > rusage_get_available(td->td_proc, RUSAGE_NSEMOP)) {
-		return (E2BIG);
-	} else
+	} else {
+		PROC_LOCK(td->td_proc);
+		if (nsops > rusage_get_available(td->td_proc, RUSAGE_NSEMOP)) {
+			PROC_UNLOCK(td->td_proc);
+			return (E2BIG);
+		}
+		PROC_UNLOCK(td->td_proc);
+
 		sops = malloc(nsops * sizeof(*sops), M_TEMP, M_WAITOK);
+	}
 	if ((error = copyin(uap->sops, sops, nsops * sizeof(sops[0]))) != 0) {
 		DPRINTF(("error = %d from copyin(%p, %p, %d)\n", error,
 		    uap->sops, sops, nsops * sizeof(sops[0])));

==== //depot/projects/soc2009/trasz_limits/sys/kern/sysv_shm.c#12 (text+ko) ====

@@ -670,12 +670,17 @@
 		shm_last_free = -1;
 	}
 	shmseg = &shmsegs[segnum];
-	if (rusage_add(td->td_proc, RUSAGE_NSHM, 1))
+	PROC_LOCK(td->td_proc);
+	if (rusage_add(td->td_proc, RUSAGE_NSHM, 1)) {
+		PROC_UNLOCK(td->td_proc);
 		return (ENOSPC);
+	}
 	if (rusage_add(td->td_proc, RUSAGE_SHMSIZE, size)) {
 		rusage_sub(td->td_proc, RUSAGE_NSHM, 1);
+		PROC_UNLOCK(td->td_proc);
 		return (ENOMEM);
 	}
+	PROC_UNLOCK(td->td_proc);
 	/*
 	 * In case we sleep in malloc(), mark the segment present but deleted
 	 * so that noone else tries to create the same key.
@@ -692,8 +697,10 @@
 	shm_object = vm_pager_allocate(shm_use_phys ? OBJT_PHYS : OBJT_SWAP,
 	    0, size, VM_PROT_DEFAULT, 0, cred);
 	if (shm_object == NULL) {
+		PROC_LOCK(td->td_proc);
 		rusage_sub(td->td_proc, RUSAGE_NSHM, 1);
 		rusage_sub(td->td_proc, RUSAGE_SHMSIZE, size);
+		PROC_UNLOCK(td->td_proc);
 		return (ENOMEM);
 	}
 	VM_OBJECT_LOCK(shm_object);

==== //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#24 (text+ko) ====

@@ -721,16 +721,19 @@
 	struct ucred *cred = td->td_ucred;
 
 	/* Resource limiting. */
+	PROC_LOCK(p);
 	error = rusage_add(p, RUSAGE_NPTS, 1);
-	if (error != 0)
+	if (error != 0) {
+		PROC_UNLOCK(p);
 		return (EAGAIN);
-	PROC_LOCK(p);
+	}
 	ok = chgptscnt(cred->cr_ruidinfo, 1, lim_cur(p, RLIMIT_NPTS));
-	PROC_UNLOCK(p);
 	if (!ok) {
 		rusage_sub(p, RUSAGE_NPTS, 1);
+		PROC_UNLOCK(p);
 		return (EAGAIN);
 	}
+	PROC_UNLOCK(p);
 
 	/* Try to allocate a new pts unit number. */
 	unit = alloc_unr(pts_pool);
@@ -772,16 +775,19 @@
 	struct ucred *cred = td->td_ucred;
 
 	/* Resource limiting. */
+	PROC_LOCK(p);
 	error = rusage_add(p, RUSAGE_NPTS, 1);
-	if (error != 0)
+	if (error != 0) {
+		PROC_UNLOCK(p);
 		return (EAGAIN);
-	PROC_LOCK(p);
+	}
 	ok = chgptscnt(cred->cr_ruidinfo, 1, lim_cur(p, RLIMIT_NPTS));
-	PROC_UNLOCK(p);
 	if (!ok) {
 		rusage_sub(p, RUSAGE_NPTS, 1);
+		PROC_UNLOCK(p);
 		return (EAGAIN);
 	}
+	PROC_UNLOCK(p);
 
 	/* Allocate TTY and softc. */
 	psc = malloc(sizeof(struct pts_softc), M_PTS, M_WAITOK|M_ZERO);

==== //depot/projects/soc2009/trasz_limits/sys/kern/uipc_sockbuf.c#8 (text+ko) ====

@@ -307,8 +307,8 @@
 	if (td != NULL) {
 		PROC_LOCK(td->td_proc);
 		sbsize_limit = lim_cur(td->td_proc, RLIMIT_SBSIZE);
+		error = rusage_add(td->td_proc, RUSAGE_SBSIZE, cc);
 		PROC_UNLOCK(td->td_proc);
-		error = rusage_add(td->td_proc, RUSAGE_SBSIZE, cc);
 		if (error != 0)
 			return (0);
 	} else {

==== //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#18 (text+ko) ====

@@ -192,7 +192,10 @@
 	if (incr & PAGE_MASK)
 		panic("swap_reserve: & PAGE_MASK");
 
-	if (rusage_add(curproc, RUSAGE_SWAP, incr))
+	PROC_LOCK(curproc);
+	error = rusage_add(curproc, RUSAGE_SWAP, incr);
+	PROC_UNLOCK(curproc);
+	if (error != 0)
 		return (0);
 
 	res = 0;
@@ -233,8 +236,11 @@
 		    curproc->p_pid, uip->ui_uid, incr);
 	}
 
-	if (!res)
+	if (!res) {
+		PROC_LOCK(curproc);
 		rusage_sub(curproc, RUSAGE_SWAP, incr);
+		PROC_UNLOCK(curproc);
+	}
 
 	return (res);
 }
@@ -248,7 +254,9 @@
 	swap_reserved += incr;
 	mtx_unlock(&sw_dev_mtx);
 
+	PROC_LOCK(curproc);
 	rusage_add_force(curproc, RUSAGE_SWAP, incr);
+	PROC_UNLOCK(curproc);
 
 	uip = curthread->td_ucred->cr_ruidinfo;
 	PROC_LOCK(curproc);

==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_glue.c#13 (text+ko) ====

@@ -202,6 +202,10 @@
 		PROC_UNLOCK(curproc);
 		return (ENOMEM);
 	}
+	if (rusage_set(curproc, RUSAGE_MEMLOCK, nsize)) {
+		PROC_UNLOCK(curproc);
+		return (ENOMEM);
+	}
 	PROC_UNLOCK(curproc);
 #if 0
 	/*
@@ -216,13 +220,14 @@
 	if (npages + cnt.v_wire_count > vm_page_max_wired)
 		return (EAGAIN);
 #endif
-	if (rusage_set(curproc, RUSAGE_MEMLOCK, nsize))
-		return (ENOMEM);
 	error = vm_map_wire(&curproc->p_vmspace->vm_map, start, end,
 	    VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);
-	if (error != KERN_SUCCESS)
+	if (error != KERN_SUCCESS) {
+		PROC_LOCK(curproc);
 		rusage_set(curproc, RUSAGE_MEMLOCK, 
 		    ptoa(pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map))));
+		PROC_UNLOCK(curproc);
+	}
 	/*
 	 * Return EFAULT on error to match copy{in,out}() behaviour
 	 * rather than returning ENOMEM like mlock() would.
@@ -239,8 +244,10 @@
 	    trunc_page((vm_offset_t)addr), round_page((vm_offset_t)addr + len),
 	    VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);
 
+	PROC_LOCK(curproc);
 	rusage_set(curproc, RUSAGE_MEMLOCK,
 	    ptoa(pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map))));
+	PROC_UNLOCK(curproc);
 }
 
 /*

==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#31 (text+ko) ====

@@ -318,11 +318,13 @@
 vmspace_container_reset(struct proc *p)
 {
 
+	PROC_LOCK(p);
 	rusage_set(p, RUSAGE_DATA, 0);
 	rusage_set(p, RUSAGE_STACK, 0);
 	rusage_set(p, RUSAGE_RSS, 0);
 	rusage_set(p, RUSAGE_MEMLOCK, 0);
 	rusage_set(p, RUSAGE_VMEM, 0);
+	PROC_UNLOCK(p);
 }
 
 static inline void
@@ -3397,11 +3399,14 @@
 		vm_map_unlock_read(map);
 		return (KERN_NO_SPACE);
 	}
+	PROC_LOCK(p);
 	if (is_procstack &&
 	    rusage_set(p, RUSAGE_STACK, ctob(vm->vm_ssize) + grow_amount)) {
+		PROC_UNLOCK(p);
 		vm_map_unlock_read(map);
 		return (KERN_NO_SPACE);
 	}
+	PROC_UNLOCK(p);
 
 	/* Round up the grow amount modulo SGROWSIZ */
 	grow_amount = roundup (grow_amount, sgrowsiz);
@@ -3412,7 +3417,9 @@
 		    ctob(vm->vm_ssize);
 	}
 #ifdef notyet
+	PROC_LOCK(p);
 	limit = rusage_get_available(p, RUSAGE_STACK);
+	PROC_UNLOCK(p);
 	if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > limit))
 		grow_amount = limit - ctob(vm->vm_ssize);
 #endif
@@ -3423,11 +3430,14 @@
 		rv = KERN_NO_SPACE;
 		goto out;
 	}
+	PROC_LOCK(p);
 	if (rusage_set(p, RUSAGE_VMEM, map->size + grow_amount)) {
+		PROC_UNLOCK(p);
 		vm_map_unlock_read(map);
 		rv = KERN_NO_SPACE;
 		goto out;
 	}
+	PROC_UNLOCK(p);
 
 	if (vm_map_lock_upgrade(map))
 		goto Retry;
@@ -3528,10 +3538,12 @@
 
 out:
 	if (rv != KERN_SUCCESS) {
+		PROC_LOCK(p);
 		error = rusage_set(p, RUSAGE_VMEM, map->size);
 		KASSERT(error == 0, ("decreasing RUSAGE_VMEM failed"));
 	    	error = rusage_set(p, RUSAGE_STACK, ctob(vm->vm_ssize));
 		KASSERT(error == 0, ("decreasing RUSAGE_STACK failed"));
+		PROC_UNLOCK(p);
 	}
 
 	return (rv);

==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#23 (text+ko) ====

@@ -1058,13 +1058,19 @@
 	PROC_UNLOCK(proc);
 	if (npages + cnt.v_wire_count > vm_page_max_wired)
 		return (EAGAIN);
-	if (rusage_set(proc, RUSAGE_MEMLOCK, nsize))
+	PROC_LOCK(proc);
+	error = rusage_set(proc, RUSAGE_MEMLOCK, nsize);
+	PROC_UNLOCK(proc);
+	if (error != 0)
 		return (ENOMEM);
 	error = vm_map_wire(&proc->p_vmspace->vm_map, start, end,
 	    VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES);
-	if (error != KERN_SUCCESS)
+	if (error != KERN_SUCCESS) {
+		PROC_LOCK(proc);
 		rusage_set(proc, RUSAGE_MEMLOCK,
 		    ptoa(pmap_wired_count(vm_map_pmap(&proc->p_vmspace->vm_map))));
+		PROC_UNLOCK(proc);
+	}
 	return (error == KERN_SUCCESS ? 0 : ENOMEM);
 }
 
@@ -1107,7 +1113,10 @@
 	if (error)
 		return (error);
 #endif
-	if (rusage_set(td->td_proc, RUSAGE_MEMLOCK, map->size))
+	PROC_LOCK(td->td_proc);
+	error = rusage_set(td->td_proc, RUSAGE_MEMLOCK, map->size);
+	PROC_UNLOCK(td->td_proc);
+	if (error != 0)
 		return (ENOMEM);
 
 	if (uap->how & MCL_FUTURE) {
@@ -1128,9 +1137,12 @@
 		    VM_MAP_WIRE_USER|VM_MAP_WIRE_HOLESOK);
 		error = (error == KERN_SUCCESS ? 0 : EAGAIN);
 	}
-	if (error != KERN_SUCCESS)
+	if (error != KERN_SUCCESS) {
+		PROC_LOCK(td->td_proc);
 		rusage_set(td->td_proc, RUSAGE_MEMLOCK,
 		    ptoa(pmap_wired_count(vm_map_pmap(&td->td_proc->p_vmspace->vm_map))));
+		PROC_UNLOCK(td->td_proc);
+	}
 
 	return (error);
 }
@@ -1165,8 +1177,11 @@
 	/* Forcibly unwire all pages. */
 	error = vm_map_unwire(map, vm_map_min(map), vm_map_max(map),
 	    VM_MAP_WIRE_USER|VM_MAP_WIRE_HOLESOK);
-	if (error == KERN_SUCCESS)
+	if (error == KERN_SUCCESS) {
+		PROC_LOCK(td->td_proc);
 		rusage_set(td->td_proc, RUSAGE_MEMLOCK, 0);
+		PROC_UNLOCK(td->td_proc);
+	}
 
 	return (error);
 }
@@ -1201,8 +1216,11 @@
 		return (EINVAL);
 	error = vm_map_unwire(&td->td_proc->p_vmspace->vm_map, start, end,
 	    VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES);
-	if (error == KERN_SUCCESS)
+	if (error == KERN_SUCCESS) {
+		PROC_LOCK(td->td_proc);
 		rusage_sub(td->td_proc, RUSAGE_MEMLOCK, ptoa(end - start));
+		PROC_UNLOCK(td->td_proc);
+	}
 	return (error == KERN_SUCCESS ? 0 : ENOMEM);
 }
 
@@ -1435,10 +1453,12 @@
 		PROC_UNLOCK(td->td_proc);
 		return(ENOMEM);
 	}
-	PROC_UNLOCK(td->td_proc);
 	if (rusage_set(td->td_proc, RUSAGE_VMEM,
-	    td->td_proc->p_vmspace->vm_map.size + size))
+	    td->td_proc->p_vmspace->vm_map.size + size)) {
+		PROC_UNLOCK(td->td_proc);
 		return (ENOMEM);
+	}
+	PROC_UNLOCK(td->td_proc);
 
 	/*
 	 * We currently can only deal with page aligned file offsets.

==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#24 (text+ko) ====

@@ -1711,8 +1711,10 @@
 				    &vm->vm_map, limit);
 			}
 			rsize = IDX_TO_OFF(size);
+			PROC_LOCK(p);
 			rusage_set(p, RUSAGE_RSS, rsize);
 			ravailable = rusage_get_available(p, RUSAGE_RSS);
+			PROC_UNLOCK(p);
 			if (rsize > ravailable) {
 				/*
 				 * Don't be overly aggressive; this might be
@@ -1730,7 +1732,9 @@
 				/* Update RSS usage after paging out. */
 				size = vmspace_resident_count(vm);
 				rsize = IDX_TO_OFF(size);
+				PROC_LOCK(p);
 				rusage_set(p, RUSAGE_RSS, rsize);
+				PROC_UNLOCK(p);
 				if (rsize > ravailable)
 					tryagain++;
 				if (tryagain > 20) {

==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_unix.c#14 (text+ko) ====

@@ -117,8 +117,10 @@
 			error = ENOMEM;
 			goto done;
 		}
+		PROC_LOCK(td->td_proc);
 		error = rusage_set(td->td_proc, RUSAGE_DATA, new - base);
 		if (error != 0) {
+			PROC_UNLOCK(td->td_proc);
 			error = ENOMEM;
 			goto done;
 		}
@@ -126,14 +128,18 @@
 		    vm->vm_map.size + (new - old));
 		if (error != 0) {
 			rusage_set_force(td->td_proc, RUSAGE_DATA, old - base);
+			PROC_UNLOCK(td->td_proc);
 			error = ENOMEM;
 			goto done;
 		}
+		PROC_UNLOCK(td->td_proc);
 		rv = vm_map_insert(&vm->vm_map, NULL, 0, old, new,
 		    VM_PROT_RW, VM_PROT_ALL, 0);
 		if (rv != KERN_SUCCESS) {
+			PROC_LOCK(td->td_proc);
 			rusage_set_force(td->td_proc, RUSAGE_DATA, old - base);
 			rusage_set_force(td->td_proc, RUSAGE_VMEM, vm->vm_map.size);
+			PROC_UNLOCK(td->td_proc);
 			error = ENOMEM;
 			goto done;
 		}
@@ -159,8 +165,10 @@
 			goto done;
 		}
 		vm->vm_dsize -= btoc(old - new);
+		PROC_LOCK(td->td_proc);
 		rusage_set_force(td->td_proc, RUSAGE_DATA, new - base);
 		rusage_set_force(td->td_proc, RUSAGE_VMEM, vm->vm_map.size);
+		PROC_UNLOCK(td->td_proc);
 	}
 done:
 	vm_map_unlock(&vm->vm_map);
From trasz at FreeBSD.org  Fri Jan 21 18:50:09 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Fri Jan 21 18:50:11 2011
Subject: PERFORCE change 188039 for review
Message-ID: <201101211850.p0LIo9iD010543@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@188039?ac=10

Change 188039 by trasz@trasz_victim on 2011/01/21 18:49:42

	We need proc lock to use FOREACH_THREAD_IN_PROC().

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#58 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#58 (text+ko) ====

@@ -712,6 +712,8 @@
 	u_char newpri;
 	int type;
 
+	PROC_LOCK_ASSERT(p, MA_OWNED);
+
 	if (throttle) {
 		p->p_flag |= P_THROTTLED;
 		newpri = PRI_MIN_IDLE;
@@ -781,6 +783,7 @@
 		FOREACH_PROC_IN_SYSTEM(p) {
 			pctcpu_limit = rusage_get_limit(p, RUSAGE_PCTCPU);
 			pctcpu = 0;
+			PROC_LOCK(p);
 			PROC_SLOCK(p);
 			FOREACH_THREAD_IN_PROC(p, td) {
 				ruxagg(p, td);
@@ -788,15 +791,14 @@
 				pctcpu += sched_pctcpu(td);
 				thread_unlock(td);
 			}
+			PROC_SUNLOCK(p);
 			pctcpu = ((pctcpu * 10000 + FSCALE / 2) >> FSHIFT) / 100;
 			if (pctcpu > pctcpu_limit)
 				rusage_throttle(p, 1);
 			else
 				rusage_throttle(p, 0);
-			PROC_SUNLOCK(p);
 			microuptime(&wallclock);
 			timevalsub(&wallclock, &p->p_stats->p_start);
-			PROC_LOCK(p);
 			rusage_set(p, RUSAGE_WALLCLOCK, wallclock.tv_sec * 1000000 + wallclock.tv_usec);
 			rusage_set(p, RUSAGE_PCTCPU, pctcpu);
 			rusage_set(p, RUSAGE_CPU, cputick2usec(p->p_rux.rux_runtime));
From mjacob at FreeBSD.org  Fri Jan 21 22:19:51 2011
From: mjacob at FreeBSD.org (Matt Jacob)
Date: Fri Jan 21 22:19:56 2011
Subject: PERFORCE change 188045 for review
Message-ID: <201101212219.p0LMJZxJ056308@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@188045?ac=10

Change 188045 by mjacob@mjacob-sandbox on 2011/01/21 22:18:42

	Integrate from Vendor

Affected files ...

.. //depot/projects/mjacob-dev/COPYRIGHT#2 integrate
.. //depot/projects/mjacob-dev/Makefile#2 integrate
.. //depot/projects/mjacob-dev/Makefile.inc1#2 integrate
.. //depot/projects/mjacob-dev/Makefile.mips#2 integrate
.. //depot/projects/mjacob-dev/ObsoleteFiles.inc#2 integrate
.. //depot/projects/mjacob-dev/UPDATING#2 integrate
.. //depot/projects/mjacob-dev/bin/csh/USD.doc/csh.1#2 delete
.. //depot/projects/mjacob-dev/bin/csh/USD.doc/csh.2#2 delete
.. //depot/projects/mjacob-dev/bin/csh/USD.doc/csh.3#2 delete
.. //depot/projects/mjacob-dev/bin/csh/USD.doc/csh.4#2 delete
.. //depot/projects/mjacob-dev/bin/csh/USD.doc/csh.a#2 delete
.. //depot/projects/mjacob-dev/bin/csh/USD.doc/csh.g#2 delete
.. //depot/projects/mjacob-dev/bin/csh/USD.doc/tabs#2 delete
.. //depot/projects/mjacob-dev/bin/kill/kill.1#2 integrate
.. //depot/projects/mjacob-dev/bin/kill/kill.c#2 integrate
.. //depot/projects/mjacob-dev/bin/ps/print.c#2 integrate
.. //depot/projects/mjacob-dev/bin/setfacl/setfacl.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/Makefile#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/alias.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/arith_lex.l#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/bltin/bltin.h#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/builtins.def#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/cd.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/error.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/error.h#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/eval.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/exec.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/expand.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/expand.h#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/histedit.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/jobs.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/main.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/memalloc.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/memalloc.h#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/output.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/parser.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/redir.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/sh.1#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/trap.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/trap.h#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/var.c#2 integrate
.. //depot/projects/mjacob-dev/bin/sh/var.h#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate
.. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/CHANGES#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html#1 branch
.. //depot/projects/mjacob-dev/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.pdf#1 branch
.. //depot/projects/mjacob-dev/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt#1 branch
.. //depot/projects/mjacob-dev/contrib/bind9/bin/check/check-tool.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/bin/check/check-tool.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/bin/check/named-checkconf.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/bin/check/named-checkzone.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/bin/dig/host.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/bin/named/client.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/bin/named/include/named/query.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/bin/named/query.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/bin/named/server.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/api#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/include/dns/view.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/journal.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/rbtdb.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/validator.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/lib/dns/view.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/api#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/lib/isc/print.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bind9/release-notes.css#1 branch
.. //depot/projects/mjacob-dev/contrib/bind9/version#2 integrate
.. //depot/projects/mjacob-dev/contrib/binutils/ld/emultempl/ppc64elf.em#2 integrate
.. //depot/projects/mjacob-dev/contrib/binutils/ld/ldemul.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/lib/asn1.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/lib/asn1.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/lib/bsnmpclient.3#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/lib/bsnmplib.3#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/lib/snmp.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/lib/snmp.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/lib/snmpagent.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/lib/snmpclient.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/lib/snmpclient.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/lib/snmpcrypto.c#1 branch
.. //depot/projects/mjacob-dev/contrib/bsnmp/lib/snmppriv.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/lib/tc.def#1 branch
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmp_target/snmp_target.3#1 branch
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmp_target/target_snmp.c#1 branch
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmp_target/target_tree.def#1 branch
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmp_usm/snmp_usm.3#1 branch
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmp_usm/usm_snmp.c#1 branch
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmp_usm/usm_tree.def#1 branch
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmp_vacm/snmp_vacm.3#1 branch
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmp_vacm/vacm_snmp.c#1 branch
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmp_vacm/vacm_tree.def#1 branch
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmpd/action.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmpd/config.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmpd/export.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmpd/main.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmpd/snmpd.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmpd/snmpmod.3#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmpd/snmpmod.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmpd/trans_lsock.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmpd/trans_udp.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmpd/trap.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/bsnmp/snmpd/tree.def#2 integrate
.. //depot/projects/mjacob-dev/contrib/dialog/CHANGES#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/COPYING#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/README#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/VERSION#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/aclocal.m4#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/arrows.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/buttons.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/calendar.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/checklist.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/columns.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/config.guess#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/config.hin#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/config.sub#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/configure#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/configure.in#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/dialog-config.in#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/dialog.1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/dialog.3#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/dialog.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/dialog.h#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/dialog.lsm#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/dialog.pl#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/dlg_colors.h#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/dlg_keys.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/dlg_keys.h#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/editbox.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/formbox.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/fselect.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/guage.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/headers-sh.in#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/inputbox.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/inputstr.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/install-sh#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/makefile.in#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/menubox.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/mixedform.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/mixedgauge.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/mouse.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/mousewget.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/msgbox.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/pause.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/POTFILES.in#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/ar.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/bg.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/ca.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/cs.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/cy.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/da.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/de.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/dialog.pot#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/el.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/eo.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/es.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/et.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/eu.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/fi.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/fr.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/ga.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/gl.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/hi.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/hr.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/hu.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/id.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/is.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/it.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/ja.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/ku.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/lt.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/lv.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/makefile.inn#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/mg.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/mk.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/ms.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/nb.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/nl.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/pl.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/pt.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/pt_BR.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/rm.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/ro.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/ru.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/rw.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/sq.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/sr.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/sv.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/sw.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/th.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/tr.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/uk.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/vi.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/wa.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/zh_CN.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/po/zh_TW.po#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/progressbox.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/rc.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/README#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/calendar#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/calendar-stdout#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/calendar2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/calendar2-stdout#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/calendar3#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/calendar3-stdout#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist-8bit#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist-utf8#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist10#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist11#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist3#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist4#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist5#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist6#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist7#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist8#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist9#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/checklist9.txt#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/admin.funcs#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/common.funcs#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.funcs#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.ifman1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.ifman2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.ifmcfg2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.ifmcfg4#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.ifmcfg5#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.ifpoll1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.ifpoll2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.ifreq1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.ifreq2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.rcnews#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.sendifm1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.sendifm2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.trnrc#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/copi.wheel#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copifuncs/ifpatch#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/copismall#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/debian.rc#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/dialog.py#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/dselect#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/editbox#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/editbox-utf8#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/editbox2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/editbox3#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/editbox4#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/form1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/form1-both#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/form1-extra#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/form1-help#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/form1-utf8#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/form2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/form3#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/form4#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/form5#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/form6#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/fselect#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/fselect-stdout#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/fselect1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/fselect1-stdout#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/fselect2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/fselect2-stdout#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/gauge#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/gauge0#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/gauge0-input-fd#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/gauge2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/infobox#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/infobox1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/infobox2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/infobox3#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/infobox4#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/infobox5#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/infobox6#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputbox#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputbox-both#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputbox-extra#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputbox-help#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputbox1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputbox2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputbox3#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputbox4#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputbox5#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputbox6-8bit#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputbox6-utf8#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputbox7#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputmenu#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputmenu-stdout#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputmenu1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputmenu2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputmenu3#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/inputmenu4#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/install/FDISK.TEST#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/install/makefile.in#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/install/setup.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/install/setup.help#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/killall#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/listing#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/menubox#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/menubox-8bit#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/menubox-utf8#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/menubox1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/menubox10#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/menubox2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/menubox3#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/menubox4#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/menubox5#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/menubox6#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/menubox7#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/menubox8#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/menubox9#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/mixedform#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/mixedform2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/mixedgauge#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/msgbox#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/msgbox-help#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/msgbox1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/msgbox2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/msgbox3#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/msgbox4-8bit#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/msgbox4-eucjp#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/msgbox4-utf8#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/msgbox5#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/msgbox6#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/msgbox6a#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/password#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/password1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/password2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/passwordform1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/passwordform1-utf8#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/pause#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/pause-help#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/progress#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/progress2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/radiolist#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/radiolist1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/radiolist10#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/radiolist2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/radiolist3#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/radiolist4#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/report-button#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/report-edit#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/report-string#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/report-tempfile#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/report-yesno#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/rotated-data#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/setup-edit#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/setup-tempfile#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/setup-utf8#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/setup-vars#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/slackware.rc#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/sourcemage.rc#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/suse.rc#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/tailbox#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/tailboxbg#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/tailboxbg1#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/tailboxbg2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/testdata-8bit#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/textbox#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/textbox.txt#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/textbox2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/textbox3#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/timebox#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/timebox-stdout#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/timebox2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/timebox2-stdout#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/wheel#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/whiptail.rc#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/yesno#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/yesno-both#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/yesno-extra#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/yesno-help#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/yesno-utf8#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/yesno2#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/yesno3#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/samples/yesno4#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/tailbox.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/textbox.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/timebox.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/trace.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/ui_getc.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/util.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/version.c#1 branch
.. //depot/projects/mjacob-dev/contrib/dialog/yesno.c#1 branch
.. //depot/projects/mjacob-dev/contrib/gcc/config/i386/freebsd.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/gcc/config/rs6000/crtsavres.asm#2 integrate
.. //depot/projects/mjacob-dev/contrib/gcc/config/rs6000/freebsd.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/gcc/config/rs6000/rs6000.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/gcc/config/rs6000/tramp.asm#2 integrate
.. //depot/projects/mjacob-dev/contrib/groff/tmac/doc-common#2 integrate
.. //depot/projects/mjacob-dev/contrib/groff/tmac/doc-syms#2 integrate
.. //depot/projects/mjacob-dev/contrib/groff/tmac/groff_mdoc.man#2 integrate
.. //depot/projects/mjacob-dev/contrib/traceroute/as.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/traceroute/as.h#2 integrate
.. //depot/projects/mjacob-dev/contrib/traceroute/ifaddrlist.c#2 integrate
.. //depot/projects/mjacob-dev/contrib/traceroute/traceroute.c#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/ACKNOWLEDGMENTS#1 branch
.. //depot/projects/mjacob-dev/crypto/openssl/CHANGES#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/FAQ#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/Makefile#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/NEWS#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/README#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/crypto/evp/p_sign.c#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/crypto/evp/p_verify.c#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/crypto/jpake/jpake.c#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/crypto/jpake/jpake.h#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/crypto/jpake/jpake_err.c#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/crypto/opensslv.h#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/crypto/stack/safestack.h#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/openssl.spec#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/ssl/s3_clnt.c#2 integrate
.. //depot/projects/mjacob-dev/crypto/openssl/ssl/s3_srvr.c#2 integrate
.. //depot/projects/mjacob-dev/etc/defaults/rc.conf#2 integrate
.. //depot/projects/mjacob-dev/etc/devd.conf#2 integrate
.. //depot/projects/mjacob-dev/etc/mtree/BSD.usr.dist#2 integrate
.. //depot/projects/mjacob-dev/etc/mtree/README#2 integrate
.. //depot/projects/mjacob-dev/etc/portsnap.conf#2 integrate
.. //depot/projects/mjacob-dev/etc/rc.d/devd#2 integrate
.. //depot/projects/mjacob-dev/etc/rc.d/ldconfig#2 integrate
.. //depot/projects/mjacob-dev/etc/rc.d/pf#2 integrate
.. //depot/projects/mjacob-dev/etc/rc.subr#2 integrate
.. //depot/projects/mjacob-dev/etc/snmpd.config#2 integrate
.. //depot/projects/mjacob-dev/games/bcd/bcd.6#2 integrate
.. //depot/projects/mjacob-dev/games/caesar/caesar.6#2 integrate
.. //depot/projects/mjacob-dev/games/caesar/rot13.sh#2 integrate
.. //depot/projects/mjacob-dev/games/factor/factor.6#2 integrate
.. //depot/projects/mjacob-dev/games/factor/factor.c#2 integrate
.. //depot/projects/mjacob-dev/games/morse/morse.6#2 integrate
.. //depot/projects/mjacob-dev/games/number/number.6#2 integrate
.. //depot/projects/mjacob-dev/games/pom/pom.6#2 integrate
.. //depot/projects/mjacob-dev/games/random/random.6#2 integrate
.. //depot/projects/mjacob-dev/gnu/lib/Makefile#2 integrate
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/CHANGES#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/COPYING#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/Makefile#2 integrate
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/README#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/Makefile#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/check1.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/check2.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/check3.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/dselect.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/fselect.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/ftree1.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/ftree1.test#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/ftree2.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/ftree2.test#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/gauge.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/input1.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/input2.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/menu1.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/menu2.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/menu3.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/msg.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/prgbox.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/radio1.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/radio2.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/radio3.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/text.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/tree.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TESTS/yesno.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/TODO#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/checklist.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/colors.h#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/dialog.3#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/dialog.h#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/dialog.priv.h#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/dir.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/dir.h#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/dlg_config.h#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/fselect.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/gauge.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/help.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/inputbox.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/kernel.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/lineedit.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/menubox.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/msgbox.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/notify.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/prgbox.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/radiolist.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/raw_popen.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/rc.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/rc.h#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/textbox.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/tree.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/ui_objects.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/ui_objects.h#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libdialog/yesno.c#2 delete
.. //depot/projects/mjacob-dev/gnu/lib/libgcc/Makefile#2 integrate
.. //depot/projects/mjacob-dev/gnu/lib/libgomp/Makefile#2 integrate
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/CHANGES#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/COPYING#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/Makefile#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/README#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/Makefile#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/check1.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/check2.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/check3.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/dselect.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/fselect.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/ftree1.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/ftree1.test#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/ftree2.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/ftree2.test#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/gauge.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/input1.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/input2.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/menu1.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/menu2.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/menu3.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/msg.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/prgbox.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/radio1.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/radio2.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/radio3.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/text.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/tree.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TESTS/yesno.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/TODO#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/checklist.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/colors.h#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/dialog.3#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/dialog.h#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/dialog.priv.h#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/dir.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/dir.h#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/fselect.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/gauge.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/help.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/inputbox.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/kernel.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/lineedit.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/menubox.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/msgbox.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/notify.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/prgbox.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/radiolist.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/raw_popen.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/rc.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/rc.h#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/textbox.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/tree.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/ui_objects.c#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/ui_objects.h#1 branch
.. //depot/projects/mjacob-dev/gnu/lib/libodialog/yesno.c#1 branch
.. //depot/projects/mjacob-dev/gnu/usr.bin/binutils/Makefile.inc0#2 integrate
.. //depot/projects/mjacob-dev/gnu/usr.bin/binutils/ld/Makefile.mips#2 integrate
.. //depot/projects/mjacob-dev/gnu/usr.bin/binutils/libbfd/Makefile.mips#2 integrate
.. //depot/projects/mjacob-dev/gnu/usr.bin/cc/Makefile.fe#2 integrate
.. //depot/projects/mjacob-dev/gnu/usr.bin/cc/Makefile.inc#2 integrate
.. //depot/projects/mjacob-dev/gnu/usr.bin/cc/Makefile.tgt#2 integrate
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/COPYING#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/Makefile#2 integrate
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/README#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/README.lib#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/TESTS/Makefile#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/TESTS/README#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/TESTS/checklist#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/TESTS/ftreebox#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/TESTS/infobox#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/TESTS/inputbox#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/TESTS/menubox#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/TESTS/msgbox#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/TESTS/prgbox#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/TESTS/radiolist#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/TESTS/textbox#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/TESTS/treebox#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/TESTS/yesno#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/dialog.1#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/dialog/dialog.c#2 delete
.. //depot/projects/mjacob-dev/gnu/usr.bin/gdb/Makefile.inc#2 integrate
.. //depot/projects/mjacob-dev/gnu/usr.bin/gdb/libgdb/Makefile#2 integrate
.. //depot/projects/mjacob-dev/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate
.. //depot/projects/mjacob-dev/include/assert.h#2 integrate
.. //depot/projects/mjacob-dev/include/pthread.h#2 integrate
.. //depot/projects/mjacob-dev/include/unistd.h#2 integrate
.. //depot/projects/mjacob-dev/lib/bind/config.mk#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/amd64/Makefile#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/amd64/crt1.c#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/amd64/crti.S#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/amd64/crtn.S#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/arm/Makefile#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/arm/crt1.c#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/arm/crtn.S#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/common/crtbrand.c#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/i386-elf/Makefile#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/i386-elf/crt1_c.c#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/i386-elf/crt1_s.S#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/i386-elf/crti.S#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/i386-elf/crtn.S#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/ia64/Makefile#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/ia64/crt1.S#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/ia64/crti.S#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/ia64/crtn.S#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/mips/Makefile#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/powerpc/Makefile#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/powerpc/crt1.c#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/powerpc/crti.S#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/powerpc/crtn.S#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/powerpc64/Makefile#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/powerpc64/crt1.c#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/powerpc64/crti.S#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/powerpc64/crtn.S#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/sparc64/crt1.c#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/sparc64/crti.S#2 integrate
.. //depot/projects/mjacob-dev/lib/csu/sparc64/crtn.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/archive_read_extract.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/test/Makefile#2 integrate
.. //depot/projects/mjacob-dev/lib/libarchive/test/test_acl_freebsd.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libbsnmp/libbsnmp/Makefile#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/Makefile#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/gen/_setjmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/gen/fabs.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/gen/modf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/gen/rfork_thread.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/gen/setjmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/gen/sigsetjmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/stdlib/div.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/stdlib/ldiv.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/stdlib/lldiv.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/string/bcmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/string/bcopy.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/string/bzero.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/string/memcmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/string/memmove.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/string/memset.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/string/strcat.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/string/strcmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/string/strcpy.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/sys/brk.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/sys/cerror.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/sys/exect.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/sys/getcontext.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/sys/pipe.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/sys/ptrace.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/sys/reboot.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/sys/sbrk.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/sys/setlogin.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/sys/sigreturn.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/amd64/sys/vfork.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/gen/Symbol.map#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/gen/dlfcn.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/gen/elf_utils.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/gen/_ctx_start.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/gen/_setjmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/gen/fabs.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/gen/modf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/gen/rfork_thread.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/gen/setjmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/gen/sigsetjmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/stdlib/div.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/stdlib/ldiv.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/bcmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/bcopy.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/bzero.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/ffs.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/index.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/memchr.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/memcmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/memcpy.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/memmove.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/memset.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/rindex.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/strcat.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/strchr.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/strcmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/strcpy.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/strncmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/strrchr.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/swab.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/wcschr.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/wcscmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/wcslen.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/string/wmemchr.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/sys/Ovfork.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/sys/brk.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/sys/cerror.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/sys/exect.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/sys/getcontext.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/sys/pipe.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/sys/ptrace.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/sys/reboot.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/sys/sbrk.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/sys/setlogin.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/sys/sigreturn.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/i386/sys/syscall.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/locale/mbrtowc.3#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/net/hesiod.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/posix1e/acl_is_trivial_np.3#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc/gen/_ctx_start.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc/gen/_setjmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc/gen/fabs.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc/gen/setjmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc/gen/sigsetjmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc/sys/brk.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc/sys/cerror.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc/sys/exect.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc/sys/pipe.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc/sys/ptrace.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc/sys/sbrk.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc/sys/setlogin.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc64/gen/_ctx_start.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc64/gen/_setjmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc64/gen/fabs.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc64/gen/setjmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc64/gen/sigsetjmp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc64/sys/brk.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc64/sys/cerror.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc64/sys/exect.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc64/sys/pipe.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc64/sys/ptrace.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc64/sys/sbrk.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/powerpc64/sys/setlogin.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/rpc/PSD.doc/nfs.rfc.ms#2 delete
.. //depot/projects/mjacob-dev/lib/libc/rpc/PSD.doc/rpc.prog.ms#2 delete
.. //depot/projects/mjacob-dev/lib/libc/rpc/PSD.doc/rpc.rfc.ms#2 delete
.. //depot/projects/mjacob-dev/lib/libc/rpc/PSD.doc/rpcgen.ms#2 delete
.. //depot/projects/mjacob-dev/lib/libc/rpc/PSD.doc/stubs#2 delete
.. //depot/projects/mjacob-dev/lib/libc/rpc/PSD.doc/xdr.nts.ms#2 delete
.. //depot/projects/mjacob-dev/lib/libc/rpc/PSD.doc/xdr.rfc.ms#2 delete
.. //depot/projects/mjacob-dev/lib/libc/rpc/publickey.3#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/stdio/freopen.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/stdio/getline.3#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/stdio/printf-pos.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/stdlib/realpath.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/sys/Makefile.inc#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/sys/mknod.2#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/sys/shmat.2#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/sys/shmctl.2#2 integrate
.. //depot/projects/mjacob-dev/lib/libc/sys/shmget.2#2 integrate
.. //depot/projects/mjacob-dev/lib/libcam/Makefile#2 integrate
.. //depot/projects/mjacob-dev/lib/libcompiler_rt/Makefile#2 integrate
.. //depot/projects/mjacob-dev/lib/libfetch/ftp.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libgeom/libgeom.3#2 integrate
.. //depot/projects/mjacob-dev/lib/libipsec/ipsec_dump_policy.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libjail/jail.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libkvm/kvm_getloadavg.3#2 integrate
.. //depot/projects/mjacob-dev/lib/libproc/proc_create.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libstand/Makefile#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/arch/i386/i386/_umtx_op_err.S#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/pthread.map#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/thread/Makefile.inc#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/thread/thr_cond.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/thread/thr_create.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/thread/thr_init.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/thread/thr_kern.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/thread/thr_list.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/thread/thr_mutex.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/thread/thr_private.h#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/thread/thr_rtld.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/thread/thr_sig.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/thread/thr_sleepq.c#1 branch
.. //depot/projects/mjacob-dev/lib/libthr/thread/thr_stack.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/thread/thr_umtx.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libthr/thread/thr_umtx.h#2 integrate
.. //depot/projects/mjacob-dev/lib/libugidfw/ugidfw.c#2 integrate
.. //depot/projects/mjacob-dev/lib/libusb/libusb20_compat01.c#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/Makefile#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/Symbol.map#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/e_remainder.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/e_remainderf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/e_remainderl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/e_sqrt.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/e_sqrtf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/e_sqrtl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/s_llrint.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/s_llrintf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/s_llrintl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/s_logbl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/s_lrint.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/s_lrintf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/s_lrintl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/s_remquo.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/s_remquof.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/s_remquol.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/s_rintl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/s_scalbn.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/s_scalbnf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/amd64/s_scalbnl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/e_exp.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/e_fmod.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/e_log.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/e_log10.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/e_log10f.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/e_logf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/e_remainder.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/e_remainderf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/e_remainderl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/e_sqrt.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/e_sqrtf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/e_sqrtl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_ceil.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_ceilf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_ceill.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_copysign.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_copysignf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_copysignl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_cos.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_finite.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_floor.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_floorf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_floorl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_llrint.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_llrintf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_llrintl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_logb.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_logbf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_logbl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_lrint.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_lrintf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_lrintl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_remquo.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_remquof.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_remquol.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_rint.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_rintf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_rintl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_scalbn.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_scalbnf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_scalbnl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_significand.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_significandf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_sin.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_tan.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_trunc.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_truncf.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/i387/s_truncl.S#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/man/log.3#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/man/math.3#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/src/e_log2.c#1 branch
.. //depot/projects/mjacob-dev/lib/msun/src/e_log2f.c#1 branch
.. //depot/projects/mjacob-dev/lib/msun/src/k_log.h#1 branch
.. //depot/projects/mjacob-dev/lib/msun/src/k_logf.h#1 branch
.. //depot/projects/mjacob-dev/lib/msun/src/math.h#2 integrate
.. //depot/projects/mjacob-dev/lib/msun/src/math_private.h#2 integrate
.. //depot/projects/mjacob-dev/libexec/bootpd/rtmsg.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/ftpd/ftpd.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/getty/chat.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/getty/main.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/mknetid/parse_group.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/rbootd/rbootd.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/rlogind/rlogind.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/rpc.rwalld/rwalld.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/Makefile#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/Symbol.map#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/amd64/Makefile.inc#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/amd64/reloc.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/amd64/rtld_start.S#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/arm/reloc.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/i386/Makefile.inc#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/i386/reloc.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/i386/rtld_start.S#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/ia64/reloc.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/map_object.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/mips/reloc.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/powerpc/reloc.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/powerpc/rtld_start.S#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/powerpc64/reloc.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/powerpc64/rtld_start.S#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/rtld.1#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/rtld.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/rtld.h#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/rtld_lock.c#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/rtld_lock.h#2 integrate
.. //depot/projects/mjacob-dev/libexec/rtld-elf/sparc64/reloc.c#2 integrate
.. //depot/projects/mjacob-dev/release/amd64/boot_crunch.conf#2 integrate
.. //depot/projects/mjacob-dev/release/i386/boot_crunch.conf#2 integrate
.. //depot/projects/mjacob-dev/release/ia64/boot_crunch.conf#2 integrate
.. //depot/projects/mjacob-dev/release/pc98/boot_crunch.conf#2 integrate
.. //depot/projects/mjacob-dev/release/powerpc/boot_crunch.conf#2 integrate
.. //depot/projects/mjacob-dev/release/powerpc/mkisoimages.sh#2 integrate
.. //depot/projects/mjacob-dev/release/sparc64/boot_crunch.conf#2 integrate
.. //depot/projects/mjacob-dev/release/sun4v/boot_crunch.conf#2 integrate
.. //depot/projects/mjacob-dev/sbin/bsdlabel/bsdlabel.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/camcontrol/camcontrol.8#2 integrate
.. //depot/projects/mjacob-dev/sbin/camcontrol/camcontrol.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/dumpfs/dumpfs.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/fsck_ffs/SMM.doc/0.t#2 delete
.. //depot/projects/mjacob-dev/sbin/fsck_ffs/SMM.doc/1.t#2 delete
.. //depot/projects/mjacob-dev/sbin/fsck_ffs/SMM.doc/2.t#2 delete
.. //depot/projects/mjacob-dev/sbin/fsck_ffs/SMM.doc/3.t#2 delete
.. //depot/projects/mjacob-dev/sbin/fsck_ffs/SMM.doc/4.t#2 delete
.. //depot/projects/mjacob-dev/sbin/fsck_ffs/SMM.doc/Makefile#2 delete
.. //depot/projects/mjacob-dev/sbin/geom/Makefile.inc#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/Makefile.inc#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/cache/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/concat/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/eli/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/eli/geli.8#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/journal/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/label/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/mirror/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/mountver/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/multipath/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/nop/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/part/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/part/geom_part.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/part/gpart.8#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/raid3/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/raid3/geom_raid3.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/raid3/graid3.8#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/sched/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/shsec/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/stripe/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/class/virstor/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/core/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/geom/core/geom.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/hastd/hastd.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/hastd/hooks.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/hastd/parse.y#2 integrate
.. //depot/projects/mjacob-dev/sbin/hastd/primary.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/ifconfig/ifconfig.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/ifconfig/ifmedia.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/mount/mount_fs.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/mount_nfs/mount_nfs.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/newfs/mkfs.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/newfs/newfs.8#2 integrate
.. //depot/projects/mjacob-dev/sbin/newfs/newfs.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/newfs/newfs.h#2 integrate
.. //depot/projects/mjacob-dev/sbin/ping6/ping6.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/route/route.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/savecore/savecore.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/shutdown/Makefile#2 integrate
.. //depot/projects/mjacob-dev/sbin/shutdown/shutdown.8#2 integrate
.. //depot/projects/mjacob-dev/sbin/shutdown/shutdown.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/sysctl/sysctl.8#2 integrate
.. //depot/projects/mjacob-dev/sbin/sysctl/sysctl.c#2 integrate
.. //depot/projects/mjacob-dev/sbin/tunefs/tunefs.8#2 integrate
.. //depot/projects/mjacob-dev/sbin/tunefs/tunefs.c#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/Makefile.inc#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/ASN1_STRING_length.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/ASN1_STRING_new.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/ASN1_generate_nconf.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_ctrl.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_f_base64.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_f_buffer.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_f_cipher.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_f_md.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_f_null.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_f_ssl.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_find_type.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_new.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_push.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_read.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_s_accept.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_s_bio.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_s_connect.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_s_fd.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_s_file.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_s_mem.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_s_null.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_s_socket.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_set_callback.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BIO_should_retry.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_BLINDING_new.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_CTX_new.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_CTX_start.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_add.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_add_word.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_bn2bin.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_cmp.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_copy.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_generate_prime.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_mod_inverse.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_new.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_num_bytes.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_rand.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_set_bit.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_swap.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/BN_zero.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/CONF_modules_free.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/CONF_modules_load_file.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DH_generate_key.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DH_generate_parameters.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DH_get_ex_new_index.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DH_new.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DH_set_method.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DH_size.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DSA_SIG_new.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DSA_do_sign.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DSA_dup_DH.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DSA_generate_key.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DSA_generate_parameters.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DSA_new.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DSA_set_method.3#2 integrate
.. //depot/projects/mjacob-dev/secure/lib/libcrypto/man/DSA_sign.3#2 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From rene at FreeBSD.org  Sat Jan 22 13:33:28 2011
From: rene at FreeBSD.org (Rene Ladan)
Date: Sat Jan 22 13:33:32 2011
Subject: PERFORCE change 188061 for review
Message-ID: <201101221333.p0MDXR6b045963@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@188061?ac=10

Change 188061 by rene@rene_acer on 2011/01/22 13:33:03

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#7 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#32 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#19 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#7 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#18 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/novel.key#2 integrate
.. //depot/projects/docproj_nl/www/en/copyright/freebsd-doc-license.sgml#4 integrate
.. //depot/projects/docproj_nl/www/en/copyright/freebsd-license.sgml#4 integrate
.. //depot/projects/docproj_nl/www/en/search/search.sgml#8 integrate
.. //depot/projects/docproj_nl/www/en/security/security.sgml#17 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#98 integrate
.. //depot/projects/docproj_nl/www/share/sgml/release.ent#31 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#7 (text+ko) ====

@@ -37,7 +37,7 @@
       
     
 
-    $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.85 2009/11/28 19:55:51 hrs Exp $
+    $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.86 2011/01/15 12:51:40 jkois Exp $
 
     
       &tm-attrib.freebsd;
@@ -119,10 +119,7 @@
     GNATS[8] database
     through email, the &man.send-pr.1; application, or via the web
     interface provided at .
-    In addition to the multitude of different technical mailing lists
-    about &os;, the &a.qa; provides a forum for discussing the finer
-    points of release-polishing.
+    url="http://www.FreeBSD.org/send-pr.html">.
 
   To service our most conservative users, individual release
     branches were introduced with &os; 4.3.

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#2 (text+ko) ====

@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD SMP Next Generation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml,v 1.11 2006/01/22 16:20:37 delphij Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml,v 1.12 2011/01/15 12:51:40 jkois Exp $
 -->
 
 
@@ -10,9 +10,7 @@
 
   SMP Next Generation Project
   This chapter is maintained by the FreeBSD SMP Next
-    Generation Project.  Please direct any comments or suggestions
-    to its &a.smp;.
-
+    Generation Project.
 
   locking
   multi-processing

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#32 (text+ko) ====

@@ -12,7 +12,7 @@
 
     The &os; Documentation Project
 
-    $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1131 2010/10/18 12:43:51 gjb Exp $
+    $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1132 2011/01/15 12:51:40 jkois Exp $
 
     
       1995
@@ -2253,8 +2253,7 @@
 	  
 	    Symmetric multi-processor (SMP) systems are generally
 	      supported by &os;, although in some cases, BIOS or
-	      motherboard bugs may generate some problems.  Perusing the
-	      &a.smp; may yield some clues.
+	      motherboard bugs may generate some problems.
 
 	    &os; will take advantage of HyperThreading (HTT)
 	      support on Intel CPUs that support this feature.  A kernel

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#19 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -113,6 +113,11 @@
 	    
 
 	    
+	      &a.chromium.name;
+	      FreeBSD-specific Chromium issues
+	    
+
+	    
 	      &a.current.name;
 	      Discussion concerning the use of
 		&os.current;
@@ -192,11 +197,6 @@
 	    
 
 	    
-	      &a.alpha.name;
-	      Porting FreeBSD to the Alpha
-	    
-
-	    
 	      &a.amd64.name;
 	      Porting FreeBSD to AMD64 systems
 	    
@@ -461,11 +461,6 @@
 	    
 
 	    
-	      &a.qa.name;
-	      Discussion of Quality Assurance, usually pending a release
-	    
-
-	    
 	      &a.rc.name;
 	      Discussion related to the rc.d system and its development
 	    
@@ -497,12 +492,6 @@
 	    
 
 	    
-	      &a.smp.name;
-	      Design discussions for [A]Symmetric
-		MultiProcessing
-	    
-
-	    
 	      &a.sparc.name;
 	      Porting FreeBSD to &sparc; based systems
 	    
@@ -1037,6 +1026,18 @@
 	
 
 	
+	  &a.chromium.name;
+
+	  
+	    FreeBSD-specific Chromium issues
+
+	    This is a list for the discussion of Chromium
+	      support for FreeBSD.  This is a technical list to discuss
+	      development and installation of Chromium.
+	  
+	
+
+	
 	  &a.core.name;
 
 	  

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#7 (text+ko) ====

@@ -6,7 +6,7 @@
 	and Tom Rhodes 
 
 	For the FreeBSD Documentation Project
-	$FreeBSD: doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml,v 1.48 2010/12/01 20:37:05 rene Exp $
+	$FreeBSD: doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml,v 1.49 2011/01/19 09:41:34 ryusuke Exp $
 -->
 
 
@@ -848,12 +848,6 @@
 	  /dev/gvinum/concat, a name which has
 	  no relationship with a partition name.
 
-	Normally, &man.newfs.8; interprets the name of the disk and
-	  complains if it cannot understand it.  For example:
-
-	&prompt.root; newfs /dev/gvinum/concat
-newfs: /dev/gvinum/concat: can't figure out file system partition
-
 	In order to create a file system on this volume, use
 	  &man.newfs.8;:
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#18 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -24,10 +24,6 @@
 FreeBSD Adaptec AIC7xxx discussions mailing list">
 freebsd-aic7xxx">
 
-
-FreeBSD Alpha porting mailing list">
-freebsd-alpha">
-
 
 Porting FreeBSD to AMD64 systems">
 freebsd-amd64">
@@ -76,6 +72,10 @@
 FreeBSD chat mailing list">
 freebsd-chat">
 
+
+FreeBSD-specific Chromium issues">
+freebsd-chromium">
+
 
 FreeBSD clustering mailing list">
 freebsd-cluster">
@@ -357,10 +357,6 @@
 FreeBSD Python mailing list">
 freebsd-python">
 
-
-FreeBSD Quality Assurance mailing list">
-freebsd-qa">
-
 
 FreeBSD general questions mailing list">
 freebsd-questions">
@@ -393,10 +389,6 @@
 FreeBSD-small mailing list">
 freebsd-small">
 
-
-FreeBSD symmetric multiprocessing mailing list">
-freebsd-smp">
-
 
 FreeBSD SPARC porting mailing list">
 freebsd-sparc64">
@@ -542,3 +534,20 @@
 
 
 majordomo@FreeBSD.org">
+
+
+
+
+FreeBSD Alpha porting mailing list">
+freebsd-alpha">
+
+
+FreeBSD Quality Assurance mailing list">
+freebsd-qa">
+
+
+FreeBSD symmetric multiprocessing mailing list">
+freebsd-smp">

==== //depot/projects/docproj_nl/share/pgpkeys/novel.key#2 (text+ko) ====

@@ -1,44 +1,67 @@
-
+
 
 
 uid                  Roman Bogorodskiy 
-uid                  Roman Bogorodskiy 
-uid                  Roman Bogorodskiy 
-uid                  Roman Bogorodskiy 
+uid                  Roman Bogorodskiy 
+uid                  Roman Bogorodskiy 
+sub   2048R/EC4ED237 2010-12-03
 ]]>
 

==== //depot/projects/docproj_nl/www/en/copyright/freebsd-doc-license.sgml#4 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 ]>
@@ -8,7 +8,7 @@
 
 &header;
 
-  Copyright 1994-2010
+  
Copyright 1994-2011
     The FreeBSD Project.
     All rights reserved.
 

==== //depot/projects/docproj_nl/www/en/copyright/freebsd-license.sgml#4 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 ]>
@@ -8,7 +8,7 @@
 
 &header;
 
-    Copyright 1992-2010
+    
Copyright 1992-2011
       The FreeBSD Project.
       All rights reserved.
 

==== //depot/projects/docproj_nl/www/en/search/search.sgml#8 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 ]>
 
@@ -309,6 +309,12 @@
 
 	  
+	    
+	  
+
+	  
+	    

==== //depot/projects/docproj_nl/www/en/security/security.sgml#17 (text+ko) ====

@@ -1,11 +1,11 @@
 
-
+ %developers;
 ]>
-
+
   &header;
@@ -24,6 +24,7 @@
     Information about the FreeBSD Security Officer
Information handling policies
Supported FreeBSD Releases
+    Unsupported FreeBSD Releases
Other Security Links

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#98 (text+ko) ====

@@ -25,11 +25,35 @@
 
   
     
-      $FreeBSD: www/share/sgml/news.xml,v 1.358 2010/12/27 15:24:23 jkois Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.359 2011/01/16 22:49:49 danger Exp $
     
   
 
   
+    2011
+
+    
+      1
+
+      
+	16
+
+	
+	  &os; 8.2-RC2 Available
+
+	  The second Release Candidate build for the &os;-8.2
+	    release cycle is now available.  ISO images for Tier-1
+	    architectures can be downloaded from most of the &os;
+	    mirror sites.  Please see the official announcement
+	    for further details about this release.
+	
+      
+    
+  
+
+  
     2010
 
     

==== //depot/projects/docproj_nl/www/share/sgml/release.ent#31 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 
+
 
 
 
@@ -3002,7 +3002,7 @@
 	protocol will exchange information with neighbouring switches
 	to quickly transition to forwarding without creating
 	loops.
-	&os; supports RTSP and STP as operating modes, with RTSP
+	&os; supports RSTP and STP as operating modes, with RSTP
 	being the default mode.
 
       Spanning Tree can be enabled on member interfaces using

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#17 (text+ko) ====

@@ -1,6 +1,6 @@
 
 
 
@@ -204,10 +204,14 @@
       
 	In this section and in the next two sections, we assume you have
 	  already installed Firefox.
+      
+
+      According to the version of Firefox
+	you run various steps are required:
 
-	Currently, the &java; plugin does not work with
-	  Firefox 3.6.
-      
+      
+	
+	  For Firefox 3.5
 
       The &os; Foundation has a license with Sun Microsystems to
 	distribute &os; binaries for the Java Runtime Environment
@@ -267,16 +271,41 @@
 	  &arch.i386; architecture, &arch.amd64; packages are also
 	  available.
       
+	
+
+	
+	  For Firefox 3.6
+
+      Install OpenJDK 6
+        through the Ports Collection by typing:
+        
+      &prompt.root; cd /usr/ports/java/openjdk6
+&prompt.root; make config install clean
+
+      Make sure you have selected the WEB option.
+
+      Each user will have to run the following command:
+
+      &prompt.user; ln -s /usr/local/openjdk6/jre/lib/IcedTeaPlugin.so \
+  $HOME/.mozilla/plugins/
+
+      Start your browser, enter about:plugins
+	in the location bar and press Enter.  A page
+	listing the installed plugins will be displayed; the
+	&java; plugin should be listed there
+	now.
+	
+      
     
 
     
 
-      Firefox and ¯omedia; &flash; Plugin
+      Firefox and &adobe; &flash; Plugin
       
         Flash
       
 
-      ¯omedia; &flash; plugin is not available for &os;. However,
+      The &adobe; &flash; plugin is not available for &os;. However,
 	a software layer (wrapper) for running the Linux version of the plugin
 	exists.  This wrapper also supports &adobe; &acrobat; plugin,
 	&realplayer; plugin and more.

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#15 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -1106,13 +1106,11 @@
 	allows you to add in support for devices which are not in the
 	GENERIC kernel, such as sound cards.
 
-      For &os; 6.2 and later, after the procedure of device
+      After the procedure of device
 	probing, you will see .  Use the
 	arrow key to choose a country, region, or group.  Then press
 	Enter, it will set your country
-	easily.  It is also easy to exit the
-	sysinstall program and start over again.
-	
+	easily.
 
       
 	Selecting Country Menu
@@ -1140,32 +1138,8 @@
 	
       
 
-      
-	Select Sysinstall Exit
-
-	
-	  
-	    
-	  
-	
-      
-
-      Use the arrow keys to select 
-	Exit Install from the Main
-	Install Screen menu.  The following message will display:
-
-
-                            User Confirmation Requested 
-         Are you sure you wish to exit? The system will reboot 
-
-                            [ Yes ]    No
-
-      The install program will start again if the
-	&gui.yes; is selected and the CDROM is left in the drive during
-	the reboot.
-
-      If you are booting from floppies it will be necessary to remove
-	the boot.flp floppy before rebooting.
+      After the country selecting, the sysinstall
+	main menu will display.
     
   
 

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#53 (text+ko) ====

@@ -1,10 +1,10 @@
 
 
 
@@ -742,15 +742,13 @@
 	&man.mrouted.8;.
 
       
-	Sinds &os; 7.0 is het multicast-routeer-daemon
-	  &man.mrouted.8; uit het basissysteem verwijderd.  Het
-	  implementeert het multicast-routeer-protocol
-	  DVRMP, welke in veel multicast-installaties
-	  grotendeels is vervangen door &man.pim.4;.  De gerelateerde
-	  gereedschappen &man.map-mbone.8; en &man.mrinfo.8; zijn ook
-	  verwijderd.  Deze programma's zijn nu beschikbaar in de &os;
-	  Ports Collectie als net/mrouted.
+	De &man.mrouted.8; multicast-routeer-daemon implementeert
+	  het multicast-routeer-protocol DVRMP welke
+	  in veel multicast-installaties grotendeels is vervangen door
+	  &man.pim.4;. &man.mrouted.8; en de gerelateerde
+	  &man.map-mbone.8; en &man.mrinfo.8; gereedschappen zijn
+	  beschikbaar in de &os; Ports Collectie als
+	  net/mrouted.
       
     
   
@@ -867,7 +865,7 @@
 	implementatie van deze protocollen maken snelle gegevensbursts
 	en gepriotiseerde verkeersstromen mogelijk.
 
-      Sinds versie 6.0 ondersteunt &os; netwerken die met 802.11a,
+      &os; ondersteunt netwerken die met 802.11a,
 	802.11b, en 802.11g werken.  Ook worden de
 	veiligheidsprotocollen WPA en 802.11i ondersteund (samen met
 	11a, 11b, of 11g) en QoS en de verkeerspriorisatieprotocollen
@@ -2712,7 +2710,7 @@
 	apparaat gepaard.  Als alternatief kan paren op het andere
 	apparaat worden geïnitialiseerd.
 
-      Op &os; 5.5, 6.1, en nieuwer kan de volgende regel aan
+      De volgende regel kan aan
 	het bestand /etc/rc.conf worden toegevoegd
 	om hcsecd automatisch met het
 	systeem op te starten:
@@ -2806,7 +2804,7 @@
 
       Het aanbieden van diensten op &os; aan
 	Bluetooth-cliënten wordt gedaan met de server &man.sdpd.8;.
-	Op &os; 5.5, 6.1, en nieuwer, kan de volgende regel aan het
+	De volgende regel kan aan het
 	bestand /etc/rc.conf worden
 	toegevoegd:
 
@@ -3241,51 +3239,9 @@
 	en verwijderen.  RSTP biedt snellere convergentie naar een
 	opspannende boom dan het verouderde STP, het protocol wisselt
 	informatie met naburige switches uit om snel naar forwarding
-	over te gaan zonder lussen te creëren.
-
-      De volgende tabel laat de ondersteunende werkwijzen
-	zien:
-
-      
-	
-	  
-	    
-	      OS-versie
-
-	      STP-modi
-
-	      Standaard modus
-	    
-	  
-
-	  
-	    
-	      &os; 5.4—&os; 6.2
-
-	      STP
-
-	      STP
-	    
-
-	    
-	      &os; 6.3+
-
-	      RSTP of STP
-
-	      STP
-	    
-
-	    
-	      &os; 7.0+
-
-	      RSTP of STP
+	over te gaan zonder lussen te creëren. &os; ondersteund
+	RSTP en STP als opties, waarbij RSTP de standaard is.
 
-	      RSTP
-	    
-	  
-	
-      
-
       Spanning Tree kan op lidinterfaces worden geactiveerd met
 	het commando stp.  Voor een bridge met
 	fxp0 en fxp1
@@ -4110,9 +4066,9 @@
 	  verzoeken voor BOOTP als DHCP
 	  beantwoorden.
 
-	ISC DHCP 3.0 maakt geen deel
+	ISC DHCP 3.1 maakt geen deel
 	  uit van het basissysteem.  Eerst dient de poort net/isc-dhcp30-server of het
+	    role="package">net/isc-dhcp31-server of het
 	  corresponderende pakket geïnstalleerd te worden.
 
 	Wanneer ISC DHCP is
@@ -4688,13 +4644,11 @@
 	PRI-kaarten.
 
       Kijk voor documentatie over
-	isdn4bsd in de map
-	/usr/share/examples/isdn op het
-	&os;-systeem of op de homepage van
+	isdn4bsd op de homepage van
 	isdn4bsd, welke ook verwijzingen naar tips, errata, en
 	veel meer documentatie zoals het isdn4bsd handboek
+	  url="http://people.FreeBSD.org/~hm/">isdn4bsd handboek
 	bevat.
 
       Indien er interesse is om ondersteuning voor een ander

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/audit/chapter.sgml#14 (text+ko) ====

@@ -1,9 +1,9 @@
 
 
 
 
 
@@ -1939,7 +1939,6 @@
 	  
 	    Mount het bestandssysteem alleen lezen.  Dit is
 	      identiek aan de optie 
-	      ( voor &os; versies ouder dan 5.2)
 	      voor de optie .
 	  
 	

==== //depot/projects/docproj_nl/www/en/news/status/Makefile#12 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/news/status/Makefile,v 1.52 2010/10/27 00:10:37 danger Exp $
+# $FreeBSD: www/en/news/status/Makefile,v 1.53 2011/01/25 13:15:52 danger Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -49,6 +49,7 @@
 XMLDOCS+=	report-2010-01-2010-03
 XMLDOCS+=	report-2010-04-2010-06
 XMLDOCS+=	report-2010-07-2010-09
+XMLDOCS+=	report-2010-10-2010-12
 
 XSLT.DEFAULT=	report.xsl
 

==== //depot/projects/docproj_nl/www/en/news/status/report-2010-10-2010-12.xml#2 (text+ko) ====

@@ -2,7 +2,7 @@
 
-
+
 
   
     October-December
@@ -20,7 +20,7 @@
       month.
 
     Thanks to all the reporters for the excellent work!  This report
-      contains 34 entries and we hope you enjoy reading it.
+      contains 37 entries and we hope you enjoy reading it.
 
     Please note that the deadline for submissions covering the period
       between January and March 2011 is April 15th, 2011.
@@ -74,6 +74,12 @@
     Ports
   
 
+  
+    misc
+
+    Miscellaneous
+  
+
   
     Ethernet Switch Framework
 
@@ -745,7 +751,7 @@
 	greatly eases the task of working with samba shares in a &os;
 	environment.
 
-      Freeswitch is the resullt of 3 Asterisk developers working on a
+      
Freeswitch is the result of 3 Asterisk developers working on a
 	VoIP package that fulfills their goals.  They have switched away from
 	a release model to a "just run latest SVN checkout" model.  With
 	the help of Richard Neese and Eric Crist, static snapshots of their
@@ -1759,7 +1765,7 @@
 	software distribution support can do work redistribution based
 	on new notions of CPU affinity for individual TCP
 	connections.
-	
+
       On-going work is refining performance on non-RSS supporting
 	configurations, and adding APIs to allow socket affinity to be
 	queried (and where supported) set by applications.  These
@@ -1769,7 +1775,7 @@
 	to allow steady-state TCP connections to use only CPU-local
 	cache lines, with work distributed to all CPUs.  Current
 	performance results are extremely promising.
-	
+
       This project has been sponsored by Juniper Networks.
     
 
@@ -1779,29 +1785,190 @@
 	support unconditionally — for systems without RSS NICs,
 	this leads to a small one-time performance penalty at the
 	creation of each call to bind() or connect().
-  
+
       Add missing socket options to query (and override) default
 	CPU affinity for connections, which is derived from the active
 	software or hardware hash model.
-  
+
       Teach the network stack and appropriate NIC drivers to
-	propagate software-overriden connection affinity to hardware
+	propagate software-overridden connection affinity to hardware
 	using new device driver ioctls for managing TCAMs and hardware
 	hash tables.
-  
+
       Refine software redistribution of work in the event that
 	there are fewer hardware queues than available CPU threads in
 	which to process packets; the current prototype is able to do
 	this with significant performance benefits, but the model
 	requires refining.
-  
+
       Experiment with (and measure) software work redistribution
 	at run-time based on RSS bucket rearrangement.  This will
 	require a new event notification to device drivers so that
 	they can update hardware caches of the network stack's
 	authoritative table.
-  
+
       Commit.
     
   
+
+  
+    &os; Bugbusting Team Status Report
+
+    
+      
+	
+	  Gavin
+	  Atkinson
+	
+	gavin@FreeBSD.org
+      
+
+      
+	
+	  Mark
+	  Linimon
+	
+	linimon@FreeBSD.org
+      
+
+      
+	
+	  Remko
+	  Lodder
+	
+	remko@FreeBSD.org
+      
+
+      
+	
+	  Volker
+	  Werth
+	
+	vwe@FreeBSD.org
+      
+    
+
+    
+      
+      
+      
+    
+
+    
+      The number of non-ports PRs has held relatively steady over
+	the last three months, with a slightly improved resolution rate
+	being offset by a slightly increased rate of new arrivals.
+	Ports PRs have increased slightly in numbers, due in part to
+	the ports freeze in the lead up to the release of &os; 7.4 and
+	&os; 8.2.  The numbers traditionally drop quickly again once the
+	freeze is lifted.
+
+      In October, Gavin Atkinson and Mark Linimon held a session at
+	the &os; Developers' Summit at EuroBSDCon, which led to some
+	productive discussions, and a number of people expressing
+	interest in becoming more involved with PR triaging and
+	resolution.
+
+      The bugbusting team continue work on trying to make the
+	contents of the GNATS PR database cleaner, more accessible and
+	easier for committers to find and resolve PRs, by tagging PRs
+	to indicate the areas involved, and by ensuring that there is
+	sufficient info within each PR to resolve each issue.
+
+      Reports continue to be produced from the PR database, all of
+	which can be found from the links above.  Committers interested
+	in custom reports are encouraged to discuss requirements with
+	bugmeister@ - we are happy to create new reports where needs are
+	identified.
+
+      As always, anybody interested in helping out with the PR queue
+	is encouraged to do so, the easiest way being to join us on IRC
+	in #freebsd-bugbusters on EFnet.  We are always looking for
+	additional help, whether your interests lie in triaging incoming
+	PRs, generating patches to resolve existing problems, or simply
+	helping with the database housekeeping (identifying duplicate
+	PRs, ones that have already been resolved, etc).  This is a
+	great way of getting more involved with &os;!
+    
+
+    
+      Try to find ways to get more committers helping us with
+	closing PRs that the team has already analyzed.
+
+      Try to get more non-committers involved with the triaging
+	of PRs as they come in, and generating patches to fix reported
+	problems.
+    
+  
+
+  
+    &os; Services Control (fsc)
+
+    
+      
+	
+	  Tom
+	  Rhodes
+	
+	trhodes@FreeBSD.org
+      
+    
+
+    http://people.FreeBSD.org/~trhodes/fsc/
+
+    
+      &os; Services Control is a mix of binaries which
+	integrate into the rc.d system and provide for service
+	(daemon) monitoring.  It knows about signals, pidfiles,
+	and uses very little resources.
+
+      The fscd utilities will be set up as a port and, hopefully,
+	dropped into the ports collection in the coming weeks.  This
+	will allow easier testing by everyone and it should make
+	migration into -CURRENT much easier.
+    
+  
+
+  
+    FOSDEM 2011
+
+    
+      
+	
+	  Marius
+	  Nuennerich
+	
+	marius@nuenneri.ch
+      
+
+      
+	
+	  Daniel
+	  Seuffert
+	
+	ds@FreeBSD.org
+      
+    
+
+    
+      
+    
+
+    
+      FOSDEM 2011 will be held from Saturday, February 5th to
+	Sunday February 6th in Brussels, Belgium.  We will have a &os;
+	booth and a developers room.  At the booth there will be
+	friendly supporters and a &os; Foundation member answering
+	questions.  The devroom will have 6 1-hour long talks about
+	different topics, technical and social.  FOSDEM is one of the
+	biggest open-source events in Europe. It is completly free and
+	no registration is required.
+    
+
+    
+      Get more people involved as helpers for the booth and the
+	devroom are still needed.  Please contact Daniel or Marius if
+	you want to help out.
+    
+  
 

==== //depot/projects/docproj_nl/www/en/news/status/status.sgml#13 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 ]>
@@ -8,7 +8,7 @@
 
   &header;
 
-  Next submissions due: January 15th, 2011
+  Next submissions due: April 15th, 2011
 
   Use the xml
       generator or download and edit the 
@@ -42,6 +42,8 @@
   
2010

 
   
+    October, 2010 -
+      December, 2010
     July, 2010 -
       September, 2010
     April, 2010 -

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#99 (text+ko) ====

@@ -25,7 +25,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/news.xml,v 1.359 2011/01/16 22:49:49 danger Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.361 2011/01/25 13:17:22 danger Exp $
     
   
 
@@ -36,6 +36,34 @@
       1
 
       
+	25
+
+	
+	  October-December, 2010 Status Report
+
+	  The October-December, 2010 Status Report is now
+	    available with 37 entries.
+	
+      
+
+      
+	23
+
+	
+	  &os; 7.4-RC2 Available
+
+	  The second Release Candidate build for the &os;-7.4
+	    release cycle is now available.  ISO images for Tier-1
+	    architectures can be downloaded from most of the &os;
+	    mirror sites.  Please see the official announcement
+	    for further details about this release.
+	
+      
+
+      
 	16
 
 	

==== //depot/projects/docproj_nl/www/share/sgml/release.ent#32 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 
 
 
@@ -5165,12 +5165,12 @@
 	placed inside /etc/rc.conf:
 
       syslogd_enable="YES"
-syslogd_flags="-a logclient.example.com -vv"
+syslogd_flags="-a logclient.example.com -v -v"
 
       The first option will enable the syslogd
 	daemon on boot up, and the second option allows data from the
 	specified client to be accepted on this server.  The latter
-	part, using , will increase the verbosity
+	part, using , will increase the verbosity
 	of logged messages.  This is extremely useful for tweaking
 	facilities as administrators are able to see what type of
 	messages are being logged under which facility.
@@ -5234,7 +5234,7 @@
 	/etc/rc.conf:
 
       syslogd_enable="YES"
-syslogd_flags="-s -vv"
+syslogd_flags="-s -v -v"
 
       As before, these entries will enable the
 	syslogd daemon on boot up, and increases
@@ -5299,7 +5299,7 @@
 	syslogd_flags option to look like the
 	following example, and issue a restart:
 
-      syslogd_flags="-d -a logclien.example.com -vv"
+      syslogd_flags="-d -a logclien.example.com -v -v"
 
       &prompt.root; /etc/rc.d/syslogd restart
 
@@ -5320,7 +5320,7 @@
 	by bit, it appears a typo in the following
 	/etc/rc.conf line has an issue:
 
-      syslogd_flags="-d -a logclien.example.com -vv"
+      syslogd_flags="-d -a logclien.example.com -v -v"
 
       The line should contain logclient, not
 	logclien.  After the proper alterations

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#22 (text+ko) ====

@@ -1,10 +1,10 @@
 
 
 
@@ -964,8 +964,8 @@
 	  inclusief diegeen die gekoppeld zijn aan &os;, hebben voor het
 	  laatste gekozen.
 
-	Dankzij de bijdragen van Bill Paul (wpaul) is er vanaf
-	  &os; 5.3-RELEASE native ondersteuning
+	Dankzij de bijdragen van Bill Paul (wpaul) is er
+	  native ondersteuning
 	  voor de Network Driver Interface Specification (NDIS).  De
 	  &os; NDISulator (ook wel bekend als Project Evil) neemt een
 	  binair &windows; stuurprogramma en doet net alsof deze in een
@@ -2036,11 +2036,11 @@
 	  gebruikt worden om de opstarttijd te versnellen.  De
 	  standaardwaarde is nogal hoog en kan 15
 	  seconden vertraging veroorzaken.  Met modernere SCSI-systemen
-	  is 5 seconden al voldoende.  Nieuwere
-	  versies van &os; (5.0 en hoger) gebruiken de opstartvariabele
-	  kern.cam.scsi_delay.  Zowel deze als de
-	  optie SCSI_DELAY gebruiken waarden
-	  uitgedrukt in milliseconden en
+	  is 5 seconden al voldoende (zeker met
+	  moderne schijven). De kern.cam.scsi_delay
+	  opstart variabele moet hier gebruikt worden. De variabele
+	  en kernl configuratie optie accepteren waarden uitgedrukt
+	  in milliseconden en
 	  niet in
 	  seconden.
       

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#37 (text+ko) ====

@@ -1,10 +1,10 @@
 
 
 
@@ -137,9 +137,9 @@
 	Om het te gebruiken, dient u de port of het pakket voor net/cvsup te installeren (als u niet de
 	grafische cvsup-cliënt wilt installeren, kunt u
-        de port net/cvsup-without-gui installeren.  Als u
-	&os; 6.2-RELEASE of nieuwer gebruikt, kunt u dit vervangen door
-	&man.csup.1; welke nu deel uitmaakt van het basissysteem.
+        de port net/cvsup-without-gui installeren.  U kunt
+	ervoor kiezen om dit te vervangen door &man.csup.1; welke onderdeel is
+	van het basissysteem.
     
   
 
@@ -189,14 +189,9 @@
 
     
       Binaire updates zijn beschikbaar voor alle architecturen en
-	uitgaven die momenteel door het beveiligingsteam worden
-	ondersteund; voor sommige eigenschappen, zoals de upgrades van
-	het besturingssysteem &os;, zijn de laatste uitgave van
-	&man.freebsd-update.8; en &os; 6.3 nodig.  Voordat naar
-	een nieuwe uitgave wordt ge-updated, dienen de huidige
-	uitgaveaankondigingen gelezen te worden aangezien ze belangrijke
-	informatie over de gewenste uitgave kunnen bevatten.  De
-	aankondigingen kunnen op de volgende koppeling bekeken worden:
+	uitgaveaankondigingen dienen gelezen te worden aangezien deze
+	belangrijke informatie over de gewenste uitgave kunnen bevatten.
+	De aankondigingen kunnen op de volgende koppelin bekeken worden:
 	.
     
 
@@ -464,9 +459,9 @@
       Updates van grote en kleine versies kunnen worden uitgevoerd
 	door een uitgaveversie als doel aan
 	freebsd-update op te geven, het volgende
-	commando zal bijvoorbeeld updaten naar &os; 6.4:
+	commando zal bijvoorbeeld updaten naar &os; 8.1:
 
-      &prompt.root; freebsd-update -r 6.4-RELEASE upgrade
+      &prompt.root; freebsd-update -r 8.1-RELEASE upgrade
 
       Nadat het commando is ontvangen, zal
 	freebsd-update het instellingenbestand en het
@@ -476,7 +471,7 @@
 	en welke niet.  Bijvoorbeeld:
 
       Looking up update.FreeBSD.org mirrors... 1 mirrors found.
-Fetching metadata signature for 6.3-RELEASE from update1.FreeBSD.org... done.
+Fetching metadata signature for 8.0-RELEASE from update1.FreeBSD.org... done.
 Fetching metadata index... done.
 Inspecting system... done.
 
@@ -501,7 +496,7 @@
 	stap een waarschuwing geven die lijkt op de volgende:
 
       WARNING: This system is running a "MIJNKERNEL" kernel, which is not a
-kernel configuration distributed as part of FreeBSD 6.3-RELEASE.
+kernel configuration distributed as part of FreeBSD 8.0-RELEASE.
 This kernel will not be updated: you MUST update the kernel manually
 before running "/usr/sbin/freebsd-update install"
 
@@ -2177,13 +2172,6 @@
 	mismatch-problemen volledig te voorkomen.  Hopelijk blijft de
 	huidige procedure voor een lange tijd stabiel.
 
-      
-	Het bijwerken van &os; 3.X of
-	  eerdere uitgaven is wat lastiger; lees
-	  UPDATING zorgvuldig door als u zo'n soort
-	  upgrade moet uitvoeren.
-      
-
       Samengevat is de huidige aanbevolen manier om &os; vanaf
 	broncode bij te werken:
 
@@ -3076,7 +3064,7 @@
 	      verwijderen en een verse start maken.  In dit geval heeft
 	      het behouden van /usr/obj na het
 	      afronden weinig zin en geeft het ook nogal wat extra
-	      vrije schijfruimte (ongeveer 340 MB).
+	      vrije schijfruimte (ongeveer 2 GB).
 
 	    Als er veel kennis aanwezig is bij een beheerder, dan
 	      kan make buildworld aangegeven worden
@@ -3287,6 +3275,117 @@
     
   
 
+  
+      
+	
+	  Antn
+	  Shterenlikht
+	  Gebaseerd op notities van 
+	
+      
+    
+
+    Het verwijderen van overbodige bestanden, directories en
+      bibliotheken
+
+    
+      Verwijderen van overbodige bestanden, directories en
+	bibliotheken
+    
+
+    Als onderdeel van de &os; ontwikkel levenscyclus kan het van
+      tijd tot tijd gebeuren dat bestanden en de inhoud ervan overbodig
+      worden.  Dit kan komen doordat de functionaliteit ergens anders
+      geïmplementeerd is, het versienummer van de bibliotheek
+      veranderd is of hij is totaal van het systeem verdwenen.  Dit is
+      inclusief oude bestanden, bibliotheken en directories welke
+      verwijderd moeten worden bij het updaten van het systeem.  Het
+      voordeel voor de gebruiker is dat het systeem niet vervuild wordt
+      met oude bestanden die onnodig ruimte innemen op het opslag (en
+      backup) systeem.  Ook is het zo dat als de oude bibliotheek een
+      beveiligings of stabiliteits probleem had, er moet worden geupdate
+      naar de nieuwere bibliotheek om het systeem veilig te houden en te
+      voorkomen dat er crashes komen door de oude implementatie van de
+      bibliotheek.  De bestanden, directories en bibliotheken welke als
+      overbodig worden gezien zijn beschreven in
+      /usr/src/ObsoleteFiles.inc.  De volgende
+      instructies zullen helpen om deze verouderde bestanden te verwijderen
+      tijdens het systeem upgrade proces.
+
+    Er wordt aangenomen dat de stappen gevolgd worden zoals uitgelegd
+      in .  Na het make
+      installworld commando en het daarop
+      volgende mergemaster commando succesvol uitgevoerd zijn
+      kan er op de volgende manier gecontroleerd worden voor verouderde bestanden
+      en bibliotheken:
+
+    &prompt.root; cd /usr/src
+&prompt.root; make check-old
+
+    Als er verouderde bestanden gevonden worden kunnen deze verwijderd
+      worden door het volgende commando:
+
+    &prompt.root; make delete-old
+
+    
+      Zie het /usr/src/Makefile
+	bestand voor meer interessante targets.
+    
+
+    Er wordt een prompt getoond voordat elk verouderd bestand wordt
+      verwijderd.  Deze prompt kan worden overgeslagen en het systeem deze
+      bestanden automatisch laten verwijderen door gebruik te maken van de
+      BATCH_DELETE_OLD_FILES make variabele als volgt:
+
+    &prompt.root; make -DBATCH_DELETE_OLD_FILES delete-old
+
+    Dit kan ook worden gedaan door deze commando's door
+      yes te pipen als volgt:
+
+    &prompt.root; yes|make delete-old
+
+    
+      Waarschuwing
+	HEt verwijderen van verouderde bestanden zal applicaties
+	  stuk maken die nog gebruik maken van de overbodige bestanden.
+	  Dit is zeker waar voor oude bibliotheken.  In de meeste gevallen
+	  moeten de programma's, ports of bibliotheken opnieuw gecompileerd
+	  worden voordat
+	  make delete-old-libs
+	  wordt uitgevoerd.
+    
+
+    Gereedschappen om gedeelde bibliotheek afhankelijkheden te controleren
+      zijn beschikbaar in de Ports Collectie in sysutils/libchk of sysutils/bsdadminscripts.
+
+    Overbodige gedeelde bibliotheken kunnen conflicteren met
+      nieuwere bibliotheken welke berichten zoals deze kunnen
+      veroorzaken:
+
+    /usr/bin/ld: warning: libz.so.4, needed by /usr/local/lib/libtiff.so, may conflict with libz.so.5
+/usr/bin/ld: warning: librpcsvc.so.4, needed by /usr/local/lib/libXext.so, may conflict with librpcsvc.so.5
+
+    Om deze problemen op te lossen moet bepaald worden welke port
+      deze bibliotheek heeft geïnstalleerd:
+
+    &prompt.root; pkg_info -W  /usr/local/lib/libtiff.so
+/usr/local/lib/libtiff.so was installed by package tiff-3.9.4
+&prompt.root; pkg_info -W /usr/local/lib/libXext.so
+/usr/local/lib/libXext.so was installed by package libXext-1.1.1,1
+
+    Deïnstalleer, herbouw en herinstalleer de port.  De ports-mgmt/portmaster en ports-mgmt/portupgrade gereedschappen kunnen
+      gebruikt worden om deze processen te automatiseren.  Nadat zeker is dat
+      alle ports opnieuw gebouwd zijn, en de oude bibliotheken niet meer gebruikt
+      worden, kunnen deze verwijderd worden met het volgende commando:
+
+    &prompt.root; make delete-old-libs
+  
+
   
     
       

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#27 (text+ko) ====

@@ -1,10 +1,10 @@
 
 
 
@@ -227,13 +227,17 @@
       Firefox en &java; plugin
 
       
-	In deze en de volgende sectie wordt er vanuit gegaan dat
+	In deze en de volgende twee secties wordt er vanuit gegaan dat
 	  Firefox reeds geïnstalleerd
 	  is.
+      
+
+      Afhankelijk van de versie van Firefox
+	die gebruikt wordt zijn de volgende stappen benodigd:
 
-	Momenteel werkt de &java;-plugin niet met
-	  Firefox 3.6.
-      
+      
+	
+	  Voor Firefox 3.5
 
       De &os; Foundation heeft een licentie overeenkomst met Sun
 	Microsystems om &os; binaries te distribueren voor de Java
@@ -297,14 +301,39 @@
 	  architectuur draait, pakketten voor &arch.amd64; zijn ook
 	  beschikbaar.
       
+	
+
+	
+	  Voor Firefox 3.6
+
+	  Installeer OpenJDK 6 vanuit
+	    de Ports Collectie door het volgende typen:
+
+	  &prompt.root; cd /usr/ports/java/openjdk6
+&prompt.root; make config install clean
+
+	  Zorg ervoor dat de WEB optie geselecteerd is.
+
+	  Elke gebruiker moet het volgende commando uitvoeren:
+
+	  &prompt.user; ln -s /usr/local/openjdk6/jre/lib/IcedTeaPlugin.so \
+  $HOME/.mozilla/plugins/
+
+	  Start de browser en voer about:plugins in
+	    de locatie balk en druk op Enter.  Er zal een
+	    pagina gepresenteerd worden die de geïnstalleerde plugins
+	    toont; de &java; plugin zal nu
+	    getoond moeten worden.
+	
+      
     
 
     
-      Firefox en ¯omedia; &flash; plugin
+      Firefox en &adobe; &flash; plugin
 
       Flash
 
-      ¯omedia; &flash; plugin is niet beschikbaar voor &os;.
+      De &adobe; &flash; plugin is niet beschikbaar voor &os;.
 	Er is echter wel een softwarelaag (wrapper) om de &linux;-versie
 	van de plugin te draaien.  Deze wrapper ondersteunt ook &adobe;
 	&acrobat; plugin, &realplayer; plugin en meer.

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#23 (text+ko) ====

@@ -1,10 +1,10 @@
 
 
 
@@ -527,7 +527,7 @@
 
 	  Vervolgens dient besloten te worden hoe ze deel gaan
 	    uitmaken van het bestandssysteem.  Hiervoor dienen
-	    &man.vinum.8; () en &man.ccd.4;
+	    &man.vinum.4; () en &man.ccd.4;
 	    bestudeerd te worden.  Voor deze instellingen werd voor
 	    &man.ccd.4; gekozen.
 	
@@ -703,12 +703,12 @@
 	  van de blokapparaat-interface en projecteert gegevens op een
 	  manier die de flexibiliteit, prestatie en betrouwbaarheid
 	  verhoogt in vergelijking met de traditionele slice-blik op
-	  schijfopslag.  &man.vinum.8; implementeert de modellen
+	  schijfopslag.  &man.vinum.4; implementeert de modellen
 	  RAID-0, RAID-1 en RAID-5, zowel individueel als als
 	  combinatie.
 
 	In  staat meer informatie
-	  over &man.vinum.8;.
+	  over &man.vinum.4;.
       
     
 
@@ -2833,25 +2833,12 @@
 
       tar
 
-      Op &os; 5.3 en later zijn zowel GNU
-	tar als de standaard
-	bsdtar beschikbaar.  De GNU-versie kan
-	aangeroepen worden met gtar.  Het
-	ondersteunt apparaten op afstand waarbij gebruik wordt gemaakt
-	van dezelfde syntaxis als die van rdump.  Om
-	tar toe te passen op een Exabyte-bandstation
+      Om tar toe te passen op een Exabyte-bandstation
 	die met een Sun genaamd komodo verbonden
 	is:
 
-      &prompt.root; /usr/bin/gtar cf komodo:/dev/nsa8 . 2>&1
+      &prompt.root; tar cf - . | rsh komodo dd of=tape-device obs=20b
 
-      Hetzelfde kan bereikt worden met bsdtar
-	door gebruik te maken van een pijplijn en
-	rsh om gegevens naar een bandstation op
-	afstand te zenden:
-
-      &prompt.root; tar cf - . | rsh hostnaam dd of=bandapparaat obs=20b
-
       Indien de veiligheid van back-uppen over een netwerk een
 	punt is, dient gebruik te worden gemaakt van het commando
 	ssh en niet van
@@ -4169,8 +4156,8 @@
 
       Schijfversleuteling met <command>geli</command>
 
-      Vanaf &os; 6.0 is er een nieuwe cryptografische
-	GEOM-klasse beschikbaar: geli.  Deze wordt
+      Een alternatieve cryptografische GEOM klassie is beschikbaar
+	- geli.  Deze wordt
 	op het moment ontwikkeld door &a.pjd;.  geli
 	verschilt van gbde in de mogelijkheden en in
 	het gebruik van een andere methode voor het
@@ -4231,10 +4218,8 @@
 	worden en hoe een nieuwe geli
 	versleutelingsvoorziening gemaakt kan worden.
 
-      Het is mogelijk geli te gebruiken vanaf
-	&os; 6.0-RELEASE of later.  Het is noodzakelijk
-	super-user rechten te hebben omdat de kernel wordt
-	aangepast.
+      Het is noodzakelijk super-user rechten te hebben omdat
+	de kernel wordt aangepast.
 
       
 	
@@ -4406,13 +4391,12 @@
     
 
     Het versleutelen van de wisselbestand ruimte is gemakkelijk
-      met &os; te configureren en is beschikbaar sinds &os; 5.3-RELEASE.
+      met &os; te configureren.
       Afhankelijk van welke versie er gebruikt wordt zijn er verschillende
-      configuratie opties en instellingen mogelijk.  Vanaf &os; 
-      6.0-RELEASE en hoger kunnen &man.gbde.8; en &man.geli.8; gebruikt
-      worden voor het versleutelen van het wisselbestand.  Voor eerdere
-      versies geldt dat alleen &man.gbde.8; beschikbaar is.  Beide
-      systemen maken gebruik van het encswap
+      configuratie opties en instellingen mogelijk.  De &man.gbde.8; en
+      &man.geli.8; programma's kunnen gebruikt worden voor het versleutelen
+      van het wisselbestand.  Beide systemen maken gebruik van het
+      encswap
       rc.d script.
 
     De vorige sectie, Schijfpartities
@@ -4454,8 +4438,7 @@
     
       Versleutelen van het wisselbestand met &man.gbde.8;
 
-      Als gebruik gemaakt wordt van &os; 6.0-RELEASE of
-	nieuwer, moet gebruik gemaakt worden van het .bde
+      Er moet gebruik gemaakt worden van het .bde
 	achtervoegsel aan het apparaat in de respectievelijke
 	/etc/fstab wisselbestand regel:
 
@@ -4463,12 +4446,6 @@
 # Device                Mountpoint      FStype  Options         Dump    Pass#
 /dev/ad0s1b.bde         none            swap    sw              0       0
       
-
-      Voor systemen die dateren van voor &os; 6.0-RELEASE is
-	de volgende regel in /etc/rc.conf ook
-	benodigd:
-
-      gbde_swap_enable="YES"
     
 
     
@@ -4499,11 +4476,6 @@
 
       geli_swap_flags="-e blowfish -l 128 -s 4096 -d"
 
-      Voor systemen gedateerd van voor &os; 6.2-RELEASE moet
-	de volgende regel gebruikt worden:
-
-      geli_swap_flags="-a blowfish -l 128 -s 4096 -d"
-
       Zie de uitleg over het onetime commando in
 	de &man.geli.8; handleiding voor een lijst van mogelijke opties.
     

==== //depot/projects/docproj_nl/www/en/security/security.sgml#18 (text+ko) ====

@@ -1,11 +1,11 @@
 
-
+
 
 
  %developers;
 ]>
-
+
 
 
   &header;
@@ -257,7 +257,7 @@
       
-      
+      
From trasz at FreeBSD.org  Mon Jan 31 20:10:48 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Mon Jan 31 20:10:53 2011
Subject: PERFORCE change 188393 for review
Message-ID: <201101312010.p0VKAlwG017797@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@188393?ac=10

Change 188393 by trasz@trasz_victim on 2011/01/31 20:10:29

	IFC.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/Makefile#12 integrate
.. //depot/projects/soc2009/trasz_limits/Makefile.inc1#19 integrate
.. //depot/projects/soc2009/trasz_limits/bin/sh/jobs.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/tzdata/australasia#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/tzdata/northamerica#4 integrate
.. //depot/projects/soc2009/trasz_limits/etc/ftpusers#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/group#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/mail/aliases#2 integrate
.. //depot/projects/soc2009/trasz_limits/etc/master.passwd#2 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/lib/libgcc/Makefile#13 integrate
.. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/rtld.c#19 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/hast.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/hastd.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/hastd.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/pjdlog.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/pjdlog.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/primary.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_common.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_impl.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_socketpair.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_tcp4.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_uds.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/secondary.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/subr.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/hastd/subr.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifieee80211.c#12 integrate
.. //depot/projects/soc2009/trasz_limits/share/syscons/keymaps/Makefile#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_machdep.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_proto.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/syscalls.master#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/include/fdt.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/s3c2xx0/std.ln2410sbc#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/linprocfs/linprocfs.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_futex.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_futex.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files#45 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ahci/ahci.c#20 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/alc/if_alc.c#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-pci.h#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-intel.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ah.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9280.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9285.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath.c#21 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_debug.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_debug.h#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_misc.h#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_tx.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath_tx.h#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_athvar.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cs/if_cs.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cs/if_csreg.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/cs/if_csvar.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/fdt/fdt_common.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/fdt/fdt_pci.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/fdt/fdtbus.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/flash/mx25l.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ichsmb/ichsmb_pci.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ichwd/ichwd.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ichwd/ichwd.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/tsec/if_tsec_fdt.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/xen/netfront/netfront.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_machdep.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_proto.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/linux/syscalls.master#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/modules/ath/Makefile#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_ioctl.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_scan.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_cc_functions.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_constants.h#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_header.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_indata.c#18 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_indata.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_input.c#19 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_output.c#24 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_output.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_pcb.c#20 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_structs.h#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_sysctl.c#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_sysctl.h#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_timer.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_uio.h#11 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/sctputil.c#22 integrate
.. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_usrreq.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/fdt.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/intr_machdep.h#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/openpicvar.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mambo/mambo_openpic.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/atpic.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/isa.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/nexus.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/openpic_fdt.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/pci_fdt.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/cpcht.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/hrowpic.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/openpic_macio.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/intr_machdep.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/openpic.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/pic_if.m#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/ps3/ps3pic.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/psim/openpic_iobus.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#32 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_page.c#26 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/execution/killed2.0#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/tools/ath/athpow/athpow.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/xlint/arch/powerpc64/targparam.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/newsyslog/newsyslog.8#5 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/newsyslog/newsyslog.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/newsyslog/newsyslog.conf.5#4 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/newsyslog/pathnames.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/sysinstall/installUpgrade.c#4 integrate

Differences ...

==== //depot/projects/soc2009/trasz_limits/Makefile#12 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.382 2011/01/25 08:13:31 bz Exp $
+# $FreeBSD: src/Makefile,v 1.383 2011/01/31 15:17:47 imp Exp $
 #
 # The user-driven targets are:
 #
@@ -126,6 +126,38 @@
 	-m ${.CURDIR}/share/mk
 _MAKE=	PATH=${PATH} ${BINMAKE} -f Makefile.inc1
 
+# Guess machine architecture from machine type, and vice versa.
+.if !defined(TARGET_ARCH) && defined(TARGET)
+_TARGET_ARCH=	${TARGET:S/pc98/i386/:S/sun4v/sparc64/:S/mips/mipsel/}
+.elif !defined(TARGET) && defined(TARGET_ARCH) && \
+    ${TARGET_ARCH} != ${MACHINE_ARCH}
+_TARGET=		${TARGET_ARCH:C/mips.*e[lb]/mips/:C/armeb/arm/}
+.endif
+# Legacy names, for a transition period mips:mips -> mipsel:mips
+.if defined(TARGET) && defined(TARGET_ARCH) && \
+    ${TARGET_ARCH} == "mips" && ${TARGET} == "mips"
+.warning "TARGET_ARCH of mips is deprecated in favor of mipsel or mipseb"
+.if defined(TARGET_BIG_ENDIAN)
+_TARGET_ARCH=mipseb
+.else
+_TARGET_ARCH=mipsel
+.endif
+.endif
+# arm with TARGET_BIG_ENDIAN -> armeb
+.if defined(TARGET_ARCH) && ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
+.warning "TARGET_ARCH of arm with TARGET_BIG_ENDIAN is deprecated.  use armeb"
+_TARGET_ARCH=armeb
+.endif
+.if defined(TARGET) && !defined(_TARGET)
+_TARGET=${TARGET}
+.endif
+.if defined(TARGET_ARCH) && !defined(_TARGET_ARCH)
+_TARGET_ARCH=${TARGET_ARCH}
+.endif
+# Otherwise, default to current machine type and architecture.
+_TARGET?=	${MACHINE}
+_TARGET_ARCH?=	${MACHINE_ARCH}
+
 #
 # Make sure we have an up-to-date make(1). Only world and buildworld
 # should do this as those are the initial targets used for upgrades.
@@ -173,8 +205,7 @@
 #
 
 ${TGTS}:
-	${_+_}@cd ${.CURDIR}; \
-		${_MAKE} ${.TARGET}
+	${_+_}cd ${.CURDIR}; ${_MAKE} TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} ${.TARGET}
 
 # Set a reasonable default
 .MAIN:	all

==== //depot/projects/soc2009/trasz_limits/Makefile.inc1#19 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.676 2011/01/07 20:26:33 imp Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.677 2011/01/31 15:17:47 imp Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -116,32 +116,6 @@
 VERSION+=	${OSRELDATE}
 .endif
 
-# Guess machine architecture from machine type, and vice versa.
-.if !defined(TARGET_ARCH) && defined(TARGET)
-TARGET_ARCH=	${TARGET:S/pc98/i386/:S/sun4v/sparc64/:S/mips/mipsel/}
-.elif !defined(TARGET) && defined(TARGET_ARCH) && \
-    ${TARGET_ARCH} != ${MACHINE_ARCH}
-TARGET=		${TARGET_ARCH:C/mips.*e[lb]/mips/:C/armeb/arm/}
-.endif
-# Legacy names, for a transition period mips:mips -> mipsel:mips
-.if defined(TARGET) && defined(TARGET_ARCH) && \
-    ${TARGET_ARCH} == "mips" && ${TARGET} == "mips"
-.warning "TARGET_ARCH of mips is deprecated in favor of mipsel or mipseb"
-.if defined(TARGET_BIG_ENDIAN)
-TARGET_ARCH=mipseb
-.else
-TARGET_ARCH=mipsel
-.endif
-.endif
-# arm with TARGET_BIG_ENDIAN -> armeb
-.if defined(TARGET_ARCH) && ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
-.warning "TARGET_ARCH of arm with TARGET_BIG_ENDIAN is deprecated.  use armeb"
-TARGET_ARCH=armeb
-.endif
-# Otherwise, default to current machine type and architecture.
-TARGET?=	${MACHINE}
-TARGET_ARCH?=	${MACHINE_ARCH}
-
 KNOWN_ARCHES?=	amd64 arm armeb/arm i386 i386/pc98 ia64 mipsel/mips mipseb/mips mips64el/mips mips64eb/mips mipsn32el/mips mipsn32eb/mips powerpc powerpc64/powerpc sparc64 sparc64/sun4v
 .if ${TARGET} == ${TARGET_ARCH}
 _t=		${TARGET}

==== //depot/projects/soc2009/trasz_limits/bin/sh/jobs.c#11 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.90 2011/01/18 21:18:31 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.91 2011/01/30 22:57:52 jilles Exp $");
 
 #include 
 #include 
@@ -1056,13 +1056,13 @@
 			}
 		if (sig > 0 && sig != SIGINT && sig != SIGPIPE) {
 			if (sig < sys_nsig && sys_siglist[sig])
-				out1str(sys_siglist[sig]);
+				out2str(sys_siglist[sig]);
 			else
-				out1fmt("Signal %d", sig);
+				outfmt(out2, "Signal %d", sig);
 			if (coredump)
-				out1str(" (core dumped)");
-			out1c('\n');
-			flushout(out1);
+				out2str(" (core dumped)");
+			out2c('\n');
+			flushout(out2);
 		}
 	} else {
 		TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job));

==== //depot/projects/soc2009/trasz_limits/contrib/tzdata/australasia#5 (text+ko) ====

@@ -1,5 +1,5 @@
 # -# @(#)australasia	8.20
+# @(#)australasia	8.22
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -84,14 +84,13 @@
 Rule	AS	1987	2007	-	Oct	lastSun	2:00s	1:00	-
 Rule	AS	1972	only	-	Feb	27	2:00s	0	-
 Rule	AS	1973	1985	-	Mar	Sun>=1	2:00s	0	-
-Rule	AS	1986	1989	-	Mar	Sun>=15	2:00s	0	-
-Rule	AS	1990	only	-	Mar	Sun>=18	2:00s	0	-
-Rule	AS	1991	only	-	Mar	Sun>=1	2:00s	0	-
-Rule	AS	1992	only	-	Mar	Sun>=18	2:00s	0	-
-Rule	AS	1993	only	-	Mar	Sun>=1	2:00s	0	-
-Rule	AS	1994	only	-	Mar	Sun>=18	2:00s	0	-
+Rule	AS	1986	1990	-	Mar	Sun>=15	2:00s	0	-
+Rule	AS	1991	only	-	Mar	3	2:00s	0	-
+Rule	AS	1992	only	-	Mar	22	2:00s	0	-
+Rule	AS	1993	only	-	Mar	7	2:00s	0	-
+Rule	AS	1994	only	-	Mar	20	2:00s	0	-
 Rule	AS	1995	2005	-	Mar	lastSun	2:00s	0	-
-Rule	AS	2006	only	-	Apr	Sun>=1	2:00s	0	-
+Rule	AS	2006	only	-	Apr	2	2:00s	0	-
 Rule	AS	2007	only	-	Mar	lastSun	2:00s	0	-
 Rule	AS	2008	max	-	Apr	Sun>=1	2:00s	0	-
 Rule	AS	2008	max	-	Oct	Sun>=1	2:00s	1:00	-

==== //depot/projects/soc2009/trasz_limits/contrib/tzdata/northamerica#4 (text+ko) ====

@@ -1,5 +1,5 @@
 # -# @(#)northamerica	8.34
+# %W%
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -471,20 +471,50 @@
 #  three votes for and one against."
 
 # Hawaii
+
+# From Arthur David Olson (2010-12-09):
+# "Hawaiian Time" by Robert C. Schmitt and Doak C. Cox appears on pages 207-225
+# of volume 26 of The Hawaiian Journal of History (1992). As of 2010-12-09,
+# the article is available at
+# 
+# http://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf
+# 
+# and indicates that standard time was adopted effective noon, January
+# 13, 1896 (page 218), that in "1933, the Legislature decreed daylight
+# saving for the period between the last Sunday of each April and the
+# last Sunday of each September, but less than a month later repealed the
+# act," (page 220), that year-round daylight saving time was in effect
+# from 1942-02-09 to 1945-09-30 (page 221, with no time of day given for
+# when clocks changed) and that clocks were changed by 30 minutes
+# effective the second Sunday of June, 1947 (page 219, with no time of
+# day given for when clocks changed). A footnote for the 1933 changes
+# cites Session Laws of Hawaii 1933, "Act. 90 (approved 26 Apr. 1933)
+# and Act 163 (approved 21 May 1933)."
+
+# From Arthur David Olson (2011-01-19):
+# The following is from "Laws of the Territory of Hawaii Passed by the
+# Seventeenth Legislature: Regular Session 1933," available (as of
+# 2011-01-19) at American University's Pence Law Library. Page 85: "Act
+# 90...At 2 o'clock ante meridian of the last Sunday in April of each
+# year, the standard time of this Territory shall be advanced one
+# hour...This Act shall take effect upon its approval. Approved this 26th
+# day of April, A. D. 1933. LAWRENCE M JUDD, Governor of the Territory of
+# Hawaii." Page 172:  "Act 163...Act 90 of the Session Laws of 1933 is
+# hereby repealed...This Act shall take effect upon its approval, upon
+# which date the standard time of this Territory shall be restored to
+# that existing immediately prior to the taking effect of said Act 90.
+# Approved this 21st day of May, A. D. 1933. LAWRENCE M. JUDD, Governor
+# of the Territory of Hawaii."
 #
-# From Arthur David Olson:
-# And then there's Hawaii.
-# DST was observed for one day in 1933;
-# standard time was changed by half an hour in 1947;
-# it's always standard as of 1986.
-#
-# From Paul Eggert:
-# Shanks says the 1933 experiment lasted for three weeks.  Go with Shanks.
-#
-Zone Pacific/Honolulu	-10:31:26 -	LMT	1900 Jan  1 12:00
-			-10:30	-	HST	1933 Apr 30 2:00
-			-10:30	1:00	HDT	1933 May 21 2:00
-			-10:30	US	H%sT	1947 Jun  8 2:00
+# Note that 1933-05-21 was a Sunday.
+# We're left to guess the time of day when Act 163 was approved; guess noon.
+
+Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00 #Schmitt&Cox
+			-10:30	-	HST	1933 Apr 30 2:00 #Laws 1933
+			-10:30	1:00	HDT	1933 May 21 12:00 #Laws 1933+12
+			-10:30	-	HST	1942 Feb 09 2:00 #Schmitt&Cox+2
+			-10:30	1:00	HDT	1945 Sep 30 2:00 #Schmitt&Fox+2
+			-10:30	US	H%sT	1947 Jun  8 2:00 #Schmitt&Fox+2
 			-10:00	-	HST
 
 # Now we turn to US areas that have diverged from the consensus since 1970.

==== //depot/projects/soc2009/trasz_limits/etc/ftpusers#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/ftpusers,v 1.14 2005/06/07 03:41:19 maxim Exp $
+# $FreeBSD: src/etc/ftpusers,v 1.15 2011/01/31 07:47:28 maxim Exp $
 #
 # list of users disallowed any ftp access.
 # read by ftpd(8).
@@ -20,6 +20,7 @@
 uucp
 pop
 www
+hast
 nobody
 mailnull
 smmsp

==== //depot/projects/soc2009/trasz_limits/etc/group#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/group,v 1.35 2007/06/11 18:36:39 ceri Exp $
+# $FreeBSD: src/etc/group,v 1.36 2011/01/28 22:28:12 pjd Exp $
 #
 wheel:*:0:root
 daemon:*:1:
@@ -27,5 +27,6 @@
 network:*:69:
 audit:*:77:
 www:*:80:
+hast:*:845:
 nogroup:*:65533:
 nobody:*:65534:

==== //depot/projects/soc2009/trasz_limits/etc/mail/aliases#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mail/aliases,v 1.22 2009/03/23 00:40:07 gshapiro Exp $
+# $FreeBSD: src/etc/mail/aliases,v 1.23 2011/01/31 07:47:28 maxim Exp $
 #	@(#)aliases	5.3 (Berkeley) 5/24/90
 #
 #  Aliases in this file will NOT be expanded in the header from
@@ -30,6 +30,7 @@
 bind:	root
 daemon:	root
 games:	root
+hast:	root
 kmem:	root
 mailnull: postmaster
 man:	root

==== //depot/projects/soc2009/trasz_limits/etc/master.passwd#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/master.passwd,v 1.40 2005/06/06 20:19:56 brooks Exp $
+# $FreeBSD: src/etc/master.passwd,v 1.42 2011/01/28 22:29:38 pjd Exp $
 #
 root::0:0::0:0:Charlie &:/root:/bin/csh
 toor:*:0:0::0:0:Bourne-again Superuser:/root:
@@ -20,4 +20,5 @@
 uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico
 pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin
 www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
+hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin
 nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin

==== //depot/projects/soc2009/trasz_limits/gnu/lib/libgcc/Makefile#13 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.79 2011/01/27 14:16:12 jchandra Exp $
+# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.80 2011/01/29 10:32:00 jchandra Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
@@ -122,7 +122,8 @@
 .if ${TARGET_CPUARCH} == mips
 LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c
 # ABIs other than o32 need this
-.if ${TARGET_ARCH:Mmipse[lb]} == ""
+.if ${TARGET_ARCH:Mmips64*} != "" || \
+    ${TARGET_ARCH:Mmipsn32*} != ""
 LIB2FUNCS_EXTRA+= floatdidf.c fixunsdfsi.c
 LIB2FUNCS_EXTRA+= floatdisf.c floatundidf.c
 LIB2FUNCS_EXTRA+= fixsfdi.c floatundisf.c

==== //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/rtld.c#19 (text+ko) ====

@@ -24,7 +24,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.
  *
- * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.169 2011/01/28 17:30:24 pluknet Exp $
+ * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.172 2011/01/30 16:21:25 kib Exp $
  */
 
 /*
@@ -93,7 +93,6 @@
 static char *find_library(const char *, const Obj_Entry *);
 static const char *gethints(void);
 static void init_dag(Obj_Entry *);
-static void init_dag1(Obj_Entry *, Obj_Entry *, DoneList *);
 static void init_rtld(caddr_t, Elf_Auxinfo **);
 static void initlist_add_neededs(Needed_Entry *, Objlist *);
 static void initlist_add_objects(Obj_Entry *, Obj_Entry **, Objlist *);
@@ -1331,28 +1330,33 @@
 static void
 init_dag(Obj_Entry *root)
 {
+    const Needed_Entry *needed;
+    const Objlist_Entry *elm;
     DoneList donelist;
 
     if (root->dag_inited)
 	return;
     donelist_init(&donelist);
-    init_dag1(root, root, &donelist);
-    root->dag_inited = true;
-}
 
-static void
-init_dag1(Obj_Entry *root, Obj_Entry *obj, DoneList *dlp)
-{
-    const Needed_Entry *needed;
+    /* Root object belongs to own DAG. */
+    objlist_push_tail(&root->dldags, root);
+    objlist_push_tail(&root->dagmembers, root);
+    donelist_check(&donelist, root);
 
-    if (donelist_check(dlp, obj))
-	return;
-
-    objlist_push_tail(&obj->dldags, root);
-    objlist_push_tail(&root->dagmembers, obj);
-    for (needed = obj->needed;  needed != NULL;  needed = needed->next)
-	if (needed->obj != NULL)
-	    init_dag1(root, needed->obj, dlp);
+    /*
+     * Add dependencies of root object to DAG in breadth order
+     * by exploiting the fact that each new object get added
+     * to the tail of the dagmembers list.
+     */
+    STAILQ_FOREACH(elm, &root->dagmembers, link) {
+	for (needed = elm->obj->needed; needed != NULL; needed = needed->next) {
+	    if (needed->obj == NULL || donelist_check(&donelist, needed->obj))
+		continue;
+	    objlist_push_tail(&needed->obj->dldags, root);
+	    objlist_push_tail(&root->dagmembers, needed->obj);
+	}
+    }
+    root->dag_inited = true;
 }
 
 /*
@@ -2320,32 +2324,28 @@
 
 	donelist_init(&donelist);
 	if (obj->mainprog) {
-	    /* Search main program and all libraries loaded by it. */
-	    res = symlook_list(&req, &list_main, &donelist);
+            /* Handle obtained by dlopen(NULL, ...) implies global scope. */
+	    res = symlook_global(&req, &donelist);
 	    if (res == 0) {
 		def = req.sym_out;
 		defobj = req.defobj_out;
-	    } else {
-		/*
-		 * We do not distinguish between 'main' object and
-		 * global scope.  If symbol is not defined by objects
-		 * loaded at startup, continue search among
-		 * dynamically loaded objects with RTLD_GLOBAL scope.
-		 */
-		res = symlook_list(&req, &list_global, &donelist);
+	    }
+	    /*
+	     * Search the dynamic linker itself, and possibly resolve the
+	     * symbol from there.  This is how the application links to
+	     * dynamic linker services such as dlopen.
+	     */
+	    if (def == NULL || ELF_ST_BIND(def->st_info) == STB_WEAK) {
+		res = symlook_obj(&req, &obj_rtld);
 		if (res == 0) {
 		    def = req.sym_out;
 		    defobj = req.defobj_out;
 		}
 	    }
-	} else {
-	    Needed_Entry fake;
-
+	}
+	else {
 	    /* Search the whole DAG rooted at the given object. */
-	    fake.next = NULL;
-	    fake.obj = (Obj_Entry *)obj;
-	    fake.name = 0;
-	    res = symlook_needed(&req, &fake, &donelist);
+	    res = symlook_list(&req, &obj->dagmembers, &donelist);
 	    if (res == 0) {
 		def = req.sym_out;
 		defobj = req.defobj_out;
@@ -2960,53 +2960,33 @@
 }
 
 /*
- * Search the symbol table of a shared object and all objects needed
- * by it for a symbol of the given name.  Search order is
- * breadth-first.  Returns a pointer to the symbol, or NULL if no
- * definition was found.
+ * Search the chain of DAGS cointed to by the given Needed_Entry
+ * for a symbol of the given name.  Each DAG is scanned completely
+ * before advancing to the next one.  Returns a pointer to the symbol,
+ * or NULL if no definition was found.
  */
 static int
 symlook_needed(SymLook *req, const Needed_Entry *needed, DoneList *dlp)
 {
-    const Elf_Sym *def, *def_w;
+    const Elf_Sym *def;
     const Needed_Entry *n;
-    const Obj_Entry *defobj, *defobj1;
+    const Obj_Entry *defobj;
     SymLook req1;
     int res;
 
-    def = def_w = NULL;
+    def = NULL;
     defobj = NULL;
     symlook_init_from_req(&req1, req);
     for (n = needed; n != NULL; n = n->next) {
-	if (n->obj == NULL || donelist_check(dlp, n->obj) ||
-	    (res = symlook_obj(&req1, n->obj)) != 0)
+	if (n->obj == NULL ||
+	    (res = symlook_list(&req1, &n->obj->dagmembers, dlp)) != 0)
 	    continue;
-	def = req1.sym_out;
-	defobj = req1.defobj_out;
-	if (ELF_ST_BIND(def->st_info) != STB_WEAK) {
-	    req->defobj_out = defobj;
-	    req->sym_out = def;
-	    return (0);
-	}
-    }
-    /*
-     * There we come when either symbol definition is not found in
-     * directly needed objects, or found symbol is weak.
-     */
-    for (n = needed; n != NULL; n = n->next) {
-	if (n->obj == NULL)
-	    continue;
-	res = symlook_needed(&req1, n->obj->needed, dlp);
-	if (res != 0)
-	    continue;
-	def_w = req1.sym_out;
-	defobj1 = req1.defobj_out;
-	if (def == NULL || ELF_ST_BIND(def_w->st_info) != STB_WEAK) {
-	    def = def_w;
-	    defobj = defobj1;
+	if (def == NULL || ELF_ST_BIND(req1.sym_out->st_info) != STB_WEAK) {
+	    def = req1.sym_out;
+	    defobj = req1.defobj_out;
+	    if (ELF_ST_BIND(def->st_info) != STB_WEAK)
+		break;
 	}
-	if (ELF_ST_BIND(def_w->st_info) != STB_WEAK)
-	    break;
     }
     if (def != NULL) {
 	req->sym_out = def;
@@ -3724,10 +3704,17 @@
     }
 
     for (needed = obj->needed;  needed != NULL;  needed = needed->next) {
-	if (needed->obj == NULL)
-	    continue;
-	if (object_match_name(needed->obj, name))
-	    return needed->obj;
+	if (strcmp(obj->strtab + needed->name, name) == 0 ||
+	  (needed->obj != NULL && object_match_name(needed->obj, name))) {
+	    /*
+	     * If there is DT_NEEDED for the name we are looking for,
+	     * we are all set.  Note that object might not be found if
+	     * dependency was not loaded yet, so the function can
+	     * return NULL here.  This is expected and handled
+	     * properly by the caller.
+	     */
+	    return (needed->obj);
+	}
     }
     _rtld_error("%s: Unexpected inconsistency: dependency %s not found",
 	obj->path, name);
@@ -3853,6 +3840,8 @@
     vn = obj->verneed;
     while (vn != NULL) {
 	depobj = locate_dependency(obj, obj->strtab + vn->vn_file);
+	if (depobj == NULL)
+	    return (-1);
 	vna = (const Elf_Vernaux *) ((char *)vn + vn->vn_aux);
 	for (;;) {
 	    if (check_object_provided_version(obj, depobj, vna))

==== //depot/projects/soc2009/trasz_limits/sbin/hastd/hast.h#7 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sbin/hastd/hast.h,v 1.7 2011/01/27 19:33:57 pjd Exp $
+ * $FreeBSD: src/sbin/hastd/hast.h,v 1.8 2011/01/28 22:33:47 pjd Exp $
  */
 
 #ifndef	_HAST_H_
@@ -81,6 +81,7 @@
 #define	HIO_FLUSH		4
 #define	HIO_KEEPALIVE		5
 
+#define	HAST_USER	"hast"
 #define	HAST_TIMEOUT	5
 #define	HAST_CONFIG	"/etc/hast.conf"
 #define	HAST_CONTROL	"/var/run/hastctl"

==== //depot/projects/soc2009/trasz_limits/sbin/hastd/hastd.c#13 (text+ko) ====

@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2009-2010 The FreeBSD Foundation
- * Copyright (c) 2010 Pawel Jakub Dawidek 
+ * Copyright (c) 2010-2011 Pawel Jakub Dawidek 
  * All rights reserved.
  *
  * This software was developed by Pawel Jakub Dawidek under sponsorship from
@@ -29,14 +29,14 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sbin/hastd/hastd.c,v 1.30 2011/01/27 19:31:35 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/hastd/hastd.c,v 1.33 2011/01/31 18:32:17 pjd Exp $");
 
 #include 
 #include 
 #include 
+#include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
@@ -93,6 +93,172 @@
 	}
 }
 
+void
+descriptors_cleanup(struct hast_resource *res)
+{
+	struct hast_resource *tres;
+
+	TAILQ_FOREACH(tres, &cfg->hc_resources, hr_next) {
+		if (tres == res) {
+			PJDLOG_VERIFY(res->hr_role == HAST_ROLE_SECONDARY ||
+			    (res->hr_remotein == NULL &&
+			     res->hr_remoteout == NULL));
+			continue;
+		}
+		if (tres->hr_remotein != NULL)
+			proto_close(tres->hr_remotein);
+		if (tres->hr_remoteout != NULL)
+			proto_close(tres->hr_remoteout);
+	}
+	if (cfg->hc_controlin != NULL)
+		proto_close(cfg->hc_controlin);
+	proto_close(cfg->hc_controlconn);
+	proto_close(cfg->hc_listenconn);
+	(void)pidfile_close(pfh);
+	hook_fini();
+	pjdlog_fini();
+}
+
+static const char *
+dtype2str(mode_t mode)
+{
+
+	if (S_ISBLK(mode))
+		return ("block device");
+	else if (S_ISCHR(mode)) 
+		return ("character device");
+	else if (S_ISDIR(mode)) 
+		return ("directory");
+	else if (S_ISFIFO(mode))
+		return ("pipe or FIFO");
+	else if (S_ISLNK(mode)) 
+		return ("symbolic link");
+	else if (S_ISREG(mode)) 
+		return ("regular file");
+	else if (S_ISSOCK(mode))
+		return ("socket");
+	else if (S_ISWHT(mode)) 
+		return ("whiteout");
+	else
+		return ("unknown");
+}
+
+void
+descriptors_assert(const struct hast_resource *res, int pjdlogmode)
+{
+	char msg[256];
+	struct stat sb;
+	long maxfd;
+	bool isopen;
+	mode_t mode;
+	int fd;
+
+	/*
+	 * At this point descriptor to syslog socket is closed, so if we want
+	 * to log assertion message, we have to first store it in 'msg' local
+	 * buffer and then open syslog socket and log it.
+	 */
+	msg[0] = '\0';
+
+	maxfd = sysconf(_SC_OPEN_MAX);
+	if (maxfd < 0) {
+		pjdlog_errno(LOG_WARNING, "sysconf(_SC_OPEN_MAX) failed");
+		maxfd = 16384;
+	}
+	for (fd = 0; fd <= maxfd; fd++) {
+		if (fstat(fd, &sb) == 0) {
+			isopen = true;
+			mode = sb.st_mode;
+		} else if (errno == EBADF) {
+			isopen = false;
+			mode = 0;
+		} else {
+			isopen = true;	/* silence gcc */
+			mode = 0;	/* silence gcc */
+			snprintf(msg, sizeof(msg),
+			    "Unable to fstat descriptor %d: %s", fd,
+			    strerror(errno));
+		}
+		if (fd == STDIN_FILENO || fd == STDOUT_FILENO ||
+		    fd == STDERR_FILENO) {
+			if (!isopen) {
+				snprintf(msg, sizeof(msg),
+				    "Descriptor %d (%s) is closed, but should be open.",
+				    fd, (fd == STDIN_FILENO ? "stdin" :
+				    (fd == STDOUT_FILENO ? "stdout" : "stderr")));
+				break;
+			}
+		} else if (fd == proto_descriptor(res->hr_event)) {
+			if (!isopen) {
+				snprintf(msg, sizeof(msg),
+				    "Descriptor %d (event) is closed, but should be open.",
+				    fd);
+				break;
+			}
+			if (!S_ISSOCK(mode)) {
+				snprintf(msg, sizeof(msg),
+				    "Descriptor %d (event) is %s, but should be %s.",
+				    fd, dtype2str(mode), dtype2str(S_IFSOCK));
+				break;
+			}
+		} else if (fd == proto_descriptor(res->hr_ctrl)) {
+			if (!isopen) {
+				snprintf(msg, sizeof(msg),
+				    "Descriptor %d (ctrl) is closed, but should be open.",
+				    fd);
+				break;
+			}
+			if (!S_ISSOCK(mode)) {
+				snprintf(msg, sizeof(msg),
+				    "Descriptor %d (ctrl) is %s, but should be %s.",
+				    fd, dtype2str(mode), dtype2str(S_IFSOCK));
+				break;
+			}
+		} else if (res->hr_role == HAST_ROLE_SECONDARY &&
+		    fd == proto_descriptor(res->hr_remotein)) {
+			if (!isopen) {
+				snprintf(msg, sizeof(msg),
+				    "Descriptor %d (remote in) is closed, but should be open.",
+				    fd);
+				break;
+			}
+			if (!S_ISSOCK(mode)) {
+				snprintf(msg, sizeof(msg),
+				    "Descriptor %d (remote in) is %s, but should be %s.",
+				    fd, dtype2str(mode), dtype2str(S_IFSOCK));
+				break;
+			}
+		} else if (res->hr_role == HAST_ROLE_SECONDARY &&
+		    fd == proto_descriptor(res->hr_remoteout)) {
+			if (!isopen) {
+				snprintf(msg, sizeof(msg),
+				    "Descriptor %d (remote out) is closed, but should be open.",
+				    fd);
+				break;
+			}
+			if (!S_ISSOCK(mode)) {
+				snprintf(msg, sizeof(msg),
+				    "Descriptor %d (remote out) is %s, but should be %s.",
+				    fd, dtype2str(mode), dtype2str(S_IFSOCK));
+				break;
+			}
+		} else {
+			if (isopen) {
+				snprintf(msg, sizeof(msg),
+				    "Descriptor %d is open (%s), but should be closed.",
+				    fd, dtype2str(mode));
+				break;
+			}
+		}
+	}
+	if (msg[0] != '\0') {
+		pjdlog_init(pjdlogmode);
+		pjdlog_prefix_set("[%s] (%s) ", res->hr_name,
+		    role2str(res->hr_role));
+		PJDLOG_ABORT("%s", msg);
+	}
+}
+
 static void
 child_exit_log(unsigned int pid, int status)
 {
@@ -161,7 +327,7 @@
     const struct hast_resource *res1)
 {
 
-	assert(strcmp(res0->hr_name, res1->hr_name) == 0);
+	PJDLOG_ASSERT(strcmp(res0->hr_name, res1->hr_name) == 0);
 
 	if (strcmp(res0->hr_provname, res1->hr_provname) != 0)
 		return (true);
@@ -186,9 +352,9 @@
     const struct hast_resource *res1)
 {
 
-	assert(strcmp(res0->hr_name, res1->hr_name) == 0);
-	assert(strcmp(res0->hr_provname, res1->hr_provname) == 0);
-	assert(strcmp(res0->hr_localpath, res1->hr_localpath) == 0);
+	PJDLOG_ASSERT(strcmp(res0->hr_name, res1->hr_name) == 0);
+	PJDLOG_ASSERT(strcmp(res0->hr_provname, res1->hr_provname) == 0);
+	PJDLOG_ASSERT(strcmp(res0->hr_localpath, res1->hr_localpath) == 0);
 
 	if (res0->hr_role != HAST_ROLE_PRIMARY)
 		return (false);
@@ -210,7 +376,7 @@
 	struct nv *nvin, *nvout;
 	int error;
 
-	assert(res->hr_role == HAST_ROLE_PRIMARY);
+	PJDLOG_ASSERT(res->hr_role == HAST_ROLE_PRIMARY);
 
 	nvout = nv_alloc();
 	nv_add_uint8(nvout, HASTCTL_RELOAD, "cmd");
@@ -357,7 +523,7 @@
 			if (strcmp(cres->hr_name, nres->hr_name) == 0)
 				break;
 		}
-		assert(cres != NULL);
+		PJDLOG_ASSERT(cres != NULL);
 		if (resource_needs_restart(cres, nres)) {
 			pjdlog_info("Resource %s configuration was modified, restarting it.",
 			    cres->hr_name);
@@ -533,10 +699,10 @@
 	 * we have to cancel those and accept the new connection.
 	 */
 	if (token == NULL) {
-		assert(res->hr_remoteout == NULL);
+		PJDLOG_ASSERT(res->hr_remoteout == NULL);
 		pjdlog_debug(1, "Initial connection from %s.", raddr);
 		if (res->hr_workerpid != 0) {
-			assert(res->hr_remotein == NULL);
+			PJDLOG_ASSERT(res->hr_remotein == NULL);
 			pjdlog_debug(1,
 			    "Worker process exists (pid=%u), stopping it.",
 			    (unsigned int)res->hr_workerpid);
@@ -676,29 +842,29 @@
 				hastd_reload();
 				break;
 			default:
-				assert(!"invalid condition");
+				PJDLOG_ABORT("Unexpected signal (%d).", signo);
 			}
 		}
 
 		/* Setup descriptors for select(2). */
 		FD_ZERO(&rfds);
 		maxfd = fd = proto_descriptor(cfg->hc_controlconn);
-		assert(fd >= 0);
+		PJDLOG_ASSERT(fd >= 0);
 		FD_SET(fd, &rfds);
 		fd = proto_descriptor(cfg->hc_listenconn);
-		assert(fd >= 0);
+		PJDLOG_ASSERT(fd >= 0);
 		FD_SET(fd, &rfds);
 		maxfd = fd > maxfd ? fd : maxfd;
 		TAILQ_FOREACH(res, &cfg->hc_resources, hr_next) {
 			if (res->hr_event == NULL)
 				continue;
 			fd = proto_descriptor(res->hr_event);
-			assert(fd >= 0);
+			PJDLOG_ASSERT(fd >= 0);
 			FD_SET(fd, &rfds);
 			maxfd = fd > maxfd ? fd : maxfd;
 		}
 
-		assert(maxfd + 1 <= (int)FD_SETSIZE);
+		PJDLOG_ASSERT(maxfd + 1 <= (int)FD_SETSIZE);
 		ret = select(maxfd + 1, &rfds, NULL, NULL, &seltimeout);
 		if (ret == 0)
 			hook_check();
@@ -790,7 +956,7 @@
 	}
 
 	cfg = yy_config_parse(cfgpath, true);
-	assert(cfg != NULL);
+	PJDLOG_ASSERT(cfg != NULL);
 
 	/*
 	 * Restore default actions for interesting signals in case parent

==== //depot/projects/soc2009/trasz_limits/sbin/hastd/hastd.h#6 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sbin/hastd/hastd.h,v 1.5 2011/01/24 15:04:15 pjd Exp $
+ * $FreeBSD: src/sbin/hastd/hastd.h,v 1.7 2011/01/28 21:56:47 pjd Exp $
  */
 
 #ifndef	_HASTD_H_
@@ -43,6 +43,9 @@
 extern bool sigexit_received;
 extern struct pidfh *pfh;

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From trasz at FreeBSD.org  Mon Jan 31 22:18:03 2011
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Mon Jan 31 22:18:05 2011
Subject: PERFORCE change 188395 for review
Message-ID: <201101312218.p0VMI2Z8044553@skunkworks.freebsd.org>

http://p4web.freebsd.org/@@188395?ac=10

Change 188395 by trasz@trasz_victim on 2011/01/31 22:17:31

	Improve the message logged by the "log" action.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#26 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#26 (text+ko) ====

@@ -325,9 +325,10 @@
 			sbuf_new(&sb, buf, RCTL_LOG_BUFSIZE, SBUF_FIXEDLEN);
 			rctl_rule_to_sbuf(&sb, rule);
 			sbuf_finish(&sb);
-			printf("resource limit \"%s\" exceeded by process %d "
-			    "(%s), uid %d\n", sbuf_data(&sb), p->p_pid,
-			    p->p_comm, p->p_ucred->cr_uid);
+			printf("rctl: rule \"%s\" matched by process %d "
+			    "(%s), uid %d, jid %d\n", sbuf_data(&sb), p->p_pid,
+			    p->p_comm, p->p_ucred->cr_uid,
+			    p->p_ucred->cr_prison->pr_id);
 			sbuf_delete(&sb);
 			free(buf, M_RCTL);
 			continue;
Date Advisory name
Date  name
         
 	     Chromium FreeBSD-specific Chromium issues
 Bugbusters
 	    Coordination of the Problem Report handling effort
 	  

 
 
 
 
 
     
     
   
 
   
7.1-RELEASE
       Extended
       January 4, 2009 January 31, 2011 February 28, 2011
     
     
       RELENG_7_3

Branch	Release	Type	Release Date	EoL
RELENG_4	n/a	n/a	n/a	January 31, 2007
RELENG_4_11	4.11-RELEASE	Extended	January 25, 2005	January 31, 2007
RELENG_5	n/a	n/a	n/a	May 31, 2008
RELENG_5_3	5.3-RELEASE	Extended	November 6, 2004	October 31, 2006
RELENG_5_4	5.4-RELEASE	Normal	May 9, 2005	October 31, 2006
RELENG_5_5	5.5-RELEASE	Extended	May 25, 2006	May 31, 2008
RELENG_6	n/a	n/a	n/a	November 30, 2010
RELENG_6_0	6.0-RELEASE	Normal	November 4, 2005	January 31, 2007
RELENG_6_1	6.1-RELEASE	Extended	May 9, 2006	May 31, 2008
RELENG_6_2	6.2-RELEASE	Normal	January 15, 2007	May 31, 2008
RELENG_6_3	6.3-RELEASE	Extended	January 18, 2008	January 31, 2010
RELENG_6_4	6.4-RELEASE	Extended	November 28, 2008	November 30, 2010
RELENG_7_0	7.0-RELEASE	Normal	February 27, 2008	April 30, 2009
RELENG_7_2	7.2-RELEASE	Normal	May 4, 2009	June 30, 2010
RELENG_8_0	8.0-RELEASE	Normal	November 25, 2009	November 30, 2010

Date	Advisory name
Date	name
Chromium	FreeBSD-specific Chromium issues
Bugbusters	Coordination of the Problem Report handling effort
7.1-RELEASE	Extended	January 4, 2009	January 31, 2011	February 28, 2011
RELENG_7_3

Webmaster Team <webmaster@FreeBSD.org>

Unsupported FreeBSD Releases

Other Security Links

Next submissions due: January 15th, 2011

Next submissions due: April 15th, 2011

2010