a public list of all ports that have at least one file
that fails to fetch from any non-FreeBSD mastersite. For the
complete list of results for all files versus all mastersites,
- see
- Bill Fenner's port survey.
private email to an affected port maintainer when a port
is about to be marked BROKEN, Cc:ed to the last committer to
==== //depot/projects/docproj_nl/www/en/security/security.sgml#15 (text+ko) ====
@@ -1,12 +1,12 @@
-
+
%developers;
]>
-
+
&header;
@@ -245,20 +245,6 @@
Estimated EoL
-
RELENG_6
-
n/a
-
n/a
-
n/a
-
November 30, 2010
-
-
-
RELENG_6_4
-
6.4-RELEASE
-
Extended
-
November 28, 2008
-
November 30, 2010
-
-
RELENG_7
n/a
n/a
@@ -280,6 +266,13 @@
March 31, 2012
+
RELENG_7_4
+
7.4-RELEASE
+
Extended
+
not yet
+
release + 2 years
+
+
RELENG_8
n/a
n/a
@@ -287,19 +280,19 @@
last release + 2 years
-
RELENG_8_0
-
8.0-RELEASE
-
Normal
-
November 25, 2009
-
November 30, 2010
-
-
RELENG_8_1
8.1-RELEASE
Extended
July 23, 2010
July 31, 2012
+
+
RELENG_8_2
+
8.2-RELEASE
+
Normal
+
not yet
+
release + 1 year
+
Older releases are not maintained and users are strongly
==== //depot/projects/docproj_nl/www/share/sgml/advisories.xml#20 (text+ko) ====
@@ -2,7 +2,7 @@
- $FreeBSD: www/share/sgml/advisories.xml,v 1.240 2010/11/10 23:43:47 cperciva Exp $
+ $FreeBSD: www/share/sgml/advisories.xml,v 1.241 2010/11/29 21:18:21 simon Exp $
@@ -13,6 +13,14 @@
11
+ 29
+
+
+ FreeBSD-SA-10:10.openssl
+
+
+
+ 10
==== //depot/projects/docproj_nl/www/share/sgml/events.xml#35 (text+ko) ====
@@ -10,7 +10,7 @@
- $FreeBSD: www/share/sgml/events.xml,v 1.91 2010/10/14 19:44:37 pgj Exp $
+ $FreeBSD: www/share/sgml/events.xml,v 1.92 2010/11/29 18:24:39 rene Exp $
From owner-p4-projects@FreeBSD.ORG Thu Dec 2 16:41:54 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id DD7351065673; Thu, 2 Dec 2010 16:41:53 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id A005D1065670
for ; Thu, 2 Dec 2010 16:41:53 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id 727108FC0C
for ; Thu, 2 Dec 2010 16:41:53 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id oB2Gfrg5069739
for ; Thu, 2 Dec 2010 16:41:53 GMT
(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oB2Gfrjd069736
for perforce@freebsd.org; Thu, 2 Dec 2010 16:41:53 GMT
(envelope-from rene@FreeBSD.org)
Date: Thu, 2 Dec 2010 16:41:53 GMT
Message-Id: <201012021641.oB2Gfrjd069736@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
rene@FreeBSD.org using -f
From: Rene Ladan
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 186565 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Thu, 02 Dec 2010 16:41:54 -0000
http://p4web.freebsd.org/@@186565?ac=10
Change 186565 by rene@rene_acer on 2010/12/02 16:40:49
Handbook fixups from 6.X removal:
- restore broken sentence in multimedia [1]
- GNU tar no longer in base [2]
Submitted by: ryusuke [1], pluknet [2]
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#15 edit
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#10 edit
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#15 (text+ko) ====
@@ -2513,22 +2513,11 @@
tar
- Both GNU tar
- and the default bsdtar are available. The
- GNU version can be invoked with gtar. It
- supports remote devices using the same syntax as
- rdump. To tar to an
+ To tar to an
Exabyte tape drive connected to a Sun called
komodo, use:
- &prompt.root; /usr/bin/gtar cf komodo:/dev/nsa8 . 2>&1
-
- The same could be accomplished with
- bsdtar by using a pipeline and
- rsh to send the data to a remote tape
- drive.
-
- &prompt.root; tar cf - . | rsh hostname dd of=tape-device obs=20b
+ &prompt.root; tar cf - . | rsh komodo dd of=tape-device obs=20bIf you are worried about the security of backing up over a
network you should use the ssh command
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#10 (text+ko) ====
@@ -400,7 +400,7 @@
- The above will
+ The correct pcm device will
automatically be allocated transparently to a program
that requests /dev/dsp0.
From owner-p4-projects@FreeBSD.ORG Thu Dec 2 22:07:52 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 026D4106567A; Thu, 2 Dec 2010 22:07:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B94491065679
for ; Thu, 2 Dec 2010 22:07:51 +0000 (UTC)
(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id A61468FC08
for ; Thu, 2 Dec 2010 22:07:51 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id oB2M7pek035438
for ; Thu, 2 Dec 2010 22:07:51 GMT
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oB2M7plN035435
for perforce@freebsd.org; Thu, 2 Dec 2010 22:07:51 GMT
(envelope-from jhb@freebsd.org)
Date: Thu, 2 Dec 2010 22:07:51 GMT
Message-Id: <201012022207.oB2M7plN035435@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 186576 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Thu, 02 Dec 2010 22:07:52 -0000
http://p4web.freebsd.org/@@186576?ac=10
Change 186576 by jhb@jhb_jhbbsd on 2010/12/02 22:06:51
Revert the process back to an exec'ing thread's credentials.
Affected files ...
.. //depot/projects/smpng/sys/kern/kern_exec.c#135 edit
Differences ...
==== //depot/projects/smpng/sys/kern/kern_exec.c#135 (text+ko) ====
@@ -582,12 +582,23 @@
VREF(binvp);
/*
+ * Force the process to use this thread's credentials to avoid
+ * a race where another thread changed this process' credentials
+ * while we were waiting for all other threads to stop.
+ */
+ PROC_LOCK(p);
+ if (td->td_ucred != p->p_ucred) {
+ oldcred = p->p_ucred;
+ p->p_ucred = crhold(td->td_ucred);
+ crfree(oldcred);
+ }
+
+ /*
* For security and other reasons, signal handlers cannot
* be shared after an exec. The new process gets a copy of the old
* handlers. In execsigs(), the new process will have its signals
* reset.
*/
- PROC_LOCK(p);
oldcred = crcopysafe(p, newcred);
if (sigacts_shared(p->p_sigacts)) {
oldsigacts = p->p_sigacts;
@@ -599,16 +610,6 @@
} else
oldsigacts = NULL;
- /*
- * Ensure that this thread's credentials match the proces
- * credentials.
- */
- if (td->td_ucred != p->p_ucred) {
- oldcred = td->td_ucred;
- td->td_ucred = crhold(p->p_ucred);
- crfree(oldcred);
- }
-
/* Stop profiling */
stopprofclock(p);
From owner-p4-projects@FreeBSD.ORG Sat Dec 4 15:10:31 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 28D71106566C; Sat, 4 Dec 2010 15:10:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id D82EB106564A
for ; Sat, 4 Dec 2010 15:10:30 +0000 (UTC)
(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id C26B78FC0A
for ; Sat, 4 Dec 2010 15:10:30 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id oB4FAUxJ092346
for ; Sat, 4 Dec 2010 15:10:30 GMT
(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oB4FATHS092310
for perforce@freebsd.org; Sat, 4 Dec 2010 15:10:29 GMT
(envelope-from trasz@freebsd.org)
Date: Sat, 4 Dec 2010 15:10:29 GMT
Message-Id: <201012041510.oB4FATHS092310@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
trasz@freebsd.org using -f
From: Edward Tomasz Napierala
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 186624 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sat, 04 Dec 2010 15:10:31 -0000
http://p4web.freebsd.org/@@186624?ac=10
Change 186624 by trasz@trasz_victim on 2010/12/04 15:09:27
IFC.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#30 integrate
.. //depot/projects/soc2009/trasz_limits/bin/csh/USD.doc/csh.1#2 delete
.. //depot/projects/soc2009/trasz_limits/bin/csh/USD.doc/csh.2#2 delete
.. //depot/projects/soc2009/trasz_limits/bin/csh/USD.doc/csh.3#2 delete
.. //depot/projects/soc2009/trasz_limits/bin/csh/USD.doc/csh.4#2 delete
.. //depot/projects/soc2009/trasz_limits/bin/csh/USD.doc/csh.a#2 delete
.. //depot/projects/soc2009/trasz_limits/bin/csh/USD.doc/csh.g#2 delete
.. //depot/projects/soc2009/trasz_limits/bin/csh/USD.doc/tabs#2 delete
.. //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#18 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/CHANGES#10 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.pdf#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/check-tool.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/check-tool.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkconf.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkzone.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/host.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/client.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/query.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/query.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/server.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/api#8 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/view.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/journal.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rbtdb.c#7 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/validator.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/view.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/api#5 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/print.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/release-notes.css#1 branch
.. //depot/projects/soc2009/trasz_limits/contrib/bind9/version#10 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/traceroute/as.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/traceroute/as.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/traceroute/ifaddrlist.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/contrib/traceroute/traceroute.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/ACKNOWLEDGMENTS#1 branch
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/CHANGES#6 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/FAQ#6 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/Makefile#6 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/NEWS#6 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/README#6 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/crypto/evp/p_sign.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/crypto/evp/p_verify.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/crypto/jpake/jpake.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/crypto/jpake/jpake.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/crypto/jpake/jpake_err.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/crypto/opensslv.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/crypto/stack/safestack.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#4 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/openssl.spec#6 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/ssl/s3_clnt.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/crypto/openssl/ssl/s3_srvr.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/cc/Makefile.fe#3 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libc/rpc/PSD.doc/nfs.rfc.ms#2 delete
.. //depot/projects/soc2009/trasz_limits/lib/libc/rpc/PSD.doc/rpc.prog.ms#2 delete
.. //depot/projects/soc2009/trasz_limits/lib/libc/rpc/PSD.doc/rpc.rfc.ms#2 delete
.. //depot/projects/soc2009/trasz_limits/lib/libc/rpc/PSD.doc/rpcgen.ms#2 delete
.. //depot/projects/soc2009/trasz_limits/lib/libc/rpc/PSD.doc/stubs#2 delete
.. //depot/projects/soc2009/trasz_limits/lib/libc/rpc/PSD.doc/xdr.nts.ms#2 delete
.. //depot/projects/soc2009/trasz_limits/lib/libc/rpc/PSD.doc/xdr.rfc.ms#2 delete
.. //depot/projects/soc2009/trasz_limits/lib/libc/stdio/printf-pos.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/lib/libgeom/libgeom.3#4 integrate
.. //depot/projects/soc2009/trasz_limits/lib/msun/Makefile#5 integrate
.. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/SMM.doc/0.t#2 delete
.. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/SMM.doc/1.t#2 delete
.. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/SMM.doc/2.t#2 delete
.. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/SMM.doc/3.t#2 delete
.. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/SMM.doc/4.t#2 delete
.. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/SMM.doc/Makefile#2 delete
.. //depot/projects/soc2009/trasz_limits/sbin/geom/class/eli/geli.8#3 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/Makefile.inc#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ASN1_STRING_length.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ASN1_STRING_new.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ASN1_generate_nconf.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_ctrl.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_f_base64.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_f_buffer.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_f_cipher.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_f_md.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_f_null.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_f_ssl.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_find_type.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_new.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_push.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_read.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_s_accept.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_s_bio.3#8 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_s_connect.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_s_fd.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_s_file.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_s_mem.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_s_null.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_s_socket.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_set_callback.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_should_retry.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_BLINDING_new.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_CTX_new.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_CTX_start.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_add.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_add_word.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_bn2bin.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_cmp.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_copy.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_generate_prime.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_mod_inverse.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_new.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_num_bytes.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_rand.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_set_bit.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_swap.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BN_zero.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/CONF_modules_free.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/CONF_modules_load_file.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DH_generate_key.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DH_generate_parameters.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DH_get_ex_new_index.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DH_new.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DH_set_method.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DH_size.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DSA_SIG_new.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DSA_do_sign.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DSA_dup_DH.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DSA_generate_key.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DSA_generate_parameters.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DSA_new.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DSA_set_method.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DSA_sign.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/DSA_size.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ERR_GET_LIB.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ERR_clear_error.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ERR_error_string.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ERR_get_error.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ERR_load_strings.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ERR_print_errors.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ERR_put_error.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ERR_remove_state.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ERR_set_mark.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/EVP_BytesToKey.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/EVP_DigestInit.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/EVP_EncryptInit.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/EVP_OpenInit.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/EVP_PKEY_new.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/EVP_SealInit.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/EVP_SignInit.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/EVP_VerifyInit.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/OBJ_nid2obj.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/OPENSSL_Applink.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/OPENSSL_config.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/OPENSSL_ia32cap.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/PKCS12_create.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/PKCS12_parse.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/PKCS7_decrypt.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/PKCS7_encrypt.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/PKCS7_sign.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/PKCS7_verify.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RAND_add.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RAND_bytes.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RAND_cleanup.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RAND_egd.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RAND_load_file.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RAND_set_rand_method.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RSA_blinding_on.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RSA_check_key.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RSA_generate_key.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RSA_new.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RSA_print.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RSA_private_encrypt.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RSA_public_encrypt.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RSA_set_method.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RSA_sign.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/RSA_size.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/X509_NAME_print_ex.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/X509_new.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/bio.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/blowfish.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/bn.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/bn_internal.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/buffer.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/crypto.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/d2i_DHparams.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/d2i_X509.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/d2i_X509_CRL.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/d2i_X509_NAME.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/d2i_X509_REQ.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/d2i_X509_SIG.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/des.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/dh.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/dsa.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ecdsa.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/engine.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/err.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/evp.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/hmac.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/lh_stats.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/lhash.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/md5.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/mdc2.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/pem.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/rand.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/rc4.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ripemd.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/rsa.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/sha.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/threads.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ui.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/ui_compat.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/x509.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CIPHER_get_name.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_COMP_add_compression_method.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_add_session.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_ctrl.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_flush_sessions.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_free.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_new.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_sess_number.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_sessions.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_cert_store.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_info_callback.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_mode.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_options.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_timeout.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_set_verify.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_CTX_use_certificate.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_SESSION_free.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_SESSION_get_time.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_accept.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_alert_type_string.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_clear.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_connect.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_do_handshake.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_free.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_SSL_CTX.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_ciphers.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_client_CA_list.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_current_cipher.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_default_timeout.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_error.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_ex_new_index.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_fd.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_peer_cert_chain.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_peer_certificate.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_rbio.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_session.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_verify_result.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_get_version.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_library_init.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_load_client_CA_file.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_new.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_pending.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_read.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_rstate_string.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_session_reused.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_set_bio.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_set_connect_state.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_set_fd.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_set_session.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_set_shutdown.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_set_verify_result.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_shutdown.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_state_string.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_want.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/SSL_write.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/d2i_SSL_SESSION.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/lib/libssl/man/ssl.3#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/CA.pl.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/asn1parse.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/ca.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/ciphers.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/crl.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/crl2pkcs7.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/dgst.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/dhparam.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/dsa.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/dsaparam.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/ec.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/ecparam.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/enc.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/errstr.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/gendsa.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/genrsa.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/nseq.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/ocsp.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/openssl.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/passwd.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/pkcs12.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/pkcs7.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/pkcs8.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/rand.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/req.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/rsa.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/rsautl.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/s_client.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/s_server.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/s_time.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/sess_id.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/smime.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/speed.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/spkac.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/verify.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/version.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/x509.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/secure/usr.bin/openssl/man/x509v3_config.1#6 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/12.make/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/12.make/stubs#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/12.make/tutorial.ms#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/18.gprof/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/18.gprof/abstract.me#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/18.gprof/gathering.me#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/18.gprof/header.me#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/18.gprof/intro.me#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/18.gprof/postp.me#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/18.gprof/postp1.pic#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/18.gprof/postp2.pic#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/18.gprof/postp3.pic#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/18.gprof/pres1.pic#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/18.gprof/pres2.pic#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/18.gprof/present.me#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/18.gprof/profiling.me#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/18.gprof/refs.me#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/22.rpcgen/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/22.rpcgen/rpcgen.ms#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/22.rpcgen/stubs#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/23.rpc/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/23.rpc/rpc.prog.ms#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/23.rpc/stubs#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/24.xdr/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/24.xdr/stubs#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/24.xdr/xdr.nts.ms#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/25.xdrrfc/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/25.xdrrfc/stubs#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/25.xdrrfc/xdr.rfc.ms#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/26.rpcrfc/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/26.rpcrfc/rpc.rfc.ms#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/26.rpcrfc/stubs#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/27.nfsrpc/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/27.nfsrpc/nfs.rfc.ms#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/psd/27.nfsrpc/stubs#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/02.config/0.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/02.config/1.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/02.config/2.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/02.config/3.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/02.config/4.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/02.config/5.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/02.config/6.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/02.config/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/02.config/a.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/02.config/b.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/02.config/c.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/02.config/d.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/02.config/e.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/02.config/spell.ok#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/03.fsck/0.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/03.fsck/1.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/03.fsck/2.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/03.fsck/3.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/03.fsck/4.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/03.fsck/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/0.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/1.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/2.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/3.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/4.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/5.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/6.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/7.t#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/Makefile#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/07.lpr/spell.ok#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/11.timedop/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/11.timedop/timed.ms#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/12.timed/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/12.timed/date#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/12.timed/loop#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/12.timed/spell.ok#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/12.timed/time#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/12.timed/timed.ms#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/smm/12.timed/unused#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/04.csh/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/04.csh/csh.1#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/04.csh/csh.2#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/04.csh/csh.3#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/04.csh/csh.4#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/04.csh/csh.a#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/04.csh/csh.g#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/04.csh/tabs#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/05.dc/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/05.dc/dc#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/06.bc/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/06.bc/bc#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/07.mail/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/07.mail/mail0.nr#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/07.mail/mail1.nr#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/07.mail/mail2.nr#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/07.mail/mail3.nr#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/07.mail/mail4.nr#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/07.mail/mail5.nr#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/07.mail/mail6.nr#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/07.mail/mail7.nr#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/07.mail/mail8.nr#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/07.mail/mail9.nr#1 branch
.. //depot/projects/soc2009/trasz_limits/share/doc/usd/07.mail/maila.nr#1 branch
.. //depot/projects/soc2009/trasz_limits/share/man/man3/fpgetround.3#4 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man4/re.4#5 integrate
.. //depot/projects/soc2009/trasz_limits/share/man/man9/bus_space.9#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/tsc.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/amd64/include/bus.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/arm/include/bus.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/conf/files.powerpc#15 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_em.c#21 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_igb.c#24 integrate
.. //depot/projects/soc2009/trasz_limits/sys/dev/ixgbe/ixgbe.c#16 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/procfs/procfs_fpregs.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/procfs/procfs_map.c#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/fs/procfs/procfs_regs.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/geom/part/g_part_bsd.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/i386/tsc.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/i386/include/bus.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/ia64/include/bus.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_shm.c#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_usrreq.c#9 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/bus.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/md_var.h#6 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/include/vmparam.h#7 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/minidump_machdep.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/mips/mips/pmap.c#21 integrate
.. //depot/projects/soc2009/trasz_limits/sys/pc98/include/bus.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/mmu_oea.c#14 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/mmu_oea64.c#16 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/mmu_oea64.h#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/moea64_if.m#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/moea64_native.c#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/bus.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/bus_dma.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/endian.h#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/pmap.h#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/busdma_machdep.c#5 integrate
.. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/iommu_if.m#1 branch
.. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/bus.h#3 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sun4v/include/bus.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/sys/queue.h#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/default_pager.c#4 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_fault.c#10 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#27 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_object.c#13 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_object.h#8 integrate
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_page.c#20 integrate
.. //depot/projects/soc2009/trasz_limits/tools/build/mk/OptionalObsoleteFiles.inc#12 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/lib/msun/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/regression/lib/msun/test-nearbyint.c#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/lib/msun/test-nearbyint.t#1 branch
.. //depot/projects/soc2009/trasz_limits/tools/regression/sockets/unix_gc/unix_gc.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/tools/tools/nanobsd/nanobsd.sh#11 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/bc/USD.doc/bc#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/dc/USD.doc/dc#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/gprof/PSD.doc/abstract.me#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/gprof/PSD.doc/gathering.me#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/gprof/PSD.doc/header.me#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/gprof/PSD.doc/intro.me#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/gprof/PSD.doc/postp.me#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/gprof/PSD.doc/postp1.pic#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/gprof/PSD.doc/postp2.pic#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/gprof/PSD.doc/postp3.pic#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/gprof/PSD.doc/pres1.pic#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/gprof/PSD.doc/pres2.pic#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/gprof/PSD.doc/present.me#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/gprof/PSD.doc/profiling.me#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/gprof/PSD.doc/refs.me#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/kdump/mksubr#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.bin/mail/USD.doc/mail0.nr#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/mail/USD.doc/mail1.nr#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/mail/USD.doc/mail2.nr#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/mail/USD.doc/mail3.nr#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/mail/USD.doc/mail4.nr#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/mail/USD.doc/mail5.nr#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/mail/USD.doc/mail6.nr#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/mail/USD.doc/mail7.nr#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/mail/USD.doc/mail8.nr#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/mail/USD.doc/mail9.nr#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/mail/USD.doc/maila.nr#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/make/PSD.doc/stubs#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/make/PSD.doc/tutorial.ms#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.bin/man/man.sh#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/SMM.doc/0.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/SMM.doc/1.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/SMM.doc/2.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/SMM.doc/3.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/SMM.doc/4.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/SMM.doc/5.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/SMM.doc/6.t#3 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/SMM.doc/a.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/SMM.doc/b.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/SMM.doc/c.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/SMM.doc/d.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/SMM.doc/e.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/config/SMM.doc/spell.ok#3 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/lpr/Makefile#2 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/lpr/SMM.doc/0.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/lpr/SMM.doc/1.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/lpr/SMM.doc/2.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/lpr/SMM.doc/3.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/lpr/SMM.doc/4.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/lpr/SMM.doc/5.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/lpr/SMM.doc/6.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/lpr/SMM.doc/7.t#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/lpr/SMM.doc/Makefile#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/lpr/SMM.doc/spell.ok#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/timed/SMM.doc/timed/Makefile#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/timed/SMM.doc/timed/date#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/timed/SMM.doc/timed/loop#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/timed/SMM.doc/timed/spell.ok#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/timed/SMM.doc/timed/time#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/timed/SMM.doc/timed/timed.ms#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/timed/SMM.doc/timed/unused#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/timed/SMM.doc/timedop/Makefile#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/timed/SMM.doc/timedop/timed.ms#2 delete
.. //depot/projects/soc2009/trasz_limits/usr.sbin/traceroute/Makefile#4 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/traceroute6/Makefile#4 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/traceroute6/traceroute6.c#3 integrate
.. //depot/projects/soc2009/trasz_limits/usr.sbin/usbdump/usbdump.c#2 integrate
Differences ...
==== //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#30 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.254 2010/11/22 09:37:52 netchild Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.256 2010/12/04 11:40:40 uqs Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -22,16 +22,31 @@
# grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \
# sort | uniq -d
#
+# To find regular duplicates not dependant on optional components, you can
+# also use something that will not give you false positives, e.g.:
+# for t in `make -V TARGETS universe`; do
+# __MAKE_CONF=/dev/null make -f Makefile.inc1 TARGET=$t \
+# -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \
+# xargs -n1 | sort | uniq -d;
+# done
+#
+# For optional components, you can use the following to see if some entries
+# in OptionalObsoleteFiles.inc have been obsoleted by ObsoleteFiles.inc
+# for o in tools/build/options/WITH*; do
+# __MAKE_CONF=/dev/null make -f Makefile.inc1 -D${o##*/} \
+# -V OLD_FILES -V OLD_LIBS -V OLD_DIRS check-old | \
+# xargs -n1 | sort | uniq -d;
+# done
# 20101112: vgonel(9) has gone to private API a while ago
OLD_FILES+=usr/share/man/man9/vgonel.9.gz
# 20101112: removed gasp.info
OLD_FILES+=usr/share/info/gasp.info.gz
-# 20101109: headers moved to machine/ to x86/
+# 20101109: headers moved from machine/ to x86/
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
OLD_FILES+=usr/include/machine/mptable.h
.endif
-# 20101101: headers moved to machine/ to x86/
+# 20101101: headers moved from machine/ to x86/
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
OLD_FILES+=usr/include/machine/apicreg.h
OLD_FILES+=usr/include/machine/mca.h
@@ -1158,12 +1173,6 @@
OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h
OLD_FILES+=usr/include/machine/i4b_trace.h
.endif
-# 20070704: I4B 'modules' temporary disconnected (removed 20080525)
-.if ${TARGET_ARCH} == "i386"
-OLD_FILES+=usr/share/man/man4/i4bing.4.gz
-OLD_FILES+=usr/share/man/man4/i4bipr.4.gz
-OLD_FILES+=usr/share/man/man4/i4bisppp.4.gz
-.endif
# 20070703: pf 4.1 import
OLD_FILES+=usr/libexec/ftp-proxy
# 20070701: KAME IPSec removal
@@ -1342,12 +1351,8 @@
OLD_LIBS+=usr/lib/libvgl.so.4
OLD_LIBS+=usr/lib/libwrap.so.4
OLD_LIBS+=usr/lib/libypclnt.so.2
-OLD_LIBS+=usr/lib/snmp_atm.so.3
OLD_LIBS+=usr/lib/snmp_bridge.so.3
OLD_LIBS+=usr/lib/snmp_hostres.so.3
-OLD_LIBS+=usr/lib/snmp_mibII.so.3
-OLD_LIBS+=usr/lib/snmp_netgraph.so.3
-OLD_LIBS+=usr/lib/snmp_pf.so.3
.if ${TARGET_ARCH} == "amd64"
OLD_LIBS+=usr/lib32/libatm.so.4
OLD_LIBS+=usr/lib32/libbegemot.so.2
@@ -4551,7 +4556,6 @@
OLD_FILES+=usr/games/worms
OLD_FILES+=usr/games/wump
OLD_FILES+=sbin/mount_reiserfs
-OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
OLD_FILES+=usr/include/cam/cam_extend.h
OLD_FILES+=usr/include/dev/wi/wi_hostap.h
OLD_FILES+=usr/include/disktab.h
@@ -4814,7 +4818,6 @@
OLD_FILES+=usr/include/posix4/sched.h
OLD_FILES+=usr/include/posix4/semaphore.h
OLD_DIRS+=usr/include/posix4
-OLD_FILES+=usr/include/rune.h
OLD_FILES+=usr/include/security/_pam_compat.h
OLD_FILES+=usr/include/security/_pam_macros.h
OLD_FILES+=usr/include/security/_pam_types.h
@@ -4960,37 +4963,14 @@
OLD_FILES+=usr/share/doc/ntp/tickadj.htm
OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz
OLD_FILES+=usr/share/doc/papers/px.ascii.gz
-OLD_FILES+=usr/share/man/man3/mbrune.3.gz
-OLD_FILES+=usr/share/man/man3/rune.3.gz
-OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz
+OLD_FILES+=usr/share/man/man3/exp10.3.gz
+OLD_FILES+=usr/share/man/man3/exp10f.3.gz
OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
+OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz
OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz
-OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz
-OLD_FILES+=usr/share/man/man3/exp10f.3.gz
-OLD_FILES+=usr/share/man/man3/exp10.3.gz
-OLD_FILES+=usr/share/man/man3/mbrrune.3.gz
-OLD_FILES+=usr/share/man/man3/mbmb.3.gz
-OLD_FILES+=usr/share/man/man3/sputrune.3.gz
-OLD_FILES+=usr/share/man/man3/sgetrune.3.gz
-OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz
-OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz
-OLD_FILES+=usr/share/man/man3/mbrune.3.gz
-OLD_FILES+=usr/share/man/man3/rune.3.gz
OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz
-OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
-OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz
-OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz
-OLD_FILES+=usr/share/man/man3/exp10f.3.gz
-OLD_FILES+=usr/share/man/man3/exp10.3.gz
-OLD_FILES+=usr/share/man/man3/mbrrune.3.gz
OLD_FILES+=usr/share/man/man3/mbmb.3.gz
-OLD_FILES+=usr/share/man/man3/sputrune.3.gz
-OLD_FILES+=usr/share/man/man3/sgetrune.3.gz
OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz
-OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz
-OLD_FILES+=usr/share/man/man3/fungetrune.3.gz
-OLD_FILES+=usr/share/man/man3/fputrune.3.gz
-OLD_FILES+=usr/share/man/man3/fgetrune.3.gz
OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz
.if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
OLD_FILES+=usr/share/man/man8/boot_i386.8.gz
@@ -5088,11 +5068,7 @@
# 20060413: libpcap.so.4 moved to /lib/
OLD_LIBS+=usr/lib/libpcap.so.4
# 20060412: libpthread.so.2 moved to /lib/
-.if ${TARGET_ARCH} != "sparc64"
OLD_LIBS+=usr/lib/libpthread.so.2
-.else
-OLD_LIBS+=usr/lib/libthr.so.2
-.endif
# 20060127: revert libdisk to static-only
OLD_LIBS+=usr/lib/libdisk.so.3
# 20051027: libc_r discontinued (removed 20101113)
@@ -5211,8 +5187,6 @@
OLD_LIBS+=usr/lib/snmp_mibII.so.3
OLD_LIBS+=usr/lib/snmp_netgraph.so.3
OLD_LIBS+=usr/lib/snmp_pf.so.3
-# 20050603: network related ABI change on 64bit systems
-OLD_LIBS+=usr/lib/libpcap.so.3
# 200505XX: ?
OLD_LIBS+=usr/lib/snmp_atm.so.2
OLD_LIBS+=usr/lib/snmp_mibII.so.2
@@ -5233,10 +5207,6 @@
OLD_LIBS+=usr/lib/libisc.so.1
# 200408XX
OLD_LIBS+=usr/lib/snmp_netgraph.so.1
-.if ${TARGET_ARCH} != "sparc64"
-# 20040130: libkse renamed to libpthread
-OLD_LIBS+=usr/lib/libkse.so.1
-.endif
# 200404XX
OLD_LIBS+=usr/lib/libsnmp.so.1
OLD_LIBS+=usr/lib/snmp_mibII.so.1
==== //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#18 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.151 2010/12/01 23:26:32 jilles Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.152 2010/12/03 23:24:27 jilles Exp $
.\"
-.Dd December 1, 2010
+.Dd December 3, 2010
.Dt SH 1
.Os
.Sh NAME
@@ -1593,12 +1593,7 @@
.Ql - ,
make it the first or last character listed.
.Ss Built-in Commands
-This section lists the commands which
-are built-in because they need to perform some operation
-that cannot be performed by a separate process.
-In addition to
-these, built-in versions of essential utilities
-are provided for efficiency.
+This section lists the built-in commands.
.Bl -tag -width indent
.It Ic \&:
A null command that returns a 0 (true) exit value.
@@ -1649,15 +1644,19 @@
Continue the specified jobs
(or the current job if no jobs are given)
in the background.
+.It Ic bind Oo Fl aeklrsv Oc Oo Ar key Oo Ar command Oc Oc
+List or alter key bindings for the line editor.
+This command is documented in
+.Xr editrc 5 .
+.It Ic break Op Ar num
+See the
+.Sx Flow-Control Constructs
+subsection.
.It Ic builtin Ar cmd Op Ar arg ...
Execute the specified built-in command,
.Ar cmd .
This is useful when the user wishes to override a shell function
with the same name as a built-in command.
-.It Ic bind Oo Fl aeklrsv Oc Oo Ar key Oo Ar command Oc Oc
-List or alter key bindings for the line editor.
-This command is documented in
-.Xr editrc 5 .
.It Ic cd Oo Fl L | P Oc Op Ar directory
Switch to the specified
.Ar directory ,
@@ -1759,6 +1758,10 @@
or
an alias for
.Ar value .
+.It Ic continue Op Ar num
+See the
+.Sx Flow-Control Constructs
+subsection.
.It Ic echo Oo Fl e | n Oc Op Ar string ...
Print a space-separated list of the arguments to the standard output
and append a newline character.
==== //depot/projects/soc2009/trasz_limits/contrib/bind9/CHANGES#10 (text+ko) ====
@@ -1,3 +1,55 @@
+
+ --- 9.6-ESV-R3 released ---
+
+2972. [bug] win32: address windows socket errors. [RT #21906]
+
+2971. [bug] Fixed a bug that caused journal files not to be
+ compacted on Windows systems as a result of
+ non-POSIX-compliant rename() semantics. [RT #22434]
+
+2970. [security] Adding a NO DATA negative cache entry failed to clear
+ any matching RRSIG records. A subsequent lookup of
+ of NO DATA cache entry could trigger a INSIST when the
+ unexpected RRSIG was also returned with the NO DATA
+ cache entry.
+
+ CVE-2010-3613, VU#706148. [RT #22288]
+
+2969. [security] Fix acl type processing so that allow-query works
+ in options and view statements. Also add a new
+ set of tests to verify proper functioning.
+
+ CVE-2010-3615, VU#510208. [RT #22418]
+
+2968. [security] Named could fail to prove a data set was insecure
+ before marking it as insecure. One set of conditions
+ that can trigger this occurs naturally when rolling
+ DNSKEY algorithms.
+
+ CVE-2010-3614, VU#837744. [RT #22309]
+
+2967. [bug] 'host -D' now turns on debugging messages earlier.
+ [RT #22361]
+
+2966. [bug] isc_print_vsnprintf() failed to check if there was
+ space available in the buffer when adding a left
+ justified character with a non zero width,
+ (e.g. "%-1c"). [RT #22270]
+
+2964. [bug] view->queryacl was being overloaded. Seperate the
+ usage into view->queryacl, view->cacheacl and
+ view->queryonacl. [RT #22114]
+
+2962. [port] win32: add more dependencies to BINDBuild.dsw.
+ [RT #22062]
+
+2952. [port] win32: named-checkzone and named-checkconf failed
+ to initialise winsock. [RT #21932]
+
+2951. [bug] named failed to generate a correct signed response
+ in a optout, delegation only zone with no secure
+ delegations. [RT #22007]
+
--- 9.6-ESV-R2 released ---
2939. [func] Check that named successfully skips NSEC3 records
==== //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/check-tool.c#3 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2002 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: check-tool.c,v 1.35.36.3 2009/01/20 02:03:18 marka Exp $ */
+/* $Id: check-tool.c,v 1.35.36.3.24.2 2010/09/07 23:46:25 tbox Exp $ */
/*! \file */
@@ -23,6 +23,10 @@
#include
+#ifdef _WIN32
+#include
+#endif
+
#include "check-tool.h"
#include
#include
@@ -662,3 +666,26 @@
return (result);
}
+
+#ifdef _WIN32
+void
+InitSockets(void) {
+ WORD wVersionRequested;
+ WSADATA wsaData;
+ int err;
+
+ wVersionRequested = MAKEWORD(2, 0);
+
+ err = WSAStartup( wVersionRequested, &wsaData );
+ if (err != 0) {
+ fprintf(stderr, "WSAStartup() failed: %d\n", err);
+ exit(1);
+ }
+}
+
+void
+DestroySockets(void) {
+ WSACleanup();
+}
+#endif
+
==== //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/check-tool.h#3 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2010 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2002 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: check-tool.h,v 1.14 2007/06/18 23:47:17 tbox Exp $ */
+/* $Id: check-tool.h,v 1.14.628.2 2010/09/07 23:46:26 tbox Exp $ */
#ifndef CHECK_TOOL_H
#define CHECK_TOOL_H
@@ -43,6 +43,11 @@
dump_zone(const char *zonename, dns_zone_t *zone, const char *filename,
dns_masterformat_t fileformat, const dns_master_style_t *style);
+#ifdef _WIN32
+void InitSockets(void);
+void DestroySockets(void);
+#endif
+
extern int debug;
extern isc_boolean_t nomerge;
extern isc_boolean_t docheckmx;
==== //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkconf.c#3 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2002 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: named-checkconf.c,v 1.46.222.2 2009/02/16 23:47:15 tbox Exp $ */
+/* $Id: named-checkconf.c,v 1.46.222.2.24.2 2010/09/07 23:46:26 tbox Exp $ */
/*! \file */
@@ -453,6 +453,10 @@
if (conffile == NULL || conffile[0] == '\0')
conffile = NAMED_CONFFILE;
+#ifdef _WIN32
+ InitSockets();
+#endif
+
RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
RUNTIME_CHECK(setup_logging(mctx, stdout, &logc) == ISC_R_SUCCESS);
@@ -494,5 +498,9 @@
isc_mem_destroy(&mctx);
+#ifdef _WIN32
+ DestroySockets();
+#endif
+
return (exit_status);
}
==== //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkzone.c#5 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sat Dec 4 18:10:35 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id F1AED1065674; Sat, 4 Dec 2010 18:10:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B4C82106564A
for ; Sat, 4 Dec 2010 18:10:34 +0000 (UTC)
(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id 9FBF58FC0C
for ; Sat, 4 Dec 2010 18:10:34 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id oB4IAYpw031184
for ; Sat, 4 Dec 2010 18:10:34 GMT
(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oB4IAYxL031176
for perforce@freebsd.org; Sat, 4 Dec 2010 18:10:34 GMT
(envelope-from trasz@freebsd.org)
Date: Sat, 4 Dec 2010 18:10:34 GMT
Message-Id: <201012041810.oB4IAYxL031176@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
trasz@freebsd.org using -f
From: Edward Tomasz Napierala
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 186627 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sat, 04 Dec 2010 18:10:35 -0000
http://p4web.freebsd.org/@@186627?ac=10
Change 186627 by trasz@trasz_victim on 2010/12/04 18:09:35
style(9).
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_misc.c#17 edit
.. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/imgact_svr4.c#10 edit
.. //depot/projects/soc2009/trasz_limits/sys/i386/linux/imgact_linux.c#9 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_aout.c#10 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#18 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_gzip.c#8 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#39 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#25 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#98 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#21 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#53 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_msg.c#8 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_sockbuf.c#6 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_unix.c#10 edit
.. //depot/projects/soc2009/trasz_limits/usr.bin/id/id.c#6 edit
.. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#27 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_misc.c#17 (text+ko) ====
@@ -376,7 +376,7 @@
}
error = rusage_set(td->td_proc, RUSAGE_DATA,
a_out->a_data + bss_size);
- if (error) {
+ if (error != 0) {
error = ENOMEM;
goto cleanup;
}
==== //depot/projects/soc2009/trasz_limits/sys/compat/svr4/imgact_svr4.c#10 (text+ko) ====
@@ -121,7 +121,7 @@
return (ENOMEM);
error = rusage_set(imgp->proc, RUSAGE_DATA,
a_out->a_data + bss_size);
- if (error)
+ if (error != 0)
return (ENOMEM);
#endif
==== //depot/projects/soc2009/trasz_limits/sys/i386/linux/imgact_linux.c#9 (text+ko) ====
@@ -119,7 +119,7 @@
return (ENOMEM);
error = rusage_set(imgp->proc, RUSAGE_DATA,
a_out->a_data + bss_size);
- if (error)
+ if (error != 0)
return (ENOMEM);
#endif /* CONTAINERS */
==== //depot/projects/soc2009/trasz_limits/sys/kern/imgact_aout.c#10 (text+ko) ====
@@ -203,7 +203,7 @@
return (ENOMEM);
error = rusage_set(imgp->proc, RUSAGE_DATA,
a_out->a_data + bss_size);
- if (error)
+ if (error != 0)
return (ENOMEM);
#endif /* CONTAINERS */
==== //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#18 (text+ko) ====
@@ -890,11 +890,11 @@
return (ENOMEM);
error = rusage_set(imgp->proc, RUSAGE_DATA,
data_size);
- if (error)
+ if (error != 0)
return (ENOMEM);
error = rusage_set(imgp->proc, RUSAGE_VMEM,
total_size);
- if (error)
+ if (error != 0)
return (ENOMEM);
#endif /* CONTAINERS */
==== //depot/projects/soc2009/trasz_limits/sys/kern/imgact_gzip.c#8 (text+ko) ====
@@ -232,7 +232,7 @@
}
error = rusage_set(gz->ip->proc, RUSAGE_DATA,
gz->a_out.a_data + gz->bss_size);
- if (error)
+ if (error != 0)
return (ENOMEM);
#endif /* CONTAINERS */
/* Find out how far we should go */
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#39 (text+ko) ====
@@ -165,7 +165,7 @@
if (dest->c_parents[i] == NULL)
continue;
error = container_add(dest->c_parents[i], src);
- if (error) {
+ if (error != 0) {
for (i--; i >= 0; i--)
container_sub(dest->c_parents[i], src);
return (error);
@@ -242,7 +242,7 @@
("container already joined"));
if (child->c_parents[i] == NULL) {
error = container_add(parent, child);
- if (error) {
+ if (error != 0) {
SDT_PROBE(container, kernel, container, join_failure, child, parent, 0, 0, 0);
return (error);
}
@@ -638,7 +638,7 @@
continue;
error = rusage_set_locked(child, i, parent->p_container.c_resources[i]);
- if (error) {
+ if (error != 0) {
/*
* XXX: The only purpose of these two lines is to prevent from
* tripping checks in container_destroy().
@@ -658,7 +658,7 @@
if (container == NULL)
continue;
error = container_join_locked(&child->p_container, container);
- if (error) {
+ if (error != 0) {
/*
* XXX: The only purpose of these two lines is to prevent from
* tripping checks in container_destroy().
@@ -678,7 +678,7 @@
#ifdef HRL
if (error == 0) {
error = hrl_proc_fork(parent, child);
- if (error) {
+ if (error != 0) {
mtx_lock(&container_lock);
container_destroy(&child->p_container);
mtx_unlock(&container_lock);
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#25 (text+ko) ====
@@ -226,7 +226,7 @@
#ifdef CONTAINERS
error = rusage_add(p1, RUSAGE_NPROC, 1);
- if (error)
+ if (error != 0)
return (error);
#endif
@@ -277,7 +277,7 @@
}
*procp = NULL;
#ifdef CONTAINERS
- if (error)
+ if (error != 0)
rusage_sub(p1, RUSAGE_NPROC, 1);
#endif
return (error);
@@ -361,7 +361,7 @@
* Initialize resource container for the child process.
*/
error = container_proc_fork(p1, newproc);
- if (error) {
+ if (error != 0) {
error = EAGAIN;
goto fail;
}
@@ -369,7 +369,7 @@
* After fork, there is exactly one thread running.
*/
error = rusage_set(newproc, RUSAGE_NTHR, 1);
- if (error) {
+ if (error != 0) {
error = EAGAIN;
goto fail;
}
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#98 (text+ko) ====
@@ -727,7 +727,7 @@
rule->hr_subject_type = HRL_SUBJECT_TYPE_UNDEFINED;
else {
error = str2value(subjectstr, &rule->hr_subject_type, subjectnames);
- if (error)
+ if (error != 0)
goto out;
}
@@ -743,7 +743,7 @@
*/
if (rule->hr_subject_type != HRL_SUBJECT_TYPE_LOGINCLASS) {
error = str2id(subject_idstr, &id);
- if (error)
+ if (error != 0)
goto out;
}
switch (rule->hr_subject_type) {
@@ -785,7 +785,7 @@
else {
error = str2value(resourcestr, &rule->hr_resource,
resourcenames);
- if (error)
+ if (error != 0)
goto out;
}
@@ -793,7 +793,7 @@
rule->hr_action = HRL_ACTION_UNDEFINED;
else {
error = str2value(actionstr, &rule->hr_action, actionnames);
- if (error)
+ if (error != 0)
goto out;
}
@@ -801,7 +801,7 @@
rule->hr_amount = HRL_AMOUNT_UNDEFINED;
else {
error = str2int64(amountstr, &rule->hr_amount);
- if (error)
+ if (error != 0)
goto out;
}
@@ -809,12 +809,12 @@
rule->hr_per = HRL_SUBJECT_TYPE_UNDEFINED;
else {
error = str2value(perstr, &rule->hr_per, subjectnames);
- if (error)
+ if (error != 0)
goto out;
}
out:
- if (error) {
+ if (error != 0) {
hrl_rule_release(rule);
return (NULL);
}
@@ -1021,7 +1021,7 @@
str = malloc(inbuflen + 1, M_HRL, M_WAITOK);
error = copyinstr(inbufp, str, inbuflen, NULL);
- if (error) {
+ if (error != 0) {
free(str, M_HRL);
return (error);
}
@@ -1081,7 +1081,7 @@
struct prison *pr;
error = hrl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen);
- if (error)
+ if (error != 0)
return (error);
sx_slock(&allproc_lock);
@@ -1131,7 +1131,7 @@
out:
hrl_rule_release(filter);
sx_sunlock(&allproc_lock);
- if (error)
+ if (error != 0)
return (error);
error = hrl_write_outbuf(outputsbuf, uap->outbufp, uap->outbuflen);
@@ -1170,7 +1170,7 @@
struct proc *p;
error = hrl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen);
- if (error)
+ if (error != 0)
return (error);
sx_slock(&allproc_lock);
@@ -1240,7 +1240,7 @@
struct hrl_rule_link *link;
error = hrl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen);
- if (error)
+ if (error != 0)
return (error);
sx_slock(&allproc_lock);
@@ -1306,11 +1306,11 @@
char *inputstr;
error = priv_check(td, PRIV_HRL_SET);
- if (error)
+ if (error != 0)
return (error);
error = hrl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen);
- if (error)
+ if (error != 0)
return (error);
sx_slock(&allproc_lock);
@@ -1357,11 +1357,11 @@
char *inputstr;
error = priv_check(td, PRIV_HRL_SET);
- if (error)
+ if (error != 0)
return (error);
error = hrl_read_inbuf(&inputstr, uap->inbufp, uap->inbuflen);
- if (error)
+ if (error != 0)
return (error);
sx_slock(&allproc_lock);
@@ -1524,11 +1524,11 @@
rule->hr_subject.hs_proc = child;
error = hrl_container_add_rule_locked(&child->p_container, rule);
hrl_rule_release(rule);
- if (error)
+ if (error != 0)
goto fail;
} else {
error = hrl_container_add_rule_locked(&child->p_container, link->hrl_rule);
- if (error)
+ if (error != 0)
goto fail;
}
}
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#21 (text+ko) ====
@@ -189,7 +189,7 @@
struct ucred *newcred, *oldcred;
error = priv_check(td, PRIV_PROC_SETLOGINCLASS);
- if (error)
+ if (error != 0)
return (error);
error = copyinstr(uap->namebuf, lcname, sizeof(lcname), NULL);
if (error == ENAMETOOLONG)
@@ -221,7 +221,7 @@
LIST_FOREACH_SAFE(lc, &loginclasses, lc_next, lctmp) {
error = (callback)(&lc->lc_container, filter, arg3);
- if (error)
+ if (error != 0)
return (error);
}
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#53 (text+ko) ====
@@ -1434,7 +1434,7 @@
for (uip = LIST_FIRST(uih); uip; uip = nextuip) {
nextuip = LIST_NEXT(uip, ui_hash);
error = (callback)(&uip->ui_container, filter, arg3);
- if (error) {
+ if (error != 0) {
rw_runlock(&uihashtbl_lock);
return (error);
}
==== //depot/projects/soc2009/trasz_limits/sys/kern/sysv_msg.c#8 (text+ko) ====
@@ -993,7 +993,7 @@
td->td_retval[0] = 0;
done3:
#ifdef CONTAINERS
- if (error) {
+ if (error != 0) {
rusage_sub(td->td_proc, RUSAGE_MSGQQUEUED, 1);
rusage_sub(td->td_proc, RUSAGE_MSGQSIZE, saved_msgsz);
}
==== //depot/projects/soc2009/trasz_limits/sys/kern/uipc_sockbuf.c#6 (text+ko) ====
@@ -315,7 +315,7 @@
#ifdef CONTAINER
if (td != NULL) {
error = rusage_add(td->td_proc, RUSAGE_SBSIZE, cc);
- if (error)
+ if (error != 0)
return (0);
} else
rusage_add_cred(so->so_cred, RUSAGE_SBSIZE, cc);
==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_unix.c#10 (text+ko) ====
@@ -108,7 +108,7 @@
#ifdef CONTAINERS
error = rusage_set(td->td_proc, RUSAGE_DATA,
new - base);
- if (error) {
+ if (error != 0) {
error = ENOMEM;
goto done;
}
@@ -137,7 +137,7 @@
#ifdef CONTAINERS
error = rusage_set(td->td_proc, RUSAGE_VMEM,
vm->vm_map.size + (new - old));
- if (error) {
+ if (error != 0) {
error = ENOMEM;
goto done;
}
==== //depot/projects/soc2009/trasz_limits/usr.bin/id/id.c#6 (text+ko) ====
@@ -169,7 +169,7 @@
if (cflag) {
error = getloginclass(loginclass, sizeof(loginclass));
- if (error)
+ if (error != 0)
err(1, "loginclass");
(void)printf("%s\n", loginclass);
exit(0);
==== //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#27 (text+ko) ====
@@ -296,7 +296,7 @@
int error;
error = hrl_add_rule(rule, strlen(rule) + 1, NULL, 0);
- if (error)
+ if (error != 0)
err(1, "hrl_add_rule");
free(rule);
}
@@ -330,7 +330,7 @@
int error;
error = hrl_remove_rule(filter, strlen(filter) + 1, NULL, 0);
- if (error)
+ if (error != 0)
err(1, "hrl_remove_rule");
free(filter);
}
From owner-p4-projects@FreeBSD.ORG Sat Dec 4 19:50:23 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id A29C61065672; Sat, 4 Dec 2010 19:50:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 64E37106564A
for ; Sat, 4 Dec 2010 19:50:23 +0000 (UTC)
(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id 50E158FC15
for ; Sat, 4 Dec 2010 19:50:23 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id oB4JoNGH053315
for ; Sat, 4 Dec 2010 19:50:23 GMT
(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oB4JoNsd053310
for perforce@freebsd.org; Sat, 4 Dec 2010 19:50:23 GMT
(envelope-from trasz@freebsd.org)
Date: Sat, 4 Dec 2010 19:50:23 GMT
Message-Id: <201012041950.oB4JoNsd053310@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
trasz@freebsd.org using -f
From: Edward Tomasz Napierala
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 186633 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sat, 04 Dec 2010 19:50:23 -0000
http://p4web.freebsd.org/@@186633?ac=10
Change 186633 by trasz@trasz_victim on 2010/12/04 19:49:49
Update TODO.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/TODO#32 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/TODO#32 (text+ko) ====
@@ -25,9 +25,15 @@
Milestone 3:
- - inheritance: different resources need to sum things up differently
- - per-jail containers
- - per-jail resource limits
+ - 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.
+
+ - Do we need separate container hierarchy, or should we just drop it and use
+ ucred?
+
+ - Remove CONTAINERS #ifdefs.
Issues:
@@ -73,8 +79,8 @@
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 remembering
- about.
+ of file descriptors. This shouldn't be a problem, but might be worth keeping
+ in mind.
- We should have a limit for the number of files that were mmapped and then closed,
and remain mapped in memory.
@@ -88,7 +94,7 @@
- Bring back per-group limits.
- - Some things need to be accounted for per-euid, and some per-egid. Geez.
+ - Some things need to be accounted for per-euid, and some per-ruid. Geez.
- In maxproc limit, make sure the 'p' argument is a child process. Otherwise,
if one adds rule with 'sig*' action, the signal will be sent to the parent
From owner-p4-projects@FreeBSD.ORG Sat Dec 4 20:41:56 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 49CE51065674; Sat, 4 Dec 2010 20:41:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 0BD79106564A
for ; Sat, 4 Dec 2010 20:41:56 +0000 (UTC)
(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
[IPv6:2001:4f8:fff6::2d])
by mx1.freebsd.org (Postfix) with ESMTP id EA7CE8FC08
for ; Sat, 4 Dec 2010 20:41:55 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id oB4KftsL067156
for ; Sat, 4 Dec 2010 20:41:55 GMT
(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oB4Kft0u067153
for perforce@freebsd.org; Sat, 4 Dec 2010 20:41:55 GMT
(envelope-from trasz@freebsd.org)
Date: Sat, 4 Dec 2010 20:41:55 GMT
Message-Id: <201012042041.oB4Kft0u067153@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
trasz@freebsd.org using -f
From: Edward Tomasz Napierala
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 186635 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sat, 04 Dec 2010 20:41:56 -0000
http://p4web.freebsd.org/@@186635?ac=10
Change 186635 by trasz@trasz_victim on 2010/12/04 20:40:57
Get rid of the ugly #ifdef CONTAINERS.
Affected files ...
.. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_misc.c#18 edit
.. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/imgact_svr4.c#11 edit
.. //depot/projects/soc2009/trasz_limits/sys/conf/files#39 edit
.. //depot/projects/soc2009/trasz_limits/sys/fs/fdescfs/fdesc_vfsops.c#5 edit
.. //depot/projects/soc2009/trasz_limits/sys/i386/linux/imgact_linux.c#10 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_aout.c#11 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#19 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_gzip.c#9 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#31 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#40 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#17 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#29 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#26 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#26 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sig.c#19 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_thr.c#12 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_msg.c#9 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_sem.c#9 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_shm.c#11 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#21 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_sockbuf.c#7 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_socket.c#18 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_usrreq.c#10 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_vnops.c#20 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#14 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_glue.c#9 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#28 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#20 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#19 edit
.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_unix.c#11 edit
Differences ...
==== //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_misc.c#18 (text+ko) ====
@@ -369,7 +369,6 @@
}
PROC_UNLOCK(td->td_proc);
#endif
-#ifdef CONTAINERS
if (a_out->a_text > maxtsiz) {
error = ENOMEM;
goto cleanup;
@@ -380,7 +379,6 @@
error = ENOMEM;
goto cleanup;
}
-#endif /* !CONTAINERS */
/*
* Prevent more writers.
==== //depot/projects/soc2009/trasz_limits/sys/compat/svr4/imgact_svr4.c#11 (text+ko) ====
@@ -116,14 +116,12 @@
}
PROC_UNLOCK(imgp->proc);
#endif /* !HRL */
-#ifdef CONTAINERS
if (a_out->a_text > maxtsiz)
return (ENOMEM);
error = rusage_set(imgp->proc, RUSAGE_DATA,
a_out->a_data + bss_size);
if (error != 0)
return (ENOMEM);
-#endif
VOP_UNLOCK(imgp->vp, 0);
==== //depot/projects/soc2009/trasz_limits/sys/conf/files#39 (text+ko) ====
@@ -2124,7 +2124,7 @@
kern/kern_condvar.c standard
kern/kern_conf.c standard
kern/kern_cons.c standard
-kern/kern_container.c optional containers
+kern/kern_container.c standard
kern/kern_cpu.c standard
kern/kern_cpuset.c standard
kern/kern_context.c standard
==== //depot/projects/soc2009/trasz_limits/sys/fs/fdescfs/fdesc_vfsops.c#5 (text+ko) ====
@@ -187,9 +187,7 @@
int i;
int last;
int freefd;
-#ifdef CONTAINERS
uint64_t limit;
-#endif
td = curthread;
@@ -206,7 +204,6 @@
#endif
fdp = td->td_proc->p_fd;
FILEDESC_SLOCK(fdp);
-#ifdef CONTAINERS
limit = rusage_get_limit(td->td_proc, RUSAGE_NOFILE);
#ifdef HRL
lim = limit;
@@ -214,7 +211,6 @@
if (lim > limit)
lim = limit;
#endif
-#endif
last = min(fdp->fd_nfiles, lim);
freefd = 0;
for (i = fdp->fd_freefile; i < last; i++)
==== //depot/projects/soc2009/trasz_limits/sys/i386/linux/imgact_linux.c#10 (text+ko) ====
@@ -114,14 +114,12 @@
}
PROC_UNLOCK(imgp->proc);
#endif /* !HRL */
-#ifdef CONTAINERS
if (a_out->a_text > maxtsiz)
return (ENOMEM);
error = rusage_set(imgp->proc, RUSAGE_DATA,
a_out->a_data + bss_size);
if (error != 0)
return (ENOMEM);
-#endif /* CONTAINERS */
VOP_UNLOCK(imgp->vp, 0);
==== //depot/projects/soc2009/trasz_limits/sys/kern/imgact_aout.c#11 (text+ko) ====
@@ -197,7 +197,6 @@
}
PROC_UNLOCK(imgp->proc);
#endif /* !HRL */
-#ifdef CONTAINERS
if (/* text can't exceed maximum text size */
a_out->a_text > maxtsiz)
return (ENOMEM);
@@ -205,7 +204,6 @@
a_out->a_data + bss_size);
if (error != 0)
return (ENOMEM);
-#endif /* CONTAINERS */
/*
* Avoid a possible deadlock if the current address space is destroyed
==== //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#19 (text+ko) ====
@@ -885,7 +885,6 @@
#else
PROC_LOCK(imgp->proc);
#endif /* !HRL */
-#ifdef CONTAINERS
if (text_size > maxtsiz)
return (ENOMEM);
error = rusage_set(imgp->proc, RUSAGE_DATA,
@@ -896,7 +895,6 @@
total_size);
if (error != 0)
return (ENOMEM);
-#endif /* CONTAINERS */
vmspace->vm_tsize = text_size >> PAGE_SHIFT;
vmspace->vm_taddr = (caddr_t)(uintptr_t)text_addr;
@@ -1117,12 +1115,10 @@
hdrsize = 0;
__elfN(puthdr)(td, (void *)NULL, &hdrsize, seginfo.count);
-#ifdef CONTAINERS
if (rusage_add(td->td_proc, RUSAGE_CORE, hdrsize + seginfo.size)) {
error = EFAULT;
goto done;
}
-#endif /* CONTAINERS */
if (hdrsize + seginfo.size >= limit) {
error = EFAULT;
goto done;
==== //depot/projects/soc2009/trasz_limits/sys/kern/imgact_gzip.c#9 (text+ko) ====
@@ -224,7 +224,6 @@
}
PROC_UNLOCK(gz->ip->proc);
#endif /* !HRL */
-#ifdef CONTAINERS
if ( /* text can't exceed maximum text size */
gz->a_out.a_text > maxtsiz) {
gz->where = __LINE__;
@@ -234,7 +233,6 @@
gz->a_out.a_data + gz->bss_size);
if (error != 0)
return (ENOMEM);
-#endif /* CONTAINERS */
/* Find out how far we should go */
gz->file_end = gz->file_offset + gz->a_out.a_text + gz->a_out.a_data;
==== //depot/projects/soc2009/trasz_limits/sys/kern/init_main.c#31 (text+ko) ====
@@ -399,9 +399,6 @@
proc0_init(void *dummy __unused)
{
struct proc *p;
-#ifdef CONTAINERS
- unsigned error;
-#endif
struct thread *td;
vm_paddr_t pageablemem;
int i;
@@ -560,10 +557,7 @@
* Charge root for one process.
*/
(void)chgproccnt(p->p_ucred->cr_ruidinfo, 1, 0);
-#ifdef CONTAINERS
- error = rusage_add(p, RUSAGE_NPROC, 1);
- KASSERT(error == 0, ("rusage_add failed"));
-#endif
+ rusage_add_force(p, RUSAGE_NPROC, 1);
}
SYSINIT(p0init, SI_SUB_INTRINSIC, SI_ORDER_FIRST, proc0_init, NULL);
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#40 (text+ko) ====
@@ -58,6 +58,8 @@
#include
#endif
+#ifdef CONTAINERS
+
static struct mtx container_lock;
MTX_SYSINIT(container_lock, &container_lock, "container lock", MTX_DEF);
@@ -786,3 +788,84 @@
NULL
};
SYSINIT(containerd, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, kproc_start, &containerd_kp);
+
+#else /* !CONTAINERS */
+
+int
+rusage_add(struct proc *p, int resource, uint64_t amount)
+{
+
+ return (0);
+}
+
+void
+rusage_add_cred(struct ucred *cred, int resource, uint64_t amount)
+{
+}
+
+void
+rusage_add_force(struct proc *p, int resource, uint64_t amount)
+{
+
+ return (0);
+}
+
+int
+rusage_set(struct proc *p, int resource, uint64_t amount)
+{
+
+ return (0);
+}
+
+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)
+{
+
+ return (UINT64_MAX);
+}
+
+void
+container_create(struct container *container)
+{
+}
+
+void
+container_destroy(struct container *container)
+{
+}
+
+int
+container_join(struct container *child, struct container *parent)
+{
+
+ return (0);
+}
+
+void
+container_leave(struct container *child, struct container *parent)
+{
+}
+
+int
+container_proc_fork(struct proc *parent, struct proc *child)
+{
+
+ return (0);
+}
+
+void
+container_proc_exit(struct proc *p)
+{
+}
+
+#endif /* !CONTAINERS */
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#17 (text+ko) ====
@@ -274,19 +274,15 @@
getdtablesize(struct thread *td, struct getdtablesize_args *uap)
{
struct proc *p = td->td_proc;
-#ifdef CONTAINERS
uint64_t lim;
-#endif
PROC_LOCK(p);
td->td_retval[0] =
min((int)lim_cur(p, RLIMIT_NOFILE), maxfilesperproc);
PROC_UNLOCK(p);
-#ifdef CONTAINERS
lim = rusage_get_limit(td->td_proc, RUSAGE_NOFILE);
if (lim < td->td_retval[0])
td->td_retval[0] = lim;
-#endif
return (0);
}
@@ -800,22 +796,19 @@
*/
if (flags & DUP_FIXED) {
if (new >= fdp->fd_nfiles) {
-#ifdef CONTAINERS
/*
* The resource limits are here instead of e.g. fdalloc(),
* because the file descriptor table may be shared between
* processes, so we can't really use rusage_add()/rusage_sub().
- * Instead of e.g. counting the number of actually allocated
+ * Instead of counting the number of actually allocated
* descriptors, just put the limit on the size of the file
- * descriptor table. Entries are small, and we'll need a limit
- * for vnodes and sockets anyway.
+ * descriptor table.
*/
if (rusage_set(p, RUSAGE_NOFILE, new + 1)) {
FILEDESC_XUNLOCK(fdp);
fdrop(fp, td);
return (EMFILE);
}
-#endif
fdgrowtable(fdp, new + 1);
}
if (fdp->fd_ofiles[new] == NULL)
@@ -1486,10 +1479,8 @@
return (EMFILE);
if (fd < fdp->fd_nfiles)
break;
-#ifdef CONTAINERS
if (rusage_set(p, RUSAGE_NOFILE, min(fdp->fd_nfiles * 2, maxfd)))
return (EMFILE);
-#endif
fdgrowtable(fdp, min(fdp->fd_nfiles * 2, maxfd));
}
@@ -1772,9 +1763,8 @@
if (fdp == NULL)
return;
-#ifdef CONTAINERS
rusage_set(td->td_proc, RUSAGE_NOFILE, 0);
-#endif
+
/* Check for special need to clear POSIX style locks */
fdtol = td->td_proc->p_fdtol;
if (fdtol != NULL) {
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#29 (text+ko) ====
@@ -177,9 +177,7 @@
}
KASSERT(p->p_numthreads == 1,
("exit1: proc %p exiting with %d threads", p, p->p_numthreads));
-#ifdef CONTAINERS
rusage_sub(p, RUSAGE_NTHR, 1);
-#endif
/*
* Wakeup anyone in procfs' PIOCWAIT. They should have a hold
* on our vmspace, so we should block below until they have
@@ -743,7 +741,6 @@
* Decrement the count of procs running with this uid.
*/
(void)chgproccnt(p->p_ucred->cr_ruidinfo, -1, 0);
-#ifdef CONTAINERS
rusage_set(p, RUSAGE_CPU, cputick2usec(p->p_rux.rux_runtime));
rusage_sub(p->p_pptr, RUSAGE_NPROC, 1);
@@ -751,7 +748,6 @@
* Destroy resource container associated with the process.
*/
container_proc_exit(p);
-#endif
/*
* Free credentials, arguments, and sigacts.
@@ -912,11 +908,8 @@
if (child->p_pptr == parent)
return;
-#ifdef CONTAINERS
rusage_sub(child->p_pptr, RUSAGE_NPROC, 1);
- /* XXX: What about return value? */
- rusage_add(parent, RUSAGE_NPROC, 1);
-#endif
+ rusage_add_force(parent, RUSAGE_NPROC, 1);
PROC_LOCK(child->p_pptr);
sigqueue_take(child->p_ksi);
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#26 (text+ko) ====
@@ -224,11 +224,9 @@
p1 = td->td_proc;
-#ifdef CONTAINERS
error = rusage_add(p1, RUSAGE_NPROC, 1);
if (error != 0)
return (error);
-#endif
/*
* Here we don't create a new process, but we divorce
@@ -240,9 +238,7 @@
PROC_LOCK(p1);
if (thread_single(SINGLE_BOUNDARY)) {
PROC_UNLOCK(p1);
-#ifdef CONTAINERS
rusage_sub(p1, RUSAGE_NPROC, 1);
-#endif
return (ERESTART);
}
PROC_UNLOCK(p1);
@@ -276,10 +272,8 @@
PROC_UNLOCK(p1);
}
*procp = NULL;
-#ifdef CONTAINERS
if (error != 0)
rusage_sub(p1, RUSAGE_NPROC, 1);
-#endif
return (error);
}
@@ -356,7 +350,6 @@
goto fail;
}
-#ifdef CONTAINERS
/*
* Initialize resource container for the child process.
*/
@@ -373,7 +366,6 @@
error = EAGAIN;
goto fail;
}
-#endif
/*
* Increment the count of procs running with this uid. Don't allow
@@ -810,9 +802,7 @@
*procp = p2;
return (0);
fail:
-#ifdef CONTAINERS
container_proc_exit(newproc);
-#endif
sx_sunlock(&proctree_lock);
if (ppsratecheck(&lastfail, &curfail, 1))
printf("maxproc limit exceeded by uid %i, please see tuning(7) and login.conf(5).\n",
@@ -826,9 +816,7 @@
vmspace_free(vm2);
uma_zfree(proc_zone, newproc);
pause("fork", hz / 2);
-#ifdef CONTAINERS
rusage_sub(p1, RUSAGE_NPROC, 1);
-#endif
return (error);
}
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#26 (text+ko) ====
@@ -1188,9 +1188,7 @@
root = mypr->pr_root;
vref(root);
}
-#ifdef CONTAINERS
container_create(&pr->pr_container);
-#endif
strlcpy(pr->pr_hostuuid, DEFAULT_HOSTUUID, HOSTUUIDLEN);
pr->pr_flags |= PR_HOST;
#if defined(INET) || defined(INET6)
@@ -2523,9 +2521,7 @@
if (pr->pr_cpuset != NULL)
cpuset_rel(pr->pr_cpuset);
osd_jail_exit(pr);
-#ifdef CONTAINERS
container_destroy(&pr->pr_container);
-#endif
free(pr, M_PRISON);
/* Removing a prison frees a reference on its parent. */
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_sig.c#19 (text+ko) ====
@@ -3170,12 +3170,8 @@
*/
limit = (off_t)lim_cur(p, RLIMIT_CORE);
PROC_UNLOCK(p);
-#ifdef CONTAINERS
if (limit == 0 && rusage_add(td->td_proc, RUSAGE_CORE, 1) == 0) {
rusage_sub(td->td_proc, RUSAGE_CORE, 1);
-#else
- if (limit == 0) {
-#endif
#ifdef AUDIT
audit_proc_coredump(td, name, EFBIG);
#endif
==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_thr.c#12 (text+ko) ====
@@ -176,10 +176,8 @@
return (EINVAL);
}
}
-#ifdef CONTAINERS
if (rusage_add(p, RUSAGE_NTHR, 1))
return (EPROCLIM);
-#endif
/* Initialize our td */
newtd = thread_alloc(0);
@@ -267,9 +265,7 @@
return (0);
fail:
-#ifdef CONTAINERS
rusage_sub(p, RUSAGE_NTHR, 1);
-#endif
return (error);
}
@@ -301,9 +297,7 @@
rw_wlock(&tidhash_lock);
-#ifdef CONTAINERS
rusage_sub(p, RUSAGE_NTHR, 1);
-#endif
PROC_LOCK(p);
/*
==== //depot/projects/soc2009/trasz_limits/sys/kern/sysv_msg.c#9 (text+ko) ====
@@ -465,11 +465,9 @@
}
#endif
-#ifdef CONTAINERS
rusage_sub_cred(msqkptr->cred, RUSAGE_NMSGQ, 1);
rusage_sub_cred(msqkptr->cred, RUSAGE_MSGQQUEUED, msqkptr->u.msg_qnum);
rusage_sub_cred(msqkptr->cred, RUSAGE_MSGQSIZE, msqkptr->u.msg_cbytes);
-#endif
crfree(msqkptr->cred);
msqkptr->cred = NULL;
@@ -620,12 +618,10 @@
error = ENOSPC;
goto done2;
}
-#ifdef CONTAINERS
if (rusage_add(td->td_proc, RUSAGE_NMSGQ, 1)) {
error = ENOSPC;
goto done2;
}
-#endif
DPRINTF(("msqid %d is available\n", msqid));
msqkptr->u.msg_perm.key = key;
msqkptr->u.msg_perm.cuid = cred->cr_uid;
@@ -685,9 +681,7 @@
register struct msqid_kernel *msqkptr;
register struct msg *msghdr;
short next;
-#ifdef CONTAINERS
size_t saved_msgsz;
-#endif
if (!prison_allow(td->td_ucred, PR_ALLOW_SYSVIPC))
return (ENOSYS);
@@ -725,19 +719,16 @@
goto done2;
#endif
-#ifdef CONTAINERS
if (rusage_add(td->td_proc, RUSAGE_MSGQQUEUED, 1)) {
error = EAGAIN;
goto done2;
}
-
saved_msgsz = msgsz;
if (rusage_add(td->td_proc, RUSAGE_MSGQSIZE, msgsz)) {
rusage_sub(td->td_proc, RUSAGE_MSGQQUEUED, 1);
error = EAGAIN;
goto done2;
}
-#endif
segs_needed = (msgsz + msginfo.msgssz - 1) / msginfo.msgssz;
DPRINTF(("msgsz=%zu, msgssz=%d, segs_needed=%d\n", msgsz,
@@ -992,12 +983,10 @@
wakeup(msqkptr);
td->td_retval[0] = 0;
done3:
-#ifdef CONTAINERS
if (error != 0) {
rusage_sub(td->td_proc, RUSAGE_MSGQQUEUED, 1);
rusage_sub(td->td_proc, RUSAGE_MSGQSIZE, saved_msgsz);
}
-#endif
done2:
mtx_unlock(&msq_mtx);
return (error);
@@ -1231,10 +1220,8 @@
msqkptr->u.msg_lrpid = td->td_proc->p_pid;
msqkptr->u.msg_rtime = time_second;
-#ifdef CONTAINERS
rusage_sub_cred(msqkptr->cred, RUSAGE_MSGQQUEUED, 1);
rusage_sub_cred(msqkptr->cred, RUSAGE_MSGQSIZE, msghdr->msg_ts);
-#endif
/*
* Make msgsz the actual amount that we'll be returning.
==== //depot/projects/soc2009/trasz_limits/sys/kern/sysv_sem.c#9 (text+ko) ====
@@ -655,9 +655,7 @@
semakptr->u.sem_perm.cuid = cred->cr_uid;
semakptr->u.sem_perm.uid = cred->cr_uid;
semakptr->u.sem_perm.mode = 0;
-#ifdef CONTAINERS
rusage_sub_cred(semakptr->cred, RUSAGE_NSEM, semakptr->u.sem_nsems);
-#endif
crfree(semakptr->cred);
semakptr->cred = NULL;
SEMUNDO_LOCK();
@@ -931,12 +929,10 @@
error = ENOSPC;
goto done2;
}
-#ifdef CONTAINERS
if (rusage_add(td->td_proc, RUSAGE_NSEM, nsems)) {
error = ENOSPC;
goto done2;
}
-#endif
DPRINTF(("semid %d is available\n", semid));
mtx_lock(&sema_mtx[semid]);
KASSERT((sema[semid].u.sem_perm.mode & SEM_ALLOC) == 0,
@@ -1022,10 +1018,8 @@
DPRINTF(("too many sops (max=%d, nsops=%d)\n", seminfo.semopm,
nsops));
return (E2BIG);
-#ifdef CONTAINERS
} else if (nsops > rusage_get_limit(td->td_proc, RUSAGE_NSEMOP)) {
return (E2BIG);
-#endif
} else
sops = malloc(nsops * sizeof(*sops), M_TEMP, M_WAITOK);
if ((error = copyin(uap->sops, sops, nsops * sizeof(sops[0]))) != 0) {
==== //depot/projects/soc2009/trasz_limits/sys/kern/sysv_shm.c#11 (text+ko) ====
@@ -245,10 +245,8 @@
#ifdef MAC
mac_sysvshm_cleanup(shmseg);
#endif
-#ifdef CONTAINERS
rusage_sub_cred(shmseg->cred, RUSAGE_NSHM, 1);
rusage_sub_cred(shmseg->cred, RUSAGE_SHMSIZE, size);
-#endif
crfree(shmseg->cred);
shmseg->cred = NULL;
}
@@ -672,14 +670,12 @@
shm_last_free = -1;
}
shmseg = &shmsegs[segnum];
-#ifdef CONTAINERS
if (rusage_add(td->td_proc, RUSAGE_NSHM, 1))
return (ENOSPC);
if (rusage_add(td->td_proc, RUSAGE_SHMSIZE, size)) {
rusage_sub(td->td_proc, RUSAGE_NSHM, 1);
return (ENOMEM);
}
-#endif
/*
* In case we sleep in malloc(), mark the segment present but deleted
* so that noone else tries to create the same key.
@@ -696,10 +692,8 @@
shm_object = vm_pager_allocate(shm_use_phys ? OBJT_PHYS : OBJT_SWAP,
0, size, VM_PROT_DEFAULT, 0, cred);
if (shm_object == NULL) {
-#ifdef CONTAINERS
rusage_sub(td->td_proc, RUSAGE_NSHM, 1);
rusage_sub(td->td_proc, RUSAGE_SHMSIZE, size);
-#endif
return (ENOMEM);
}
VM_OBJECT_LOCK(shm_object);
==== //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#21 (text+ko) ====
@@ -576,9 +576,7 @@
tty_lock(tp);
tty_rel_gone(tp);
-#ifdef CONTAINERS
rusage_sub(td->td_proc, RUSAGE_NPTS, 1);
-#endif
/*
* Open of /dev/ptmx or /dev/ptyXX changes the type of file
@@ -717,34 +715,28 @@
int
pts_alloc(int fflags, struct thread *td, struct file *fp)
{
- int unit, ok;
+ int unit, ok, error;
struct tty *tp;
struct pts_softc *psc;
struct proc *p = td->td_proc;
struct uidinfo *uid = td->td_ucred->cr_ruidinfo;
/* Resource limiting. */
-#ifdef CONTAINERS
- ok = !rusage_add(p, RUSAGE_NPTS, 1);
- if (!ok)
+ error = rusage_add(p, RUSAGE_NPTS, 1);
+ if (error != 0)
return (EAGAIN);
-#endif
PROC_LOCK(p);
ok = chgptscnt(uid, 1, lim_cur(p, RLIMIT_NPTS));
PROC_UNLOCK(p);
if (!ok) {
-#ifdef CONTAINERS
rusage_sub(p, RUSAGE_NPTS, 1);
-#endif
return (EAGAIN);
}
/* Try to allocate a new pts unit number. */
unit = alloc_unr(pts_pool);
if (unit < 0) {
-#ifdef CONTAINERS
rusage_sub(p, RUSAGE_NPTS, 1);
-#endif
chgptscnt(uid, -1, 0);
return (EAGAIN);
}
@@ -775,25 +767,21 @@
pts_alloc_external(int fflags, struct thread *td, struct file *fp,
struct cdev *dev, const char *name)
{
- int ok;
+ int ok, error;
struct tty *tp;
struct pts_softc *psc;
struct proc *p = td->td_proc;
struct uidinfo *uid = td->td_ucred->cr_ruidinfo;
/* Resource limiting. */
-#ifdef CONTAINERS
- ok = !rusage_add(p, RUSAGE_NPTS, 1);
- if (!ok)
+ error = rusage_add(p, RUSAGE_NPTS, 1);
+ if (error != 0)
return (EAGAIN);
-#endif
PROC_LOCK(p);
ok = chgptscnt(uid, 1, lim_cur(p, RLIMIT_NPTS));
PROC_UNLOCK(p);
if (!ok) {
-#ifdef CONTAINERS
rusage_sub(p, RUSAGE_NPTS, 1);
-#endif
return (EAGAIN);
}
==== //depot/projects/soc2009/trasz_limits/sys/kern/uipc_sockbuf.c#7 (text+ko) ====
@@ -291,9 +291,7 @@
struct thread *td)
{
rlim_t sbsize_limit;
-#ifdef CONTAINER
int error;
-#endif
SOCKBUF_LOCK_ASSERT(sb);
@@ -310,21 +308,16 @@
PROC_LOCK(td->td_proc);
sbsize_limit = lim_cur(td->td_proc, RLIMIT_SBSIZE);
PROC_UNLOCK(td->td_proc);
- } else
- sbsize_limit = RLIM_INFINITY;
-#ifdef CONTAINER
- if (td != NULL) {
error = rusage_add(td->td_proc, RUSAGE_SBSIZE, cc);
if (error != 0)
return (0);
- } else
+ } else {
+ sbsize_limit = RLIM_INFINITY;
rusage_add_cred(so->so_cred, RUSAGE_SBSIZE, cc);
-#endif
+ }
if (!chgsbsize(so->so_cred->cr_uidinfo, &sb->sb_hiwat, cc,
sbsize_limit)) {
-#ifdef CONTAINER
rusage_sub_cred(so->so_cred, RUSAGE_SBSIZE, cc);
-#endif
return (0);
}
sb->sb_mbmax = min(cc * sb_efficiency, sb_max);
@@ -353,9 +346,7 @@
{
sbflush_internal(sb);
-#ifdef CONTAINERS
rusage_sub_cred(so->so_cred, RUSAGE_SBSIZE, sb->sb_hiwat);
-#endif
(void)chgsbsize(so->so_cred->cr_uidinfo, &sb->sb_hiwat, 0,
RLIM_INFINITY);
sb->sb_mbmax = 0;
==== //depot/projects/soc2009/trasz_limits/sys/kern/uipc_socket.c#18 (text+ko) ====
@@ -323,18 +323,14 @@
#endif
mtx_unlock(&so_global_mtx);
if (so->so_rcv.sb_hiwat) {
-#ifdef CONTAINERS
rusage_sub_cred(so->so_cred, RUSAGE_SBSIZE,
so->so_rcv.sb_hiwat);
-#endif
(void)chgsbsize(so->so_cred->cr_uidinfo,
&so->so_rcv.sb_hiwat, 0, RLIM_INFINITY);
}
if (so->so_snd.sb_hiwat) {
-#ifdef CONTAINERS
rusage_sub_cred(so->so_cred, RUSAGE_SBSIZE,
so->so_snd.sb_hiwat);
-#endif
(void)chgsbsize(so->so_cred->cr_uidinfo,
&so->so_snd.sb_hiwat, 0, RLIM_INFINITY);
}
==== //depot/projects/soc2009/trasz_limits/sys/kern/uipc_usrreq.c#10 (text+ko) ====
@@ -801,9 +801,7 @@
SOCKBUF_LOCK(&so2->so_snd);
so2->so_snd.sb_mbmax += unp->unp_mbcnt - mbcnt;
newhiwat = so2->so_snd.sb_hiwat + unp->unp_cc - sbcc;
-#ifdef CONTAINERS
rusage_add_cred(so2->so_cred, RUSAGE_SBSIZE, newhiwat - so2->so_snd.sb_hiwat);
-#endif
(void)chgsbsize(so2->so_cred->cr_uidinfo, &so2->so_snd.sb_hiwat,
newhiwat, RLIM_INFINITY);
sowwakeup_locked(so2);
@@ -979,9 +977,7 @@
SOCKBUF_LOCK(&so->so_snd);
newhiwat = so->so_snd.sb_hiwat - (sbcc - unp2->unp_cc);
-#ifdef CONTAINERS
rusage_add_cred(so->so_cred, RUSAGE_SBSIZE, newhiwat - so->so_snd.sb_hiwat);
-#endif
(void)chgsbsize(so->so_cred->cr_uidinfo, &so->so_snd.sb_hiwat,
newhiwat, RLIM_INFINITY);
so->so_snd.sb_mbmax -= mbcnt_delta;
==== //depot/projects/soc2009/trasz_limits/sys/kern/vfs_vnops.c#20 (text+ko) ====
@@ -1357,11 +1357,9 @@
}
PROC_UNLOCK(td->td_proc);
#endif
-#ifdef CONTAINERS
if (rusage_set(td->td_proc, RUSAGE_FSIZE,
(uoff_t)uio->uio_offset + uio->uio_resid))
return (EFBIG);
-#endif
return (0);
}
==== //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#14 (text+ko) ====
@@ -212,9 +212,7 @@
PROC_LOCK(curproc);
UIDINFO_VMSIZE_LOCK(uip);
if (
-#ifdef CONTAINERS
rusage_add(curproc, RUSAGE_SWAP, incr) &&
-#endif
#ifndef HRL
(overcommit & SWAP_RESERVE_RLIMIT_ON) != 0 &&
uip->ui_vmsize + incr > lim_cur(curproc, RLIMIT_SWAP) &&
@@ -248,9 +246,7 @@
swap_reserved += incr;
mtx_unlock(&sw_dev_mtx);
-#ifdef CONTAINERS
rusage_add_force(curproc, RUSAGE_SWAP, incr);
-#endif
uip = curthread->td_ucred->cr_ruidinfo;
PROC_LOCK(curproc);
@@ -293,9 +289,7 @@
uip->ui_vmsize -= decr;
UIDINFO_VMSIZE_UNLOCK(uip);
-#ifdef CONTAINERS
rusage_sub_cred(cred, RUSAGE_SWAP, decr);
-#endif
}
static void swapdev_strategy(struct buf *, struct swdevt *sw);
==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_glue.c#9 (text+ko) ====
@@ -207,10 +207,8 @@
}
#endif
PROC_UNLOCK(curproc);
-#ifdef CONTAINERS
if (rusage_set(curproc, RUSAGE_MEMLOCK, nsize))
return (ENOMEM);
-#endif
#if 0
/*
* XXX - not yet
@@ -226,11 +224,9 @@
#endif
error = vm_map_wire(&curproc->p_vmspace->vm_map, start, end,
VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);
-#ifdef CONTAINERS
if (error != KERN_SUCCESS)
rusage_sub(curproc, RUSAGE_MEMLOCK,
ptoa(pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map))));
-#endif
/*
* Return EFAULT on error to match copy{in,out}() behaviour
* rather than returning ENOMEM like mlock() would.
@@ -247,10 +243,8 @@
trunc_page((vm_offset_t)addr), round_page((vm_offset_t)addr + len),
VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES);
-#ifdef CONTAINERS
rusage_set(curproc, RUSAGE_MEMLOCK,
ptoa(pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map))));
-#endif
}
/*
>>> TRUNCATED FOR MAIL (1000 lines) <<<