From owner-p4-projects Sun Feb 16 2:12:18 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42C5D37B405; Sun, 16 Feb 2003 02:12:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C5F1A37B401 for ; Sun, 16 Feb 2003 02:12:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 604AE43F3F for ; Sun, 16 Feb 2003 02:12:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1GACGbv097650 for ; Sun, 16 Feb 2003 02:12:16 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1GACFqD097647 for perforce@freebsd.org; Sun, 16 Feb 2003 02:12:15 -0800 (PST) Date: Sun, 16 Feb 2003 02:12:15 -0800 (PST) Message-Id: <200302161012.h1GACFqD097647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 25268 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25268 Change 25268 by jmallett@jmallett_dalek on 2003/02/16 02:11:46 Add a printf for if we actually get anywhere. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#4 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#4 (text+ko) ==== @@ -55,4 +55,5 @@ * Initialise the ARCBIOS stuff. */ arcbios_init(MIPS_PHYS_TO_KSEG0(0x00001000)); + printf("See MIPS Run\n"); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Feb 16 3:10:31 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5321537B401; Sun, 16 Feb 2003 03:10:29 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A6F7637B40B for ; Sun, 16 Feb 2003 03:10:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55A2043F3F for ; Sun, 16 Feb 2003 03:10:28 -0800 (PST) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1GBASbv001317 for ; Sun, 16 Feb 2003 03:10:28 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1GBAR3U001313 for perforce@freebsd.org; Sun, 16 Feb 2003 03:10:27 -0800 (PST) Date: Sun, 16 Feb 2003 03:10:27 -0800 (PST) Message-Id: <200302161110.h1GBAR3U001313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 25271 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25271 Change 25271 by des@des.at.des.thinksec.com on 2003/02/16 03:09:51 Avoid a NULL pointer dereference if PAM_CONV is non-NULL but its conv member is NULL. Affected files ... .. //depot/projects/openpam/lib/pam_vprompt.c#9 edit Differences ... ==== //depot/projects/openpam/lib/pam_vprompt.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_vprompt.c#8 $ + * $P4: //depot/projects/openpam/lib/pam_vprompt.c#9 $ */ #include @@ -66,7 +66,7 @@ r = pam_get_item(pamh, PAM_CONV, (const void **)&conv); if (r != PAM_SUCCESS) RETURNC(r); - if (conv == NULL) { + if (conv == NULL || conv->conv == NULL) { openpam_log(PAM_LOG_ERROR, "no conversation function"); RETURNC(PAM_SYSTEM_ERR); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Feb 16 6:41:56 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71D5537B405; Sun, 16 Feb 2003 06:41:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 09CD037B401 for ; Sun, 16 Feb 2003 06:41:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A2C843F85 for ; Sun, 16 Feb 2003 06:41:50 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1GEfobv014931 for ; Sun, 16 Feb 2003 06:41:50 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1GEfnD5014928 for perforce@freebsd.org; Sun, 16 Feb 2003 06:41:49 -0800 (PST) Date: Sun, 16 Feb 2003 06:41:49 -0800 (PST) Message-Id: <200302161441.h1GEfnD5014928@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov Subject: PERFORCE change 25283 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25283 Change 25283 by tzukanov@tzukanov_antares on 2003/02/16 06:40:57 Post-IFC fixes. Affected files ... .. //depot/projects/s390/lib/libc/s390/Makefile.inc#2 edit .. //depot/projects/s390/lib/libc/s390/_fpmath.h#1 add .. //depot/projects/s390/lib/libc/s390/gen/Makefile.inc#3 edit .. //depot/projects/s390/lib/libc/s390/gen/infinity.c#4 edit .. //depot/projects/s390/lib/libc/s390/gen/isinf.S#2 delete .. //depot/projects/s390/lib/libc/s390x/_fpmath.h#1 add .. //depot/projects/s390/lib/libc/s390x/gen/Makefile.inc#2 edit .. //depot/projects/s390/lib/libc/s390x/gen/infinity.c#2 edit .. //depot/projects/s390/lib/libc/s390x/gen/isinf.S#2 delete .. //depot/projects/s390/sys/s390/conf/GENERIC#7 edit .. //depot/projects/s390/sys/s390/include/_types.h#2 edit .. //depot/projects/s390/sys/s390/include/float.h#2 edit .. //depot/projects/s390/sys/s390/s390/pmap.c#8 edit .. //depot/projects/s390/sys/s390x/include/_types.h#2 edit .. //depot/projects/s390/sys/s390x/include/float.h#2 edit Differences ... ==== //depot/projects/s390/lib/libc/s390/Makefile.inc#2 (text+ko) ==== ==== //depot/projects/s390/lib/libc/s390/gen/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD: src/lib/libc/s390/gen/Makefile.inc,v 1.0 2002/07/06 06:45:32 tzukanov Exp $ SRCS+= _ctx_start.S flt_rounds.S fabs.S frexp.S \ - infinity.c isinf.S ldexp.S makecontext.c modf.S \ + infinity.c ldexp.S makecontext.c modf.S \ setjmp.S signalcontext.c ==== //depot/projects/s390/lib/libc/s390/gen/infinity.c#4 (text+ko) ==== @@ -4,3 +4,6 @@ /* Bytes for +Infinity on a S/390. */ const union __infinity_un __infinity = {{0x7f, 0xf0, 0, 0, 0, 0, 0, 0}}; + +/* bytes for NaN */ +const union __nan_un __nan = { { 0xff, 0xc0, 0, 0 } }; ==== //depot/projects/s390/lib/libc/s390x/gen/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD: src/lib/libc/s390/gen/Makefile.inc,v 1.0 2002/07/06 06:45:32 tzukanov Exp $ SRCS+= _ctx_start.S getcontext.S fabs.S frexp.S \ - infinity.c isinf.S ldexp.S makecontext.c modf.S \ + infinity.c ldexp.S makecontext.c modf.S \ setjmp.S swapcontext.c ==== //depot/projects/s390/lib/libc/s390x/gen/infinity.c#2 (text+ko) ==== ==== //depot/projects/s390/sys/s390/conf/GENERIC#7 (text+ko) ==== @@ -49,7 +49,7 @@ #options SMP -options SCHED_4BSD # 4BSD scheduler +options SCHED_4BSD # 4BSD scheduler options FFS # Berkeley Fast Filesystem options SOFTUPDATES options PROCFS # Process filesystem (requires PSEUDOFS) ==== //depot/projects/s390/sys/s390/include/_types.h#2 (text+ko) ==== @@ -64,6 +64,8 @@ */ typedef unsigned long __clock_t; /* clock()... */ typedef __int32_t __critical_t; +typedef float __float_t; +typedef double __double_t; typedef __int32_t __intfptr_t; typedef __int64_t __intmax_t; typedef __int32_t __intptr_t; ==== //depot/projects/s390/sys/s390/include/float.h#2 (text+ko) ==== @@ -55,6 +55,8 @@ #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS __flt_rounds() +#define FLT_EVAL_METHOD 1 +#define DECIMAL_DIG 35 #define FLT_MANT_DIG 24 /* p */ #define FLT_EPSILON 1.19209290E-7F /* b**(1-p) */ ==== //depot/projects/s390/sys/s390/s390/pmap.c#8 (text+ko) ==== @@ -106,7 +106,6 @@ static boolean_t pmap_initialized = FALSE; -static vm_object_t kptobj; /* contains kernel page table pages */ static unsigned nkptp; vm_offset_t kernel_vm_end; @@ -996,9 +995,6 @@ CTR2(KTR_PMAP, "pmap_init: spa = %x, epa = %x", spa, epa); - /* Object for kernel page table pages. */ - kptobj = vm_object_allocate(OBJT_DEFAULT, NKPTP); - /* Allocate memory for random pmap structures. */ for (i = 0; i < vm_page_array_size; i++) { vm_page_t m; ==== //depot/projects/s390/sys/s390x/include/_types.h#2 (text+ko) ==== @@ -56,6 +56,8 @@ */ typedef __int32_t __clock_t; /* clock()... */ typedef __int64_t __critical_t; +typedef float __float_t; +typedef double __double_t; typedef __int64_t __intfptr_t; typedef __int64_t __intmax_t; typedef __int64_t __intptr_t; ==== //depot/projects/s390/sys/s390x/include/float.h#2 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Feb 16 20:39:27 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DBE337B405; Sun, 16 Feb 2003 20:39:24 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4492B37B401; Sun, 16 Feb 2003 20:39:24 -0800 (PST) Received: from aslan.scsiguy.com (mail.scsiguy.com [63.229.232.106]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FC4A43F3F; Sun, 16 Feb 2003 20:39:23 -0800 (PST) (envelope-from gibbs@scsiguy.com) Received: from aslan.scsiguy.com (aslan.scsiguy.com [63.229.232.106]) by aslan.scsiguy.com (8.12.6/8.12.5) with ESMTP id h1H4cgOU039022; Sun, 16 Feb 2003 21:38:42 -0700 (MST) (envelope-from gibbs@scsiguy.com) Date: Sun, 16 Feb 2003 21:38:42 -0700 From: "Justin T. Gibbs" To: Sam Leffler , Perforce Change Reviews Subject: Re: PERFORCE change 24844 for review Message-ID: <47870000.1045456722@aslan.scsiguy.com> In-Reply-To: <200302082030.h18KUuR9063864@repoman.freebsd.org> References: <200302082030.h18KUuR9063864@repoman.freebsd.org> X-Mailer: Mulberry/3.0.1 (Linux/x86) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG > http://perforce.freebsd.org/chv.cgi?CH=24844 > > Change 24844 by sam@sam_ebb on 2003/02/08 12:30:08 > > bus_dma'd em driver (works on x86, not on sparc) > replace rx logic with jumbo buffers (needs more work) There are lots of things that are a bit wierd about how this was bus dma'ed... o The TX and RX rings are allocated separately instead of as a single chunk. While on the x86, this doesn't matter since each chunk is exactly a PAGE_SIZE, on Alpha, this will likely result in 4K of wasted space allocated for each ring due to its larger page size. I don't know that any implementation will track these kinds of allocations at sub-page granularity, but if tag's size were not hardcoded, at least the implementaiton would have a chance to use the space. o The TX/RX rings are not synced when updated prior to informing the adapter of a change in the queues. I believe that NetBSD has the concept of requesting that stuff be mapped in "consistent memory", but the allocator need not honor that. If the consistent mapping succeeds, sync operations cost either nothing or are significantly cheaper. o bus dmamaps have a lifetime of a single packet. While loading a map is usually cheap, allocating a map may be very costly. The implementation may use the allocation of a map as a hint to increase its mapping space, bounce buffer pool, or to perform some other action that will decrease the chance that a load will block should all maps currently allocated against the tag be used at once. The map may be a fairly large object depending on the needs of the implementation. I would suggest changing the maps to have the same lifetime as the TX descriptors. o The driver allocates a duplicate "S/G list" for each tx descriptor. If the driver were converted to a "continuation style" and had the "bottom half" of packet processing performed in the callback, the mappings could be placed directly into the TX descriptors. One of my original complaints to thorpej about his bus dma implmentation was this forced "extra copy" of the mapping information in a format that neither the drivers nor most implementations (Not in IOMMU or SGMAP format) could directly pass on to hardware. On devices that can support large S/G lists, this can make dmamaps very costly (at 16bytes/element and many I/O devices supporting a list of 256 or more elements, each map could require a page or more!). The callback allows the implementation to reuse this space as soon as the callback returns. Having drivers make a copy that they cannot directly use negates this benefit. I really need to go document this stuff... -- Justin To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Feb 16 20:52:28 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8C6F37B405; Sun, 16 Feb 2003 20:52:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E15437B401; Sun, 16 Feb 2003 20:52:26 -0800 (PST) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78BF843F75; Sun, 16 Feb 2003 20:52:25 -0800 (PST) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.6/8.12.3) with ESMTP id h1H4qO3Y026734; Sun, 16 Feb 2003 21:52:24 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 16 Feb 2003 21:51:48 -0700 (MST) Message-Id: <20030216.215148.00302032.imp@bsdimp.com> To: gibbs@scsiguy.com Cc: sam@freebsd.org, perforce@freebsd.org Subject: Re: PERFORCE change 24844 for review From: "M. Warner Losh" In-Reply-To: <47870000.1045456722@aslan.scsiguy.com> References: <200302082030.h18KUuR9063864@repoman.freebsd.org> <47870000.1045456722@aslan.scsiguy.com> X-Mailer: Mew version 2.1 on Emacs 21.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message: <47870000.1045456722@aslan.scsiguy.com> "Justin T. Gibbs" writes: : I really need to go document this stuff... No arguments with that... Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Feb 16 23:16:51 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F8F437B405; Sun, 16 Feb 2003 23:16:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A85937B401 for ; Sun, 16 Feb 2003 23:16:47 -0800 (PST) Received: from ebb.errno.com (ebb.errno.com [66.127.85.87]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3F0443F85 for ; Sun, 16 Feb 2003 23:16:46 -0800 (PST) (envelope-from sam@errno.com) Received: from melange (melange.errno.com [66.127.85.82]) (authenticated bits=0) by ebb.errno.com (8.12.5/8.12.1) with ESMTP id h1H7GjnN029025 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO); Sun, 16 Feb 2003 23:16:46 -0800 (PST)?g (envelope-from sam@errno.com)œ X-Authentication-Warning: ebb.errno.com: Host melange.errno.com [66.127.85.82] claimed to be melange Message-ID: <311a01c2d654$87c7cb50$52557f42@errno.com> From: "Sam Leffler" To: "Justin T. Gibbs" , "Perforce Change Reviews" References: <200302082030.h18KUuR9063864@repoman.freebsd.org> <47870000.1045456722@aslan.scsiguy.com> Subject: Re: PERFORCE change 24844 for review Date: Sun, 16 Feb 2003 23:16:45 -0800 Organization: Errno Consulting MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 5.50.4807.1700 X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4807.1700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG > > http://perforce.freebsd.org/chv.cgi?CH=24844 > > > > Change 24844 by sam@sam_ebb on 2003/02/08 12:30:08 > > > > bus_dma'd em driver (works on x86, not on sparc) > > replace rx logic with jumbo buffers (needs more work) > > There are lots of things that are a bit wierd about how this > was bus dma'ed... > > o The TX and RX rings are allocated separately instead of as a > single chunk. While on the x86, this doesn't matter > since each chunk is exactly a PAGE_SIZE, on Alpha, this will > likely result in 4K of wasted space allocated for each ring > due to its larger page size. I don't know that any implementation > will track these kinds of allocations at sub-page granularity, > but if tag's size were not hardcoded, at least the implementaiton > would have a chance to use the space. > This was a straight transcription from the previous code. I don't recall how much memory is involved but I intentionally allocated them separately to minimize risk of contigmalloc failure due to fragmentation. > o The TX/RX rings are not synced when updated prior to informing > the adapter of a change in the queues. I believe that NetBSD has > the concept of requesting that stuff be mapped in "consistent memory", > but the allocator need not honor that. If the consistent mapping succeeds, > sync operations cost either nothing or are significantly cheaper. > Yes, I mentioned to some other folks that I hadn't sync'd the descriptor/ring. Ideally the sync should be on a per-descriptor basis and I wasn't sure if it would be better to break things up to avoid sync'ing the entire ring. Interestingly there's been discussion recently on the netbsd mailing lists about devices that assume cache-coherent bus implementations (e.g. i82557) and also about adding support for non-cached memory. The x86 is a poor platform to develop on for this sort of stuff; it's time for me to get a sparc test machine. > o bus dmamaps have a lifetime of a single packet. While loading a map > is usually cheap, allocating a map may be very costly. The implementation > may use the allocation of a map as a hint to increase its mapping space, > bounce buffer pool, or to perform some other action that will decrease > the chance that a load will block should all maps currently allocated > against the tag be used at once. The map may be a fairly large object > depending on the needs of the implementation. I would suggest changing > the maps to have the same lifetime as the TX descriptors. > Ok. I believe this follows techniques taken from netbsd which may not be appropriate. I'll look at it. Since there haven't been any equivalent drivers to crib from for freebsd most times I've referred to netbsd or openbsd drivers. > o The driver allocates a duplicate "S/G list" for each tx descriptor. > If the driver were converted to a "continuation style" and had the > "bottom half" of packet processing performed in the callback, the > mappings could be placed directly into the TX descriptors. One of my > original complaints to thorpej about his bus dma implmentation was > this forced "extra copy" of the mapping information in a format that > neither the drivers nor most implementations (Not in IOMMU or SGMAP > format) could directly pass on to hardware. On devices that can support > large S/G lists, this can make dmamaps very costly (at 16bytes/element > and many I/O devices supporting a list of 256 or more elements, each > map could require a page or more!). The callback allows the > implementation to reuse this space as soon as the callback returns. > Having drivers make a copy that they cannot directly use negates > this benefit. > For network drivers the size of the s/g list is typically very small. I'll have to look, but moving the logic to the callback routine may require shuffling state around. I know it has consequences for the crypto drivers (ubsec, hifn). Thanks for the comments. Sam To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Feb 17 4:55:20 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3927337B405; Mon, 17 Feb 2003 04:55:19 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BECA937B401 for ; Mon, 17 Feb 2003 04:55:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59FA843FA3 for ; Mon, 17 Feb 2003 04:55:18 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1HCtIbv096461 for ; Mon, 17 Feb 2003 04:55:18 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1HCtHFw096458 for perforce@freebsd.org; Mon, 17 Feb 2003 04:55:17 -0800 (PST) Date: Mon, 17 Feb 2003 04:55:17 -0800 (PST) Message-Id: <200302171255.h1HCtHFw096458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 25326 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25326 Change 25326 by jmallett@jmallett_dalek on 2003/02/17 04:54:39 As far as I can tell, MIPS doesn't tend to use crtfastmath. Affected files ... .. //depot/projects/mips/gnu/lib/csu/Makefile#3 edit Differences ... ==== //depot/projects/mips/gnu/lib/csu/Makefile#3 (text+ko) ==== @@ -27,7 +27,7 @@ TGTOBJS= crtsavres.o SRCS+= crtsavres.asm .endif -.if ${TARGET_ARCH} == "alpha" || ${TARGET_ARCH} == "mips" || ${TARGET_ARCH} == "sparc64" +.if ${TARGET_ARCH} == "alpha" || ${TARGET_ARCH} == "sparc64" TGTOBJS= crtfastmath.o SRCS+= crtfastmath.c .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Feb 17 12:53:37 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC3C337B405; Mon, 17 Feb 2003 12:53:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6540837B401 for ; Mon, 17 Feb 2003 12:53:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE04D43F93 for ; Mon, 17 Feb 2003 12:53:09 -0800 (PST) (envelope-from chris@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1HKr9bv026546 for ; Mon, 17 Feb 2003 12:53:09 -0800 (PST) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1HKr5aH026543 for perforce@freebsd.org; Mon, 17 Feb 2003 12:53:05 -0800 (PST) Date: Mon, 17 Feb 2003 12:53:05 -0800 (PST) Message-Id: <200302172053.h1HKr5aH026543@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 25345 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25345 Change 25345 by chris@chris_holly on 2003/02/17 12:52:15 Integ. Affected files ... .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/faq/book.sgml#8 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#6 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/Makefile#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/checkpoint/networks.pic#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#12 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/console-server/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributing/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributing/article.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#15 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/euro/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hats/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hubs/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hubs/article.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/branches.pic#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/smp/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/solid-state/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vinum/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/locking/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/pci/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#13 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#11 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#14 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#12 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#12 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#14 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/README#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/addkey.sh#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/alex.key#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dougb.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/foxfair.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/harti.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/rushani.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/scottl.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/seanc.key#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#12 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#15 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/authors.ent#10 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/contributors/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/multi-os/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/backups/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/colophon.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/porters-handbook/freebsd.dsl#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/bc.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/biff.1#6 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/getopt.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/groff.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/less.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lesskey.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lex.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lorder.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/make.1#6 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/netstat.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/passwd.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_add.1#6 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rcp.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/soelim.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/strip.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tar.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tcsh.1#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/troff.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dhclient.conf.5#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dhclient.leases.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dhcp-eval.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dhcp-options.5#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/keycap.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/make.conf.5#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man6/grdc.6#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/camcontrol.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dhclient-script.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dhclient.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fdisk.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pciconf.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/vinum.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/Makefile#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/acl.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/buf.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/extattr.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/malloc.9#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/microseq.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/sleep.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/spl.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/style.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/timeout.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/zone.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/share/sgml/authors.ent#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/trustedbsd/doc/share/mk/doc.docbook.mk#6 integrate .. //depot/projects/trustedbsd/doc/share/mk/doc.images.mk#4 integrate .. //depot/projects/trustedbsd/doc/share/sgml/freebsd.dsl#5 integrate .. //depot/projects/trustedbsd/doc/share/sgml/man-refs.ent#14 integrate Differences ... ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/faq/book.sgml#8 (text+ko) ==== @@ -2,10 +2,10 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project -$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.32 2003/01/10 15:36:47 mheinen Exp $ -$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.400 2003/01/10 14:53:50 mheinen Exp $ +$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.33 2003/02/04 00:34:25 mheinen Exp $ +$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.404 2003/02/01 16:35:08 mheinen Exp $ - basiert auf: 1.506 + basiert auf: 1.510 --> @@ -24,6 +24,14 @@ %bookinfo; %mailing-lists; + + + + + + + + ]> @@ -44,7 +52,7 @@ - $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.400 2003/01/10 14:53:50 mheinen Exp $ + $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.404 2003/02/01 16:35:08 mheinen Exp $ 1995 @@ -129,8 +137,9 @@ FreeBSD ist, kurz gesagt, ein UN*X-ähnliches - Betriebssystem für die Plattformen i386 und - Alpha/AXP, das auf der 4.4BSD-Lite-Release + Betriebssystem für die Plattformen i386, IA-64, PC-98, + Alpha/AXP und UltraSPARC, das auf der + 4.4BSD-Lite-Release der University of California at Berkeley (UCB) basiert; außerdem flossen einige Erweiterungen aus der 4.4BSD-Lite2-Release mit ein. Es basiert @@ -250,7 +259,7 @@ Netzwerk-Server, und so ziemlich alles andere, was Sie sich wünschen können. Die meisten dieser Anwendungen sind in der Ports + url="http://www.FreeBSD.org/ports/">Ports Kollektion verfügbar. Wenn Sie Anwendung benutzen müssen, die es nur @@ -325,13 +334,28 @@ Welches ist die aktuelle FreeBSD-Version? + + + Momentan gibt es zwei Entwicklungszweige auf denen + FreeBSD-Releases erstellt werden. Die 4.X-Releases werden + auf dem -STABLE-Zweig erstellt und die + 5.X-RELEASES werden auf dem -CURRENT-Zweig + erstellt. + Version &rel.current; - ist die aktuelle, RELEASE Version; sie - ist im &rel.current.date; erschienen. Gleichzeitig ist - sie auch die aktuelle - STABLE-Version. + ist das aktuelle Release aus dem + -CURRENT-Zweig und ist im + &rel.current.date; erschienen. + Version &rel2.current; + ist das aktuelle Release aus dem + -STABLE-Zweig und ist im + &rel2.current.date; erschienen. Kurz erläutert, -STABLE ist für ISPs und andere Benutzer gedacht, die mehr Wert @@ -352,6 +376,11 @@ FreeBSD-STABLE), aber das erfordert ein erhöhtes Engagement, da die Sourcen sich ständig verändern. + + Weitere Informationen über Releases entnehmen + Sie der Seite Release + Engineering des FreeBSD Webauftritts. @@ -565,11 +594,11 @@ des Projekts und darüber, wem es erlaubt sein soll, Code zum Quellbaum hinzuzufügen, werden innerhalb eines Core + url="http://www.de.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/article.html#STAFF-CORE">Core Team von etwa 9 Personen geführt. Es gibt ein weitaus größeres Team von über 200 Committers, + url="http://www.de.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/article.html#STAFF-COMMITTERS">Committers, die dazu autorisiert sind, Änderungen am FreeBSD Quellbaum durchzuführen. @@ -601,10 +630,15 @@ - Die aktuelle Ausgabe von 4-STABLE, &rel.current;-RELEASE, + Das aktuelle Release von 5.X, &rel.current;-RELEASE finden Sie im Verzeichnis - &rel.current;-RELEASE. + URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">&rel.current;-RELEASE directory. + + + + Das aktuelle Release von 4-STABLE, + &rel2.current;-RELEASE finden Sie im Verzeichnis &rel2.current;-RELEASE directory. @@ -636,7 +670,7 @@ - Der Artikel Mirroring + Der Artikel Mirroring FreeBSD erklärt, wie ein FreeBSD-Spiegel eingerichtet wird. @@ -730,7 +764,7 @@ Im Zuge des FreeBSD Projekts sind diverse gute Dokumente entstanden, die unter der folgenden URL abgerufen werden können: http://www.FreeBSD.org/docs.html. + url="http://www.FreeBSD.org/docs.html">http://www.FreeBSD.org/docs.html. Die Dokumente stehen auch als Pakete, die Sie leicht installieren können, zur Verfügung. In den nächsten Abschnitten erfahren Sie mehr über diese @@ -1451,7 +1485,7 @@ Wenn Sie eine modifizierte Ausgabe erstellen wollen, finden Sie eine Anleitung im Artikel + url="http://www.de.FreeBSD.org/doc/en_US.ISO8859-1/articles/releng/article.html"> FreeBSD Release Engineering. @@ -2546,9 +2580,9 @@ zu erreichen, werden bestimmte Dienste und Features entweder aktiviert oder deaktiviert. Die Details sind im Abschnitt Security Profile + url="http://www.de.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/install-post.html#SECURITYPROFILE">Security Profile des Handbuch-Kapitels + url="http://www.de.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/install-post.html"> Post-Installation enthalten. @@ -2601,7 +2635,7 @@ Sie unbedingt die Hardware Notes und die + URL="http://www.FreeBSD.org/search/#mailinglists"> Archive der Mailinglisten durchsehen, bevor Sie nach der neuesten/besten Hardware fragen. Normalerweise gab es kurz zuvor eine Diskussion über genau die @@ -4033,10 +4067,10 @@ Falls das einzige Problem ist, daß er schrecklich langsam ist, dann sollte Sie versuchen, den Setting + url="http://www.de.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/printing-intro-setup.html#PRINTING-PARALLEL-PORT-MODE">Setting the Communication Mode for the Parallel Port zu ändern, wie es im Kapitel Printing + url="http://www.de.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/printing-intro-setup.html">Printing des Handbuchs beschrieben ist. @@ -5893,10 +5927,10 @@ &prompt.root; pkg_version -c > /tmp/myscript Das so erzeugte Script muß - manuell geändert werden, bevor es benutzt wird. Die - aktuelle Version von &man.pkg.version.1; erzwingt dies, + manuell geändert werden, bevor es benutzt wird. + Neuere Versionen von &man.pkg.version.1; erzwingen dies, indem sie ein &man.exit.1; an den Anfang des Scripts - setzt. + setzen. Sie sollten die Ausgaben des Scripts abspeichern, da sie Ihnen melden werden, welche Ports von den dem gerade @@ -5908,6 +5942,12 @@ Ports neu übersetzt werden, damit sie die neue Library benutzen. + + Ab FreeBSD 5.0 steht die Option + in &man.pkg.version.1; nicht + mehr zur Verfügung. + + Falls Sie über genügend freien Plattenplatz verfügen, können Sie diesen Prozeß mit portupgrade automatisieren. @@ -6194,7 +6234,7 @@ Lesen Sie das Tutorial zur Festplattenformatierung unter www.de.FreeBSD.org. + url="http://www.de.FreeBSD.org/doc/en_US.ISO8859-1/articles/formatting-media/">www.de.FreeBSD.org. @@ -6225,7 +6265,7 @@ damit Sie in der Lage sind, das alte und das neue System abwechselnd zu starten, nachdem der Kopiervorgang abgeschlossen ist. Im Formatting-Media + url="http://www.de.FreeBSD.org/doc/en_US.ISO8859-1/articles/formatting-media/">Formatting-Media Tutorial finden Sie weitere Informationen zu diesen Schritten. @@ -8474,7 +8514,7 @@ Weitere Informationen über Versionsnummern und die verschiedenen Entwicklungszweige enthält der Artikel - Release + Release Engineering. @@ -9825,7 +9865,7 @@ die Matrox G200/G400, ATI Rage 128/Radeon, oder 3dfx Voodoo 3, 4, 5, und Banshee einsetzen, erhalten Sie weitere Informationen auf der Webseite XFree86-4 + url="http://people.FreeBSD.org/~anholt/dri/">XFree86-4 Direct Rendering on FreeBSD. Wenn Sie XFree86 in der Version 3.3 einsetzen, erhalten Sie eingeschränkte Unterstützung von die @@ -10102,7 +10142,7 @@ Sie Ihre &man.exports.5; und lesen das Kapitel NFS im Handbuch, speziell den Abschnitt Konfiguration. + url="http://www.de.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/nfs.html#CONFIGURING-NFS">Konfiguration. @@ -14089,7 +14129,7 @@ Genauere Informationen finden Sie im Artikel + url="http://www.de.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributing/article.html"> Contributing to FreeBSD. Wie können Hilfe immer gut gebrauchen! @@ -14158,7 +14198,7 @@ Eine Anleitung dazu finden Sie im Artikel + url="http://www.de.FreeBSD.org/doc/en_US.ISO8859-1/articles/releng/article.html"> FreeBSD Release Engineering. @@ -14260,7 +14300,7 @@ Lesen Sie bitte den Artikel + url="http://www.de.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributing/article.html"> Contributing to FreeBSD. Und Danke, daß Sie darüber ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.4 2003/01/12 19:19:31 mheinen Exp $ - $FreeBSDde: de-docproj/books/handbook/advanced-networking/chapter.sgml,v 1.19 2003/01/12 19:04:26 mheinen Exp $ - basiert auf: 1.195 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.6 2003/02/16 18:24:06 mheinen Exp $ + $FreeBSDde: de-docproj/books/handbook/advanced-networking/chapter.sgml,v 1.27 2003/02/16 18:02:53 mheinen Exp $ + basiert auf: 1.196 --> @@ -14,10 +14,11 @@ Johann Kois Übersetzt von - + + Weiterführende Netzwerkthemen @@ -39,38 +40,35 @@ - Wissen, wie Sie mit FreeBSD eine Bridge einrichten. + Eine Bridge unter FreeBSD einrichten können. - Wissen, wie man ein Netzwerkdateisystem - installiert. + Ein Netzwerkdateisystem (NFS) einrichten können. - Wissen, wie man einen plattenlosen Rechner über das - Netzwerk startet. + Einen plattenlosen Rechner über das Netzwerk starten + können. - Wissen, wie man einen Netzwerkinformationsserver (NIS) - für gemeinsame Benutzerkonten einrichtet. + Einen Netzwerkinformationsserver (NIS) für gemeinsame + Benutzerkonten einrichten können. - Wissen, wie man automatische Netzwerkeinstellungen - mittels DHCP einrichtet. + Automatische Netzwerkeinstellungen mittels DHCP vornehmen + können. - Wissen, wie man einen Domain Name Server (DNS) - einrichtet. + Einen Domain Name Server (DNS) einrichten können. - Wissen, wie man, unter Verwendung des NTP-Protokolls, - Uhrzeit und Datum synchronisiert, sowie einen Zeitserver - einrichtet. + Unter Verwendung des NTP-Protokolls Uhrzeit und Datum + synchronisieren, sowie einen Zeitserver einrichten können. @@ -84,13 +82,11 @@ - Wissen, wie man zwei Computer über PLIP - verbindet. + Zwei Computer über PLIP verbinden können. - Wissen, wie man IPv6 auf einem FreeBSD-Rechner - einrichtet. + IPv6 auf einem FreeBSD-Rechner einrichten können. @@ -416,7 +412,7 @@ - Ein häufige Frage lautet: Warum (oder wie) + Eine häufig gestellte Frage lautet: Warum (oder wie) sollten wir T1-GW als Standard-Gateway für Local1 setzen, statt den (direkt verbundenen) ISP-Server zu @@ -469,7 +465,7 @@ Rechner mit zwei Heimatnetzen - dual homed hosts + Dual-Homed-Hosts Es gibt noch eine Konfigurationsmöglichkeit, die wir @@ -544,7 +540,7 @@ - Bekanntmachen von Routen + Verteilung von Routing-Informationen routing propagation @@ -607,7 +603,7 @@ (Host) ausgeführt. Angezeigt werden die Gateway-Rechner entlang des Verbindungspfades. Schließlich wird der Zielrechner erreicht oder es kommt zu einem Verbindungsabbruch - (z. B. durch Nichterreichbarkeit eines + (z.B. durch Nichterreichbarkeit eines Gateway-Rechners). Für weitere Informationen lesen Sie bitte die @@ -655,7 +651,7 @@ drahtlose Netzwerk besitzt einen Namen, der als die SSID des Netzwerks bezeichnet wird. - Drahtlose Clients benutzen ein im IEEE 802.11 Standard + Drahtlose Clients benutzen ein im IEEE-802.11-Standard beschriebenes Protokoll, um sich mit den Zugangspunkten zu verbinden. Durch die Angabe einer SSID kann sich der Client das Netzwerk, mit dem er sich verbinden will, aussuchen. Gibt der @@ -668,7 +664,7 @@ Der IBSS-Modus, der auch ad-hoc-Modus genannt wird, wurde für Punkt-zu-Punkt-Verbindungen entworfen. Tatsächlich gibt es zwei Modi: Der IBSS-Modus, auch ad-hoc- oder - IEEE-ad-hoc-Modus, der im IEEE 802.11 Standard definiert wird + IEEE-ad-hoc-Modus, der im IEEE-802.11-Standard definiert wird und der demo-ad-hoc-Modus oder Lucent-adhoc-Modus (der zur Verwirrung auch schon mal ad-hoc-Modus genannt wird). Der letzte Modus stammt aus der Zeit vor IEEE 802.11 und sollte nur noch @@ -943,7 +939,7 @@ jeder, der es will, kann Ihre Daten lesen. Deshalb gibt es die Verschlüsselung. Durch die Verschlüsselung der durch die Luft versendeten Daten machen Sie es einem Dritten sehr - viel schwerer, Ihre Daten abzufangen, bzw. auf diese + viel schwerer, Ihre Daten abzufangen oder auf diese zuzugreifen. Die gebräuchlichsten Methoden, um Daten zwischen @@ -1083,12 +1079,212 @@ + + + + Steve + Peterson + Geschrieben von + + + LAN-Kopplung mit einer Bridge - Dieser Abschnitt ist noch nicht übersetzt. Lesen Sie - bitte - das Original in englischer Sprache. + + Einführung + + Subnetz + Bridge + + Manchmal ist es nützlich, ein physikalisches Netzwerk + (wie ein Ethernetsegment) in zwei separate Netzwerke aufzuteilen, + ohne gleich IP-Subnetze zu erzeugen, die über einen Router + miteinander verbunden sind. Ein Gerät, das zwei Netze + auf diese Weise verbindet, wird als Bridge + bezeichnet. Jedes FreeBSD-System mit zwei Netzkarten kann + als Bridge fungieren. + + Die Bridge arbeitet, indem sie die MAC Layeradressen (Ethernet + Adressen) der Geräte in ihren Netzsegmenten lernt. Der + Verkehr wird nur dann zwischen zwei Netzsegmenten weitergeleitet, + wenn sich Sender und Empfänger in verschiedenen Netzsegmenten + befinden. + + In vielerlei Hinsicht entspricht eine Bridge daher einem + Ethernet-Switch mit sehr wenigen Ports. + + + + Situationen, in denen <emphasis>Bridging</emphasis> angebracht + ist + + Eine Bridge wird vor allem in folgenden zwei Situationen + verwendet. + + + Hohes Datenaufkommen in einem Segment + + In der ersten Situation wird Ihr physikalisches Netz + mit Datenverkehr überschwemmt. Aus irgendwelchen + Gründen wollen Sie allerdings keine Subnetze verwenden, + die über einen Router miteinander verbunden sind. + + Stellen Sie sich einen Zeitungsverlag vor, in dem sich die + Redaktions- und Produktionsabteilungen in verschiedenen Subnetzen + befinden. Die Redaktionsrechner verwenden den Server A für + Dateioperationen, und die Produktionsrechner verwenden den + Server B. Alle Benutzer sind über ein gemeinsames + Ethernet-LAN miteinander verbunden. Durch den hohen Datenverkehr + sinkt die Geschwindigkeit des gesamten Netzwerks. + + Würde man die Redaktionsrechner und die + Produktionsrechner in separate Netzsegmente auslagern, + könnte man diese beiden Segmente über eine Bridge + verbinden. Nur der für Rechner im anderen + Segment bestimmte Verkehr wird dann über die Brigde in + das andere Netzsegment geleitet. Dadurch verringert sich das + Gesamtdatenaufkommen in beiden Segmenten. + + + + Filtering/Traffic Shaping Firewall + + Firewall + IP-Masquerading + + Die zweite häufig anzutreffende Situation tritt auf, + wenn Firewallfunktionen benötigt werden, ohne dass + IP-Maskierung (NAT - Network Adress Translation) verwendet wird. + + Ein Beispiel dafür wäre ein kleines Unternehmen, + das über DSL oder ISDN an ihren ISP angebunden ist. Es + verfügt über 13 weltweit erreichbare IP-Adressen, und + sein Netzwerk besteht aus 10 Rechnern. In dieser Situation ist + die Verwendung von Subnetzen sowie einer routerbasierten Firewall + schwierig. + + Router + DSL + ISDN + + Eine brigdebasierte Firewall kann konfiguriert und in den + ISDN/DSL-Downstreampfad ihres Routers eingebunden werden, ohne + sich um IP-Adressen kümmern zu müssen. + + + + + Die LAN-Kopplung konfigurieren + + + Auswahl der Netzkarten + + Eine Bridge benötigt mindestens zwei Netzkarten. + Leider sind unter FreeBSD 4.x nicht alle verfügbaren + Netzkarten dafür geeignet. Lesen Sie &man.bridge.4;, um + sich über Details der unterstützten Karten zu + informieren. + + Installieren und testen Sie beide Netzkarten, bevor Sie + fortfahren. + + + + Anpassen der Kernelkonfiguration + + Kernelkonfiguration + + Kernelkonfiguration + options BRIDGE + + + Um die Kernelunterstützung für die LAN-Kopplung + zu aktivieren, fügen Sie + + options BRIDGE + + in Ihre Kernelkonfigurationsdatei ein, und erzeugen einen + neuen Kernel. + + + + Firewallunterstützung + + Firewall + + Wenn Sie die Bridge als Firewall verwenden wollen, müssen + Sie zusätzlich die Option IPFIREWALL + einfügen. Für weitere Informationen zur Konfiguration + der Bridge als Firewall lesen Sie bitte den entsprechenden Abschnitt + des Handbuchs (). + + Wenn Sie Nicht-IP-Pakete (wie z.B. ARP) durch Ihre + Bridge leiten wollen, müssen Sie eine zusätzliche, + undokumentierte Option verwenden. Es handelt sich um + IPFIREWALL_DEFAULT_TO_ACCEPT. + Beachten Sie aber, dass Ihre Firewall durch diese Option per + Voreinstellung alle Pakete akzeptiert. Sie sollten sich also + über die Auswirkungen dieser Option im Klaren sein, + bevor Sie sie verwenden. + + + + Unterstützung für Traffic Shaping + + Wenn Sie die Bridge als Traffic-Shaper verwenden wollen, + müssen Sie die Option DUMMYNET in + Ihre Kernelkonfigurationsdatei einfügen. Lesen Sie + &man.dummynet.4;, um weitere Informationen zu erhalten. + + + + + Die LAN-Kopplung aktivieren + + Fügen Sie die Zeile + + net.link.ether.bridge=1 + + in /etc/sysctl.conf ein, um die Bridge + zur Laufzeit zu aktivieren, sowie die Zeile + + net.link.ether.bridge_cfg=if1,if2 + + um die LAN-Kopplung für die festgelegten Geräte + zu ermöglichen (ersetzen Sie dazu if1 + und if2 mit den Namen Ihrer Netzkarten). + Wenn Sie die Datenpakete via &man.ipfw.8; filtern wollen, sollten + Sie zusätzlich Folgendes einfügen: + + net.link.ether.bridge_ipfw=1 + + + + Leistung + + Meine Bridge/Firewall besteht aus einem Pentium90-System mit + einer 3Com 3C900B und einer 3Com 3C905B Netzkarte. Die + geschützte Seite des Netzwerks läuft im 10 mbps + Halbduplex-Modus, und die Verbindung zwischen der Bridge und + meinem Router (einem Cisco 675) läuft im 100 mbps + Fullduplex-Modus. Ohne aktivierte Paketfilterung habe ich + festgestellt, dass die Bridge Pings vom geschützten Netzwerk + zum Cisco-Router um etwa 0,4  Millisekunden verzögert. + + + + Sonstige Informationen + + Wenn Sie via telnet auf die Bridge zugreifen + wollen, ist es in Ordnung, einer der beiden Netzkarten eine IP-Adresse + zuzuweisen. Es besteht Einigkeit darüber, dass es eine schlechte + Idee ist, beiden Karten eine IP-Adresse zuzuweisen. + + Wenn Sie verschiedene Bridges in Ihrem Netzwerk haben, kann es + dennoch nicht mehr als einen Weg zwischen zwei Arbeitsplätzen + geben. Das heißt, Spanning tree link Management wird nicht + unterstützt. + ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#8 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.19 2003/01/12 19:19:32 mheinen Exp $ - $FreeBSDde: de-docproj/books/handbook/basics/chapter.sgml,v 1.61 2003/01/12 19:04:26 mheinen Exp $ + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.20 2003/02/16 18:24:06 mheinen Exp $ + $FreeBSDde: de-docproj/books/handbook/basics/chapter.sgml,v 1.62 2003/02/07 21:00:51 mheinen Exp $ basiert auf: 1.95 --> @@ -668,7 +668,7 @@ Programm läuft. STAT zeigt den Status des Programms an und kann für die Zwecke dieser Diskussion ebenso wie TT ignoriert werden. TIME - gibt die Zeit an, die das Programm auf der CPU gelaufen ist— + gibt die Zeit an, die das Programm auf der CPU gelaufen ist – dies ist nicht unbedingt die Zeit, die seit dem Start des Programms vergangen ist, da einige Programme viel Zeit mit dem Warten auf bestimmte Dinge verbringen, bevor sie wirklich CPU-Zeit verbrauchen. @@ -768,7 +768,7 @@ dazu benutzen Sie Signale. Sie können mit einem Dämonen oder jedem anderen laufenden Prozess kommunizieren, indem Sie diesem ein Signal schicken. Sie können - verschiedene Signale verschicken—manche haben eine festgelegte + verschiedene Signale verschicken – manche haben eine festgelegte Bedeutung, andere werden von der Anwendung interpretiert. Die Dokumentation zur fraglichen Anwendung wird erklären, wie die Anwendung Signale interpretiert. Sie können nur Signale ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#8 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.18 2003/01/12 19:19:33 mheinen Exp $ - $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.59 2003/01/12 19:04:27 mheinen Exp $ - basiert auf: 1.81 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.19 2003/02/16 18:24:08 mheinen Exp $ + $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.61 2003/02/15 18:23:03 mheinen Exp $ + basiert auf: 1.85 --> @@ -878,7 +878,8 @@ zum Glück einfach. Für jedes Interface muss es eine Adresse geben, die die Netzwerkmaske des Netzwerkes richtig beschreibt. Alle anderen Adressen in diesem Netzwerk haben dann - eine Netzwerkmaske, die mit 1 gefüllt ist. + eine Netzwerkmaske, die mit 1 gefüllt + ist. Als Beispiel betrachten wir den Fall, in dem fxp0 mit zwei Netzwerken verbunden @@ -1241,6 +1242,43 @@ Mit sysctl können Sie Strings, Zahlen oder Boolean-Werte setzen. Bei Boolean-Werten setzen sie 1 für wahr und 0 für falsch. + + + + + + Tom + Rhodes + Contributed by + + + + + Schreibgeschützte Variablen + + Manchmal ist es notwendig, obwohl es nicht + empfohlen ist, schreibgeschützte + sysctl-Variablen zu verändern. + + Beispielsweise hat &man.cardbus.4; auf einigen Laptops + Schwierigkeiten, Speicherbereiche zu erkennen. Es treten + dann Fehlermeldungen wie die folgende auf: + + cbb0: Could not map register memory +device_probe_and_attach: cbb0 attach returned 12 + + Um dieses Problem zu lösen, muss eine + schreibgeschützte sysctl-Variable verändert + werden. Eine OID kann in der Datei + /boot/loader.conf.local überschrieben + werden. Die Datei /boot/defaults/loader.conf + enthält Vorgabewwerte für sysctl-Variablen. + + Das oben erwähnte Problem wird durch die Angabe von + in + /boot/loader.conf.local gelöst. + Danach sollte &man.cardbus.4; fehlerfrei funktionieren. + @@ -1283,6 +1321,88 @@ + <varname>vfs.write_behind</varname> + + + vfs.write_behind + + + In der Voreinstellung besitzt die Variable + vfs.write_behind den Wert + 1 (aktiviert). Mit dieser Einstellung + schreibt das Dateisystem anfallende vollständige Cluster, + die besonders beim sequentiellen Schreiben großer Dateien + auftreten, direkt auf das Medium aus. Dies verhindert, + dass sich im Buffer-Cache veränderte Puffer + (dirty buffers) ansammeln, + die die I/O-Verarbeitung nicht mehr beschleunigen + würden. Unter bestimmten Umständen blockiert + diese Funktion allerdings Prozesse. Setzen Sie in diesem + Fall die Variable vfs.write_behind auf + den Wert 0. + + + + <varname>vfs.hirunningspace</varname> + + + vfs.hirunningspace + + + Die Variable vfs.hirunningspace + bestimmt systemweit die Menge ausstehender Schreiboperationen, + die dem Platten-Controller zu jedem beliebigen Zeitpunkt + übergeben werden können. Normalerweise können + Sie den Vorgabewert verwenden. Auf Systemen mit + vielen Platten kann der Wert aber auf 4 bis + 5 Megabyte erhöht werden. + Beachten Sie, dass ein zu hoher Wert (größer + als der Schreib-Schwellwert des Buffer-Caches) zu + Leistungverlusten führen kann. Setzen Sie den Wert daher + nicht zu hoch! Hohe Werte können auch Leseoperationen + verzögern, die gleichzeitig mit Schreiboperationen + ausgeführt werden. + + Es gibt weitere Variablen, mit denen Sie den Buffer-Cache + und den VM-Page-Cache beeinflussen können. Wir raten + Ihnen allerdings davon ab, diese Variablen zu verändern: + Seit FreeBSD 4.3 stellt sich die Verwaltung des virtuellen + Speichers sehr gut selbst ein. + + + + <varname>vm.swap_idle_enabled</varname> + + + vm.swap_idle_enabled + + + Die Variable vm.swap_idle_enabled + ist für große Mehrbenutzer-Systeme gedacht, auf + denen sich viele Benutzer an- und abmelden und auf denen + es viele Prozesse im Leerlauf + (idle) gibt. Solche Systeme + fragen kontinuierlich freien Speicher an. Wenn Sie die + Variable vm.swap_idle_enabled aktivieren, + können Sie die Auslagerungs-Hysterese von Seiten mit + den Variablen vm.swap_idle_threshold1 und + vm.swap_idle_threshold2 einstellen. Die >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Feb 17 16: 5:43 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9247737B405; Mon, 17 Feb 2003 16:05:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2092237B401 for ; Mon, 17 Feb 2003 16:05:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8D6143FBD for ; Mon, 17 Feb 2003 16:05:15 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1I05Fbv038993 for ; Mon, 17 Feb 2003 16:05:15 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1I05B6Q038990 for perforce@freebsd.org; Mon, 17 Feb 2003 16:05:11 -0800 (PST) Date: Mon, 17 Feb 2003 16:05:11 -0800 (PST) Message-Id: <200302180005.h1I05B6Q038990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 25356 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25356 Change 25356 by jmallett@jmallett_dalek on 2003/02/17 16:04:44 integrate from trunk. Affected files ... .. //depot/projects/mips/bin/sh/memalloc.c#3 integrate .. //depot/projects/mips/bin/sh/nodes.c.pat#3 integrate .. //depot/projects/mips/contrib/openpam/lib/pam_vprompt.c#3 integrate .. //depot/projects/mips/crypto/openssh/auth2-pam-freebsd.c#5 integrate .. //depot/projects/mips/etc/mtree/BSD.usr.dist#7 integrate .. //depot/projects/mips/etc/newsyslog.conf#2 integrate .. //depot/projects/mips/etc/opieaccess#2 integrate .. //depot/projects/mips/etc/pam.d/ftpd#3 integrate .. //depot/projects/mips/etc/pam.d/login#3 integrate .. //depot/projects/mips/etc/pam.d/other#3 integrate .. //depot/projects/mips/etc/pam.d/sshd#5 integrate .. //depot/projects/mips/etc/pam.d/su#5 integrate .. //depot/projects/mips/etc/pam.d/telnetd#3 integrate .. //depot/projects/mips/etc/pam.d/xdm#3 integrate .. //depot/projects/mips/etc/rc.d/ipsec#2 integrate .. //depot/projects/mips/games/fortune/Notes#3 integrate .. //depot/projects/mips/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/Makefile#3 integrate .. //depot/projects/mips/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu#1 branch .. //depot/projects/mips/lib/compat/compat4x.i386/Makefile#4 integrate .. //depot/projects/mips/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu#1 branch .. //depot/projects/mips/lib/libc/db/btree/bt_put.c#2 integrate .. //depot/projects/mips/lib/libc/db/btree/bt_split.c#2 integrate .. //depot/projects/mips/lib/libc/db/hash/hash_bigkey.c#2 integrate .. //depot/projects/mips/lib/libc/db/hash/hash_func.c#2 integrate .. //depot/projects/mips/lib/libc/db/recno/rec_close.c#2 integrate .. //depot/projects/mips/lib/libc/db/recno/rec_seq.c#2 integrate .. //depot/projects/mips/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/mips/lib/libc/gen/getpwent.c#2 integrate .. //depot/projects/mips/lib/libc/gen/semctl.c#2 integrate .. //depot/projects/mips/lib/libc/gen/sysctl.c#2 integrate .. //depot/projects/mips/lib/libc/gen/unvis.c#3 integrate .. //depot/projects/mips/lib/libc/i386/gen/getcontext.S#2 integrate .. //depot/projects/mips/lib/libc/i386/gen/signalcontext.c#2 integrate .. //depot/projects/mips/lib/libc/i386/sys/i386_get_ioperm.c#2 integrate .. //depot/projects/mips/lib/libc/i386/sys/i386_get_ldt.c#2 integrate .. //depot/projects/mips/lib/libc/i386/sys/i386_set_ioperm.c#2 integrate .. //depot/projects/mips/lib/libc/i386/sys/i386_set_ldt.c#2 integrate .. //depot/projects/mips/lib/libc/i386/sys/i386_vm86.c#2 integrate .. //depot/projects/mips/lib/libc/include/namespace.h#5 integrate .. //depot/projects/mips/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/mips/lib/libc/net/if_nametoindex.c#3 integrate .. //depot/projects/mips/lib/libc/net/name6.c#4 integrate .. //depot/projects/mips/lib/libc/net/res_query.c#2 integrate .. //depot/projects/mips/lib/libc/posix1e/mac_exec.c#2 integrate .. //depot/projects/mips/lib/libc/posix1e/mac_get.c#3 integrate .. //depot/projects/mips/lib/libc/regex/engine.c#2 integrate .. //depot/projects/mips/lib/libc/regex/regcomp.c#2 integrate .. //depot/projects/mips/lib/libc/regex/regexec.c#2 integrate .. //depot/projects/mips/lib/libc/rpc/crypt_client.c#2 integrate .. //depot/projects/mips/lib/libc/rpc/getnetconfig.c#4 integrate .. //depot/projects/mips/lib/libc/rpc/mt_misc.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/mktemp.c#2 integrate .. //depot/projects/mips/lib/libc/stdlib/rand.c#4 integrate .. //depot/projects/mips/lib/libc/stdtime/asctime.c#2 integrate .. //depot/projects/mips/lib/libc/stdtime/difftime.c#2 integrate .. //depot/projects/mips/lib/libc/stdtime/localtime.c#3 integrate .. //depot/projects/mips/lib/libc/stdtime/strptime.c#2 integrate .. //depot/projects/mips/lib/libc/sys/sem.c#3 integrate .. //depot/projects/mips/lib/libdevinfo/devinfo_var.h#2 integrate .. //depot/projects/mips/lib/libdevstat/devstat.c#2 integrate .. //depot/projects/mips/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate .. //depot/projects/mips/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#2 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_cancel.c#2 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_init.c#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_kern.c#5 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_private.h#4 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_sig.c#2 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_sigpending.c#2 integrate .. //depot/projects/mips/libexec/rpc.rstatd/rstat_proc.c#2 integrate .. //depot/projects/mips/libexec/rtld-elf/rtld.c#8 integrate .. //depot/projects/mips/release/Makefile#13 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 integrate .. //depot/projects/mips/sbin/vinum/commands.c#3 integrate .. //depot/projects/mips/sbin/vinum/list.c#3 integrate .. //depot/projects/mips/sbin/vinum/vext.h#3 integrate .. //depot/projects/mips/share/man/man4/Makefile#9 integrate .. //depot/projects/mips/share/man/man4/mac.4#3 integrate .. //depot/projects/mips/share/man/man4/mac_biba.4#3 integrate .. //depot/projects/mips/share/man/man4/mac_mls.4#3 integrate .. //depot/projects/mips/share/man/man4/man4.i386/tx.4#2 integrate .. //depot/projects/mips/share/man/man4/miibus.4#2 integrate .. //depot/projects/mips/share/man/man4/wi.4#5 integrate .. //depot/projects/mips/share/man/man9/mutex.9#3 integrate .. //depot/projects/mips/sys/alpha/alpha/alpha-gdbstub.c#2 integrate .. //depot/projects/mips/sys/alpha/alpha/exception.s#2 integrate .. //depot/projects/mips/sys/alpha/alpha/genassym.c#2 integrate .. //depot/projects/mips/sys/alpha/alpha/machdep.c#7 integrate .. //depot/projects/mips/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/mips/sys/alpha/alpha/trap.c#5 integrate .. //depot/projects/mips/sys/alpha/alpha/vm_machdep.c#6 integrate .. //depot/projects/mips/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/mips/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/mips/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/mips/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/mips/sys/alpha/osf1/osf1_misc.c#4 integrate .. //depot/projects/mips/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/mips/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/mips/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/mips/sys/ddb/db_command.c#3 integrate .. //depot/projects/mips/sys/ddb/db_ps.c#7 integrate .. //depot/projects/mips/sys/ddb/ddb.h#3 integrate .. //depot/projects/mips/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/mips/sys/dev/an/if_an_isa.c#3 integrate .. //depot/projects/mips/sys/dev/an/if_an_pccard.c#4 integrate .. //depot/projects/mips/sys/dev/an/if_an_pci.c#5 integrate .. //depot/projects/mips/sys/dev/cardbus/cardbus.c#9 integrate .. //depot/projects/mips/sys/dev/cardbus/cardbus_cis.c#9 integrate .. //depot/projects/mips/sys/dev/dgb/dgb.c#2 integrate .. //depot/projects/mips/sys/dev/firewire/firewire.c#10 integrate .. //depot/projects/mips/sys/dev/firewire/sbp.c#9 integrate .. //depot/projects/mips/sys/dev/isp/isp.c#4 integrate .. //depot/projects/mips/sys/dev/isp/isp_target.c#4 integrate .. //depot/projects/mips/sys/dev/ispfw/asm_2300.h#3 integrate .. //depot/projects/mips/sys/dev/pci/pci.c#6 integrate .. //depot/projects/mips/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/mips/sys/dev/rc/rc.c#3 integrate .. //depot/projects/mips/sys/dev/rp/rp.c#4 integrate .. //depot/projects/mips/sys/dev/si/si.c#3 integrate .. //depot/projects/mips/sys/dev/sio/sio.c#4 integrate .. //depot/projects/mips/sys/dev/sio/sio_pccard.c#3 integrate .. //depot/projects/mips/sys/dev/sio/sio_pci.c#3 integrate .. //depot/projects/mips/sys/dev/vinum/vinumhdr.h#3 integrate .. //depot/projects/mips/sys/i386/i386/exception.s#5 integrate .. //depot/projects/mips/sys/i386/i386/genassym.c#7 integrate .. //depot/projects/mips/sys/i386/i386/i386-gdbstub.c#3 integrate .. //depot/projects/mips/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/mips/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/mips/sys/i386/i386/trap.c#7 integrate .. //depot/projects/mips/sys/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/mips/sys/i386/isa/cy.c#2 integrate .. //depot/projects/mips/sys/i386/isa/npx.c#5 integrate .. //depot/projects/mips/sys/i386/isa/spic.c#2 integrate .. //depot/projects/mips/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/mips/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/mips/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/mips/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/mips/sys/ia64/ia32/ia32_misc.c#4 integrate .. //depot/projects/mips/sys/ia64/ia64/exception.s#5 integrate .. //depot/projects/mips/sys/ia64/ia64/genassym.c#4 integrate .. //depot/projects/mips/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/mips/sys/ia64/ia64/trap.c#5 integrate .. //depot/projects/mips/sys/ia64/ia64/vm_machdep.c#7 integrate .. //depot/projects/mips/sys/ia64/include/param.h#2 integrate .. //depot/projects/mips/sys/kern/init_main.c#9 integrate .. //depot/projects/mips/sys/kern/kern_clock.c#6 integrate .. //depot/projects/mips/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/mips/sys/kern/kern_exec.c#10 integrate .. //depot/projects/mips/sys/kern/kern_exit.c#9 integrate .. //depot/projects/mips/sys/kern/kern_fork.c#10 integrate .. //depot/projects/mips/sys/kern/kern_intr.c#5 integrate .. //depot/projects/mips/sys/kern/kern_lock.c#6 integrate .. //depot/projects/mips/sys/kern/kern_resource.c#7 integrate .. //depot/projects/mips/sys/kern/kern_sig.c#7 integrate .. //depot/projects/mips/sys/kern/kern_switch.c#7 integrate .. //depot/projects/mips/sys/kern/kern_synch.c#8 integrate .. //depot/projects/mips/sys/kern/kern_thread.c#11 integrate .. //depot/projects/mips/sys/kern/kern_time.c#5 integrate .. //depot/projects/mips/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/mips/sys/kern/sched_ule.c#4 integrate .. //depot/projects/mips/sys/kern/subr_prof.c#5 integrate .. //depot/projects/mips/sys/kern/subr_smp.c#3 integrate .. //depot/projects/mips/sys/kern/subr_trap.c#8 integrate .. //depot/projects/mips/sys/kern/subr_witness.c#10 integrate .. //depot/projects/mips/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/mips/sys/kern/tty.c#4 integrate .. //depot/projects/mips/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/mips/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/mips/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/mips/sys/net/if_sl.c#6 integrate .. //depot/projects/mips/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/mips/sys/net/ppp_tty.c#5 integrate .. //depot/projects/mips/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/mips/sys/pc98/pc98/sio.c#6 integrate .. //depot/projects/mips/sys/posix4/ksched.c#5 integrate .. //depot/projects/mips/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/mips/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/mips/sys/powerpc/powerpc/trap.c#4 integrate .. //depot/projects/mips/sys/powerpc/powerpc/vm_machdep.c#7 integrate .. //depot/projects/mips/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/mips/sys/sparc64/sparc64/exception.S#7 integrate .. //depot/projects/mips/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/mips/sys/sparc64/sparc64/trap.c#5 integrate .. //depot/projects/mips/sys/sparc64/sparc64/vm_machdep.c#6 integrate .. //depot/projects/mips/sys/sys/bus.h#3 integrate .. //depot/projects/mips/sys/sys/dkstat.h#2 integrate .. //depot/projects/mips/sys/sys/proc.h#12 integrate .. //depot/projects/mips/sys/sys/resource.h#2 integrate .. //depot/projects/mips/sys/sys/resourcevar.h#5 integrate .. //depot/projects/mips/sys/sys/tty.h#2 integrate .. //depot/projects/mips/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/mips/tools/tools/tinderbox/tbmaster.pl#2 integrate .. //depot/projects/mips/usr.bin/login/login.c#5 integrate .. //depot/projects/mips/usr.bin/systat/devs.c#2 integrate .. //depot/projects/mips/usr.bin/systat/iostat.c#2 integrate .. //depot/projects/mips/usr.bin/systat/pigs.c#2 integrate .. //depot/projects/mips/usr.bin/systat/vmstat.c#3 integrate .. //depot/projects/mips/usr.bin/top/machine.c#2 integrate .. //depot/projects/mips/usr.bin/vmstat/vmstat.c#3 integrate .. //depot/projects/mips/usr.sbin/adduser/adduser.sh#5 integrate .. //depot/projects/mips/usr.sbin/adduser/rmuser.8#4 integrate .. //depot/projects/mips/usr.sbin/adduser/rmuser.sh#3 integrate .. //depot/projects/mips/usr.sbin/devinfo/devinfo.c#2 integrate .. //depot/projects/mips/usr.sbin/iostat/iostat.c#2 integrate Differences ... ==== //depot/projects/mips/bin/sh/memalloc.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.20 2003/02/14 23:53:19 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.22 2003/02/17 03:51:44 tjr Exp $"); #include @@ -140,8 +140,8 @@ sp = ckmalloc(sizeof(struct stack_block) - MINSIZE + blocksize); sp->prev = stackp; - stacknxt = sp->space; - stacknleft = blocksize; + stacknxt = (char *)ALIGN(sp->space); + stacknleft = blocksize - (stacknxt - sp->space); stackp = sp; INTON; } ==== //depot/projects/mips/bin/sh/nodes.c.pat#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nodes.c.pat 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.9 2003/02/14 23:53:19 tjr Exp $ + * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.11 2003/02/17 03:51:44 tjr Exp $ */ #include ==== //depot/projects/mips/contrib/openpam/lib/pam_vprompt.c#3 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_vprompt.c#8 $ + * $P4: //depot/projects/openpam/lib/pam_vprompt.c#9 $ */ #include @@ -66,7 +66,7 @@ r = pam_get_item(pamh, PAM_CONV, (const void **)&conv); if (r != PAM_SUCCESS) RETURNC(r); - if (conv == NULL) { + if (conv == NULL || conv->conv == NULL) { openpam_log(PAM_LOG_ERROR, "no conversation function"); RETURNC(PAM_SYSTEM_ERR); } ==== //depot/projects/mips/crypto/openssh/auth2-pam-freebsd.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include "includes.h" -RCSID("$FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.9 2003/02/03 14:10:28 des Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.10 2003/02/16 11:03:55 des Exp $"); #ifdef USE_PAM #include @@ -188,8 +188,7 @@ struct pam_conv pam_conv = { pam_thread_conv, ctxt }; buffer_init(&buffer); - pam_err = pam_set_item(pam_handle, - PAM_CONV, (const void *)&pam_conv); + pam_err = pam_set_item(pam_handle, PAM_CONV, (const void *)&pam_conv); if (pam_err != PAM_SUCCESS) goto auth_fail; pam_err = pam_authenticate(pam_handle, 0); @@ -221,11 +220,24 @@ close(ctxt->pam_csock); } +static int +pam_null_conv(int n, + const struct pam_message **msg, + struct pam_response **resp, + void *data) +{ + + return (PAM_CONV_ERR); +} + +static struct pam_conv null_conv = { pam_null_conv, NULL }; + static void pam_cleanup(void *arg) { (void)arg; debug("PAM: cleanup"); + pam_set_item(pam_handle, PAM_CONV, (const void *)&null_conv); if (pam_cred_established) { pam_setcred(pam_handle, PAM_DELETE_CRED); pam_cred_established = 0; @@ -242,7 +254,6 @@ static int pam_init(const char *user) { - struct pam_conv no_conv = { NULL, NULL }; extern ServerOptions options; extern u_int utmp_len; const char *pam_rhost, *pam_user; @@ -258,7 +269,7 @@ pam_handle = NULL; } debug("PAM: initializing for \"%s\"", user); - pam_err = pam_start("sshd", user, &no_conv, &pam_handle); + pam_err = pam_start("sshd", user, &null_conv, &pam_handle); if (pam_err != PAM_SUCCESS) return (-1); pam_rhost = get_remote_name_or_ip(utmp_len, @@ -465,6 +476,10 @@ void do_pam_session(const char *user, const char *tty) { + pam_err = pam_set_item(pam_handle, PAM_CONV, (const void *)&null_conv); + if (pam_err != PAM_SUCCESS) + fatal("PAM: failed to set PAM_CONV: %s", + pam_strerror(pam_handle, pam_err)); debug("PAM: setting PAM_TTY to \"%s\"", tty); pam_err = pam_set_item(pam_handle, PAM_TTY, tty); if (pam_err != PAM_SUCCESS) @@ -480,6 +495,10 @@ void do_pam_setcred(int init) { + pam_err = pam_set_item(pam_handle, PAM_CONV, (const void *)&null_conv); + if (pam_err != PAM_SUCCESS) + fatal("PAM: failed to set PAM_CONV: %s", + pam_strerror(pam_handle, pam_err)); if (init) { debug("PAM: establishing credentials"); pam_err = pam_setcred(pam_handle, PAM_ESTABLISH_CRED); @@ -559,8 +578,7 @@ if (use_privsep) fatal("PAM: chauthtok not supprted with privsep"); - pam_err = pam_set_item(pam_handle, - PAM_CONV, (const void *)&pam_conv); + pam_err = pam_set_item(pam_handle, PAM_CONV, (const void *)&pam_conv); if (pam_err != PAM_SUCCESS) fatal("PAM: failed to set PAM_CONV: %s", pam_strerror(pam_handle, pam_err)); ==== //depot/projects/mips/etc/mtree/BSD.usr.dist#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.271 2003/02/10 19:57:49 nectar Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.272 2003/02/15 23:05:48 keramida Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -542,8 +542,6 @@ i386 .. .. - catn - .. en.ISO8859-1 uname=root cat1 .. @@ -575,8 +573,6 @@ i386 .. .. - catn - .. .. ja uname=root cat1 @@ -597,8 +593,6 @@ .. cat9 .. - catn - .. /set uname=root man1 .. @@ -618,8 +612,6 @@ .. man9 .. - mann - .. .. man1 .. @@ -651,8 +643,6 @@ i386 .. .. - mann - .. .. me .. ==== //depot/projects/mips/etc/newsyslog.conf#2 (text+ko) ==== @@ -1,5 +1,5 @@ # configuration file for newsyslog -# $FreeBSD: src/etc/newsyslog.conf,v 1.42 2002/09/21 12:07:35 markm Exp $ +# $FreeBSD: src/etc/newsyslog.conf,v 1.43 2003/02/16 13:07:20 des Exp $ # # Note: some sites will want to select more restrictive protections than the # defaults. In particular, it may be desirable to switch many of the 644 @@ -8,21 +8,21 @@ # future, these defaults may change to more conservative ones. # # logfilename [owner:group] mode count size when [ZJB] [/pid_file] [sig_num] -/var/log/cron 600 3 100 * J +/var/log/all.log 600 7 * @T00 J /var/log/amd.log 644 7 100 * J /var/log/auth.log 600 7 100 * J +/var/log/console.log 600 5 100 * J +/var/log/cron 600 3 100 * J +/var/log/daily.log 640 7 * @T00 J /var/log/kerberos.log 600 7 100 * J /var/log/lpd-errs 644 7 100 * J -/var/log/xferlog 600 7 100 * J /var/log/maillog 640 7 * @T00 J -/var/log/sendmail.st 640 10 * 168 B /var/log/messages 644 5 100 * J -/var/log/all.log 600 7 * @T00 J -/var/log/slip.log root:network 640 3 100 * J +/var/log/monthly.log 640 12 * $M1D0 J /var/log/ppp.log root:network 640 3 100 * J /var/log/security 600 10 100 * J +/var/log/sendmail.st 640 10 * 168 B +/var/log/slip.log root:network 640 3 100 * J +/var/log/weekly.log 640 5 1 $W6D0 J /var/log/wtmp 644 3 * @01T05 B -/var/log/daily.log 640 7 * @T00 J -/var/log/weekly.log 640 5 1 $W6D0 J -/var/log/monthly.log 640 12 * $M1D0 J -/var/log/console.log 600 5 100 * J +/var/log/xferlog 600 7 100 * J ==== //depot/projects/mips/etc/opieaccess#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/opieaccess,v 1.2 2001/08/14 23:51:58 ache Exp $ +# $FreeBSD: src/etc/opieaccess,v 1.4 2003/02/16 13:04:27 des Exp $ # # This file controls whether UNIX passwords are to be permitted. Rules # are matched in order, and the search terminates when the first matching ==== //depot/projects/mips/etc/pam.d/ftpd#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/ftpd,v 1.15 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/ftpd,v 1.16 2003/02/16 13:02:39 des Exp $ # # PAM configuration for the "ftpd" service # @@ -7,7 +7,7 @@ # auth auth required pam_nologin.so no_warn auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn +auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_kerberosIV.so no_warn #auth sufficient pam_krb5.so no_warn #auth sufficient pam_ssh.so no_warn try_first_pass ==== //depot/projects/mips/etc/pam.d/login#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/login,v 1.12 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/login,v 1.13 2003/02/16 13:02:39 des Exp $ # # PAM configuration for the "login" service # @@ -8,7 +8,7 @@ auth required pam_nologin.so no_warn auth sufficient pam_self.so no_warn auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn +auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_kerberosIV.so no_warn try_first_pass #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass ==== //depot/projects/mips/etc/pam.d/other#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/other,v 1.7 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/other,v 1.8 2003/02/16 13:02:39 des Exp $ # # PAM configuration for the "other" service # @@ -7,7 +7,7 @@ # auth auth required pam_nologin.so no_warn auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn +auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_kerberosIV.so no_warn try_first_pass #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass ==== //depot/projects/mips/etc/pam.d/sshd#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/sshd,v 1.12 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/sshd,v 1.13 2003/02/16 13:02:39 des Exp $ # # PAM configuration for the "sshd" service # @@ -7,7 +7,7 @@ # auth auth required pam_nologin.so no_warn auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn +auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_kerberosIV.so no_warn try_first_pass #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass ==== //depot/projects/mips/etc/pam.d/su#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/su,v 1.11 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/su,v 1.12 2003/02/16 13:02:39 des Exp $ # # PAM configuration for the "su" service # @@ -9,7 +9,7 @@ auth sufficient pam_self.so no_warn auth requisite pam_group.so no_warn root_only fail_safe auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn +auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_kerberosIV.so no_warn #auth sufficient pam_krb5.so no_warn try_first_pass auth_as_self #auth required pam_ssh.so no_warn try_first_pass ==== //depot/projects/mips/etc/pam.d/telnetd#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/telnetd,v 1.4 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/telnetd,v 1.5 2003/02/16 13:02:39 des Exp $ # # PAM configuration for the "telnetd" service # @@ -7,7 +7,7 @@ # auth auth required pam_nologin.so no_warn auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn +auth requisite pam_opieaccess.so no_warn allow_local #auth sufficient pam_kerberosIV.so no_warn try_first_pass #auth sufficient pam_krb5.so no_warn try_first_pass #auth sufficient pam_ssh.so no_warn try_first_pass ==== //depot/projects/mips/etc/pam.d/xdm#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/xdm,v 1.5 2003/02/10 00:50:03 des Exp $ +# $FreeBSD: src/etc/pam.d/xdm,v 1.6 2003/02/16 13:02:03 des Exp $ # # PAM configuration for the "xdm" service # @@ -19,5 +19,5 @@ # session #session required pam_kerberosIV.so #session required pam_krb5.so -#session required pam_ssh.so +#session required pam_ssh.so want_agent session required pam_permit.so ==== //depot/projects/mips/etc/rc.d/ipsec#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ipsec,v 1.4 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ipsec,v 1.5 2003/02/16 20:46:08 mtm Exp $ # # PROVIDE: ipsec @@ -15,8 +15,6 @@ name="ipsec" rcvar=`set_rcvar` -# This will be overiden from rc.conf on FreeBSD. -ipsec_file="/etc/ipsec.conf" start_precmd="ipsec_prestart" start_cmd="ipsec_start" stop_precmd="test -f /etc/ipsec.conf" @@ -27,9 +25,11 @@ case ${OSTYPE} in FreeBSD) ipsec_program="/usr/sbin/setkey" + # ipsec_file is set by rc.conf ;; NetBSD) ipsec_program="/sbin/setkey" + ipsec_file="/etc/ipsec.conf" ;; esac ==== //depot/projects/mips/games/fortune/Notes#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Notes 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/fortune/Notes,v 1.2 2002/12/30 21:18:01 schweikh Exp $ +# $FreeBSD: src/games/fortune/Notes,v 1.3 2003/02/16 18:38:12 schweikh Exp $ Warning: The fortunes contained in the fortune database have been collected @@ -18,7 +18,7 @@ By default, fortune retrieves its fortune files from the directory /usr/share/games/fortune. A fortune file has two parts: the source file (which contains the fortunes themselves) and the data file which describes -the fortunes. The data fil always has the same name as the fortune file +the fortunes. The data file always has the same name as the fortune file with the string ".dat" concatenated, i.e. "fort" is the standard fortune database, and "fort.dat" is the data file which describes it. See strfile(8) for more information on creating the data files. ==== //depot/projects/mips/games/fortune/datfiles/fortunes#7 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.104 2003/02/11 21:38:02 wes Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.105 2003/02/16 18:38:12 schweikh Exp $ % -- Gifts for Children -- @@ -8958,7 +8958,7 @@ Now ... try to get something DONE! % Ken Thompson has an automobile which he helped design. Unlike most -automobiles, it has neither speedometer, nor gas gage, nor any of the +automobiles, it has neither speedometer, nor gas gauge, nor any of the numerous idiot lights which plague the modern driver. Rather, if the driver makes any mistake, a giant "?" lights up in the center of the dashboard. "The experienced driver", he says, "will usually know ==== //depot/projects/mips/lib/compat/compat4x.alpha/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/compat/compat4x.alpha/Makefile,v 1.14 2003/02/15 16:26:09 nectar Exp $ +# $FreeBSD: src/lib/compat/compat4x.alpha/Makefile,v 1.15 2003/02/17 13:45:12 nectar Exp $ DISTRIBUTION= compat4x @@ -9,6 +9,7 @@ libcrypto.so.2 \ libedit.so.3 \ libfetch.so.2 \ + libgmp.so.3 \ libpam.so.1 \ libperl.so.3 \ libssl.so.1 \ ==== //depot/projects/mips/lib/compat/compat4x.i386/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/compat/compat4x.i386/Makefile,v 1.20 2003/02/15 16:26:10 nectar Exp $ +# $FreeBSD: src/lib/compat/compat4x.i386/Makefile,v 1.21 2003/02/17 13:45:13 nectar Exp $ DISTRIBUTION= compat4x @@ -7,6 +7,7 @@ libc_r.so.4 \ libcrypto.so.1 \ libcrypto.so.2 \ + libgmp.so.3 \ libedit.so.3 \ libfetch.so.2 \ libpam.so.1 \ ==== //depot/projects/mips/lib/libc/db/btree/bt_put.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_put.c 8.8 (Berkeley) 7/26/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_put.c,v 1.2 2002/03/21 22:46:25 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_put.c,v 1.3 2003/02/16 17:29:09 nectar Exp $"); #include @@ -225,7 +225,7 @@ t->bt_cursor.pg.pgno == h->pgno && t->bt_cursor.pg.index >= index) ++t->bt_cursor.pg.index; - if (t->bt_order == NOT) + if (t->bt_order == NOT) { if (h->nextpg == P_INVALID) { if (index == NEXTINDEX(h) - 1) { t->bt_order = FORWARD; @@ -239,6 +239,7 @@ t->bt_last.pgno = h->pgno; } } + } mpool_put(t->bt_mp, h, MPOOL_DIRTY); ==== //depot/projects/mips/lib/libc/db/btree/bt_split.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_split.c 8.9 (Berkeley) 7/26/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.4 2002/03/23 18:22:40 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.5 2003/02/16 17:29:09 nectar Exp $"); #include @@ -672,8 +672,8 @@ * where we decide to try and copy too much onto the left page. * Make sure that doesn't happen. */ - if (skip <= off && - used + nbytes + sizeof(indx_t) >= full || nxt == top - 1) { + if ((skip <= off && used + nbytes + sizeof(indx_t) >= full) + || nxt == top - 1) { --off; break; } ==== //depot/projects/mips/lib/libc/db/hash/hash_bigkey.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)hash_bigkey.c 8.3 (Berkeley) 5/31/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_bigkey.c,v 1.4 2002/03/21 22:46:26 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_bigkey.c,v 1.5 2003/02/16 17:29:09 nectar Exp $"); /* * PACKAGE: hash @@ -123,7 +123,7 @@ if (!bufp) return (-1); n = p[0]; - if (!key_size) + if (!key_size) { if (FREESPACE(p)) { move_bytes = MIN(FREESPACE(p), val_size); off = OFFSET(p) - move_bytes; @@ -136,6 +136,7 @@ OFFSET(p) = off; } else p[n - 2] = FULL_KEY; + } p = (u_int16_t *)bufp->page; cp = bufp->page; bufp->flags |= BUF_MOD; ==== //depot/projects/mips/lib/libc/db/hash/hash_func.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)hash_func.c 8.2 (Berkeley) 2/21/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_func.c,v 1.4 2002/03/22 09:18:22 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_func.c,v 1.5 2003/02/16 17:29:09 nectar Exp $"); #include @@ -47,9 +47,9 @@ #include "page.h" #include "extern.h" -static u_int32_t hash1(const void *, size_t); -static u_int32_t hash2(const void *, size_t); -static u_int32_t hash3(const void *, size_t); +static u_int32_t hash1(const void *, size_t) __unused; +static u_int32_t hash2(const void *, size_t) __unused; +static u_int32_t hash3(const void *, size_t) __unused; static u_int32_t hash4(const void *, size_t); /* Global default hash function */ ==== //depot/projects/mips/lib/libc/db/recno/rec_close.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rec_close.c 8.6 (Berkeley) 8/18/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_close.c,v 1.6 2002/03/22 21:52:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_close.c,v 1.7 2003/02/16 17:29:09 nectar Exp $"); #include "namespace.h" #include @@ -83,13 +83,14 @@ if (F_ISSET(t, R_MEMMAPPED) && munmap(t->bt_smap, t->bt_msize)) status = RET_ERROR; - if (!F_ISSET(t, R_INMEM)) + if (!F_ISSET(t, R_INMEM)) { if (F_ISSET(t, R_CLOSEFP)) { if (fclose(t->bt_rfp)) status = RET_ERROR; } else if (_close(t->bt_rfd)) status = RET_ERROR; + } if (__bt_close(dbp) == RET_ERROR) status = RET_ERROR; ==== //depot/projects/mips/lib/libc/db/recno/rec_seq.c#2 (text+ko) ==== @@ -31,11 +31,12 @@ * SUCH DAMAGE. */ +#include #ifndef lint -static char sccsid[] = "@(#)rec_seq.c 8.3 (Berkeley) 7/14/94"; +/* XXX use __SCCSID */ +static char sccsid[] __unused = "@(#)rec_seq.c 8.3 (Berkeley) 7/14/94"; #endif /* not lint */ -#include -__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_seq.c,v 1.4 2002/03/22 21:52:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_seq.c,v 1.5 2003/02/16 17:29:09 nectar Exp $"); #include ==== //depot/projects/mips/lib/libc/gen/getgrouplist.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.12 2002/09/08 04:43:28 wollman Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.13 2003/02/16 17:29:09 nectar Exp $"); /* * get credential @@ -69,7 +69,7 @@ * Scan the group file to find additional groups. */ setgrent(); - while (grp = getgrent()) { + while ((grp = getgrent()) != NULL) { for (i = 0; i < ngroups; i++) { if (grp->gr_gid == groups[i]) goto skip; ==== //depot/projects/mips/lib/libc/gen/getpwent.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* LIBC_SCCS and not lint */ /* $NetBSD: getpwent.c,v 1.40.2.2 1999/04/27 22:09:45 perry Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.67 2002/05/07 23:26:00 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.68 2003/02/16 17:29:09 nectar Exp $"); #include "un-namespace.h" #include @@ -52,6 +52,7 @@ #include #include #include +#include #ifdef HESIOD #include #endif @@ -64,10 +65,6 @@ #endif #include "un-namespace.h" -extern void setnetgrent(char *); -extern int getnetgrent(char **, char **, char **); -extern int innetgr(const char *, const char *, const char *, const char *); - #include "pw_scan.h" #if defined(YP) || defined(HESIOD) ==== //depot/projects/mips/lib/libc/gen/semctl.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/semctl.c,v 1.8 2002/08/11 19:31:02 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/semctl.c,v 1.9 2003/02/16 17:29:09 nectar Exp $"); #include #include @@ -35,6 +35,8 @@ #include #include +extern int __semctl(int semid, int semnum, int cmd, union semun *arg); + int semctl(int semid, int semnum, int cmd, ...) { va_list ap; ==== //depot/projects/mips/lib/libc/gen/sysctl.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)sysctl.c 8.2 (Berkeley) 1/4/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/sysctl.c,v 1.4 2002/03/22 21:52:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/sysctl.c,v 1.5 2003/02/16 17:29:09 nectar Exp $"); #include #include @@ -47,6 +47,9 @@ #include #include +extern int __sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, + void *newp, size_t newlen); + int sysctl(name, namelen, oldp, oldlenp, newp, newlen) int *name; ==== //depot/projects/mips/lib/libc/gen/unvis.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/unvis.c,v 1.7 2003/01/10 02:46:32 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/unvis.c,v 1.8 2003/02/16 17:29:09 nectar Exp $"); #include #include @@ -56,7 +56,7 @@ #define S_HTTP 0x080 /* %HEXHEX escape */ #define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') -#define ishex(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '9' || ((u_char)(c)) >= 'a' && ((u_char)(c)) <= 'f') +#define ishex(c) ((((u_char)(c)) >= '0' && ((u_char)(c)) <= '9') || (((u_char)(c)) >= 'a' && ((u_char)(c)) <= 'f')) /* * unvis - decode characters previously encoded by vis ==== //depot/projects/mips/lib/libc/i386/gen/getcontext.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/getcontext.S,v 1.3 2002/09/16 19:24:31 mini Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/getcontext.S,v 1.4 2003/02/17 07:47:13 mini Exp $"); /* * Where do we define these? @@ -61,7 +61,7 @@ pushl $0 /* oset = NULL */ pushl %eax /* set = &ucp->uc_sigmask */ pushl $3 /* how = SIG_SETMASK */ - call PIC_PLT(CNAME(_sigprocmask)) + call PIC_PLT(CNAME(sigprocmask)) addl $12, %esp PIC_EPILOGUE testl %eax, %eax /* check for error */ ==== //depot/projects/mips/lib/libc/i386/gen/signalcontext.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Feb 17 16:36:58 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36E0637B405; Mon, 17 Feb 2003 16:36:56 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D960337B401 for ; Mon, 17 Feb 2003 16:36:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6604043F3F for ; Mon, 17 Feb 2003 16:36:55 -0800 (PST) (envelope-from chris@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1I0atbv041038 for ; Mon, 17 Feb 2003 16:36:55 -0800 (PST) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1I0as9L041035 for perforce@freebsd.org; Mon, 17 Feb 2003 16:36:54 -0800 (PST) Date: Mon, 17 Feb 2003 16:36:54 -0800 (PST) Message-Id: <200302180036.h1I0as9L041035@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 25358 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25358 Change 25358 by chris@chris_holly on 2003/02/17 16:36:00 Reorganize things a little bit based on discussion with Adam Migus. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/OUTLINE.TrustedBSD#4 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/OUTLINE.TrustedBSD#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$P4: //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/OUTLINE.TrustedBSD#3 $ +$P4: //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/OUTLINE.TrustedBSD#4 $ This document outlines the Security Architecture (WIP). As time progresses and more of the document becomes written, each entry in the outline will @@ -12,6 +12,9 @@ The FreeBSD Security Architecture Handbook +Abstract (chris) - Explains what exactly the book is about, why it was + commissioned, etc. + Preface (chris - Not complete) This Book's Audience Organization of this Book @@ -20,16 +23,15 @@ 1. Security Defined 2. Security-Related Definitions 2.1. Security Policy - 2.2. Subjects and Objects - 2.3. MAC - 2.4. DAC - 2.5. ... (more to come as they "come up") + 2.2. MAC + 2.3. DAC II. Kernel Security ("Kernel Security Model?") 3. Kernel Security Policy[footnote 1] - 3.1. [UN] Regarding suser, the root user, etc. - 3.2. [UN] DAC on files - 3.3. [UN] MAC - 3.3.[1-N]. mac_{biba,mls,etc.} + 3.1. Subjects and Objects + 3.2. [UN] Regarding suser, the root user, etc. + 3.3. [UN] DAC on files + 3.4. [UN] MAC + 3.4.[1-N]. mac_{biba,mls,etc.} III. Userland Security ("Userland Security Model?") 4. Userland Security Policy[footnote 2] 5. [UN] Mandatory Interaction with Kernel Security Mechanisms To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Feb 17 17:19:18 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6C5C37B405; Mon, 17 Feb 2003 17:19:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47CD837B401; Mon, 17 Feb 2003 17:19:15 -0800 (PST) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 324DB43F93; Mon, 17 Feb 2003 17:19:14 -0800 (PST) (envelope-from mux@freebsd.org) Received: by elvis.mu.org (Postfix, from userid 1920) id CD623AE2C1; Mon, 17 Feb 2003 17:19:13 -0800 (PST) Date: Tue, 18 Feb 2003 02:19:13 +0100 From: Maxime Henrion To: "Justin T. Gibbs" Cc: Sam Leffler , Perforce Change Reviews Subject: Re: PERFORCE change 24844 for review Message-ID: <20030218011913.GF60813@elvis.mu.org> References: <200302082030.h18KUuR9063864@repoman.freebsd.org> <47870000.1045456722@aslan.scsiguy.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <47870000.1045456722@aslan.scsiguy.com> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Justin T. Gibbs wrote: > > http://perforce.freebsd.org/chv.cgi?CH=24844 > > > > Change 24844 by sam@sam_ebb on 2003/02/08 12:30:08 > > > > bus_dma'd em driver (works on x86, not on sparc) > > replace rx logic with jumbo buffers (needs more work) > There are lots of things that are a bit wierd about how this > was bus dma'ed... [...] > o bus dmamaps have a lifetime of a single packet. While loading a map > is usually cheap, allocating a map may be very costly. The implementation > may use the allocation of a map as a hint to increase its mapping space, > bounce buffer pool, or to perform some other action that will decrease > the chance that a load will block should all maps currently allocated > against the tag be used at once. The map may be a fairly large object > depending on the needs of the implementation. I would suggest changing > the maps to have the same lifetime as the TX descriptors. [...] Are you just talking about TX descriptors, or also RX ones? Having dma maps with the same lifetime as the descriptor is easy for the TX case, but it's actually quite hard for the RX case. FWIW, When I converted the xl(4) driver to busdma, I made it so RX dma maps have the same lifetime as the RX descriptor, and was only doing bus_dmamap_load() when mapping another packet, but I will probably soon change this and create a new dma map for each packet. The reason for this is the way we handle memory shortage in the drivers. When xl_newbuf() fails, we don't pass the packet to the upper layer and instead reuse the mbuf to get another packet. That's OK in the non-busdma case, but in the busdma case, we need to handle another possible failure with the bus_dmamap_load() call. The problem is that we already did call bus_dmamap_unload() and the "old" mbuf isn't mapped anymore. And since we can't do selective bus_dmamap_unload() calls, we can't just unmap it after we succeded in mapping the new mbuf. It would probably be better to fix the busdma API so that we can selectively unload one mapping from a map, but until we got this feature I'll move the map creation at mbuf allocation time. Fixing this problem differently without touching the busdma code implies having an RX descriptors list for those descriptors we failed to map, so that we can try to use them again later. This has far-reaching consequences, as we'll have to modify the RX descriptor chain, and many drivers statically chain the descriptors for performance reasons... IMHO that's way too much complexity. Of course, I would be happy to be told that I missed some point and there's an even better way of fixing this than what I'm currently planning on committing :-). Cheers, Maxime To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Feb 17 17:58:41 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C68FB37B405; Mon, 17 Feb 2003 17:58:38 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E39937B401; Mon, 17 Feb 2003 17:58:38 -0800 (PST) Received: from aslan.scsiguy.com (aslan.scsiguy.com [63.229.232.106]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19F7743F93; Mon, 17 Feb 2003 17:58:37 -0800 (PST) (envelope-from gibbs@scsiguy.com) Received: from aslan.scsiguy.com (aslan.scsiguy.com [63.229.232.106]) by aslan.scsiguy.com (8.12.6/8.12.5) with ESMTP id h1I1vsOU043293; Mon, 17 Feb 2003 18:57:54 -0700 (MST) (envelope-from gibbs@scsiguy.com) Date: Mon, 17 Feb 2003 18:57:54 -0700 From: "Justin T. Gibbs" To: Maxime Henrion Cc: Sam Leffler , Perforce Change Reviews Subject: Re: PERFORCE change 24844 for review Message-ID: <658530000.1045533474@aslan.scsiguy.com> In-Reply-To: <20030218011913.GF60813@elvis.mu.org> References: <200302082030.h18KUuR9063864@repoman.freebsd.org> <47870000.1045456722@aslan.scsiguy.com> <20030218011913.GF60813@elvis.mu.org> X-Mailer: Mulberry/3.0.1 (Linux/x86) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG > Justin T. Gibbs wrote: >> > http://perforce.freebsd.org/chv.cgi?CH=24844 >> > >> > Change 24844 by sam@sam_ebb on 2003/02/08 12:30:08 >> > >> > bus_dma'd em driver (works on x86, not on sparc) >> > replace rx logic with jumbo buffers (needs more work) >> There are lots of things that are a bit wierd about how this >> was bus dma'ed... > [...] >> o bus dmamaps have a lifetime of a single packet. While loading a map >> is usually cheap, allocating a map may be very costly. The implementation >> may use the allocation of a map as a hint to increase its mapping space, >> bounce buffer pool, or to perform some other action that will decrease >> the chance that a load will block should all maps currently allocated >> against the tag be used at once. The map may be a fairly large object >> depending on the needs of the implementation. I would suggest changing >> the maps to have the same lifetime as the TX descriptors. > [...] > > Are you just talking about TX descriptors, or also RX ones? It should also apply to the RX descriptors. > Having dma > maps with the same lifetime as the descriptor is easy for the TX case, > but it's actually quite hard for the RX case. FWIW, When I converted > the xl(4) driver to busdma, I made it so RX dma maps have the same > lifetime as the RX descriptor, and was only doing bus_dmamap_load() when > mapping another packet, but I will probably soon change this and create > a new dma map for each packet. The reason for this is the way we handle > memory shortage in the drivers. When xl_newbuf() fails, we don't pass > the packet to the upper layer and instead reuse the mbuf to get another > packet. That's OK in the non-busdma case, but in the busdma case, we > need to handle another possible failure with the bus_dmamap_load() call. > The problem is that we already did call bus_dmamap_unload() and the > "old" mbuf isn't mapped anymore. And since we can't do selective > bus_dmamap_unload() calls, we can't just unmap it after we succeded in > mapping the new mbuf. > > It would probably be better to fix the busdma API so that we can > selectively unload one mapping from a map, but until we got this feature > I'll move the map creation at mbuf allocation time. If you are asking that the API allow something other than a 1-1 map to mapping relationship, this would just mean that the implementation would have to allocate a "map like object" to attach to the map in order to do the extra map operations. The whole point of the 1-1 relationship is to ensure that these resources are pre-allocated before the mapping operation is required. Selectively unmapping portions of a map would also needlessly complicate the API and/or implementations of the API. > Fixing this problem > differently without touching the busdma code implies having an RX > descriptors list for those descriptors we failed to map, so that we can > try to use them again later. I think you are exagerating the difficulty of solving this problem. You need one more map than the total number of RX descriptors. Store this extra map in the softc. In xl_newbuf(), map the mbuf using the softc dmamap. If the mapping is successful, swap the softc map with the map in the target tx descriptor. The caller can then unload using the softc map. > This has far-reaching consequences, as > we'll have to modify the RX descriptor chain, and many drivers > statically chain the descriptors for performance reasons... IMHO that's > way too much complexity. > > Of course, I would be happy to be told that I missed some point and > there's an even better way of fixing this than what I'm currently > planning on committing :-). Let me know if the above doesn't work for you. -- Justin To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Feb 18 22:45: 9 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35E3137B405; Tue, 18 Feb 2003 22:45:07 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C481B37B401 for ; Tue, 18 Feb 2003 22:45:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6747443FCB for ; Tue, 18 Feb 2003 22:45:06 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1J6j60U068706 for ; Tue, 18 Feb 2003 22:45:06 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1J6j5Vf068703 for perforce@freebsd.org; Tue, 18 Feb 2003 22:45:05 -0800 (PST) Date: Tue, 18 Feb 2003 22:45:05 -0800 (PST) Message-Id: <200302190645.h1J6j5Vf068703@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 25411 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25411 Change 25411 by jmallett@jmallett_dalek on 2003/02/18 22:44:59 Avoid branch conditional issues, real and imagined. Use unsigned byte loads, to fetch one character. Affected files ... .. //depot/projects/mips/sys/mips/mips/support.S#5 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/support.S#5 (text+ko) ==== @@ -44,13 +44,14 @@ */ ENTRY(bcopy) beqz a2, 2f + nop subu a2, 1 -1: lb t0, (a0) +1: lbu t0, (a0) addu a0, 1 sb t0, (a1) + subu a2, 1 + bnezl a2, 1b addu a1, 1 - bnezl a2, 1b - subu a2, 1 2: jr ra nop END(bcopy) @@ -61,11 +62,12 @@ */ ENTRY(bzero) beqz a1, 2f + nop subu a1, 1 1: sb zero, (a0) + subu a1, 1 + bnezl a1, 1b addu a0, 1 - bnezl a1, 1b - subu a1, 1 2: jr ra nop END(bzero) @@ -75,15 +77,15 @@ * void *memcpy(void *dst, const void *src, size_t len) */ ENTRY(memcpy) + beqz a2, 2f move v0, a0 - beqz a2, 2f subu a2, 1 -1: lb t0, (a1) +1: lbu t0, (a1) addu a1, 1 sb t0, (a0) + subu a2, 1 + bnezl a2, 1b addu a0, 1 - bnezl a2, 1b - subu a2, 1 2: jr ra nop END(memcpy) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Feb 20 18:35:49 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9532B37B406; Thu, 20 Feb 2003 18:35:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A79837B405 for ; Thu, 20 Feb 2003 18:35:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2579843FD7 for ; Thu, 20 Feb 2003 18:35:18 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1L2ZI0U081561 for ; Thu, 20 Feb 2003 18:35:18 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1L2YvBl081537 for perforce@freebsd.org; Thu, 20 Feb 2003 18:34:57 -0800 (PST) Date: Thu, 20 Feb 2003 18:34:57 -0800 (PST) Message-Id: <200302210234.h1L2YvBl081537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 25500 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25500 Change 25500 by rwatson@rwatson_tislabs on 2003/02/20 18:34:25 Integrate the TrustedBSD base branch: more changes than you can shake a stick at, including loop back of some MLS/Biba changes, KLD access control check implementations, and others. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#14 integrate .. //depot/projects/trustedbsd/base/Makefile#20 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#32 integrate .. //depot/projects/trustedbsd/base/UPDATING#28 integrate .. //depot/projects/trustedbsd/base/bin/Makefile#6 integrate .. //depot/projects/trustedbsd/base/bin/chflags/Makefile#1 branch .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#1 branch .. //depot/projects/trustedbsd/base/bin/chflags/chflags.c#1 branch .. //depot/projects/trustedbsd/base/bin/chmod/chmod.c#6 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/Makefile#2 delete .. //depot/projects/trustedbsd/base/bin/date/date.1#5 integrate .. //depot/projects/trustedbsd/base/bin/date/date.c#6 integrate .. //depot/projects/trustedbsd/base/bin/date/netdate.c#6 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.c#7 integrate .. //depot/projects/trustedbsd/base/bin/ps/fmt.c#7 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#13 integrate .. //depot/projects/trustedbsd/base/bin/ps/nlist.c#6 integrate .. //depot/projects/trustedbsd/base/bin/ps/print.c#13 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.c#14 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.1#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/bltin/echo.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#11 integrate .. //depot/projects/trustedbsd/base/bin/sh/memalloc.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/nodes.c.pat#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#10 integrate .. //depot/projects/trustedbsd/base/bin/sh/show.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind/CHANGES#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/Version#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_defs.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_sec.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_defs.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_ncache.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_req.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_resp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/logging.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/options.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/named.conf.5#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/resolver.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_name.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_samedomain.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/FAQ#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/INSTALL#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/NEWS#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/config.h.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/configure#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/configure.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/Makefile.am#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/cvs_acls.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/HACKING.DOCS#2 delete .. //depot/projects/trustedbsd/base/contrib/cvs/doc/stamp-1#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/stamp-vti#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/version-client.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/version.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/Makefile.am#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/admin.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/annotate.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/buffer.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/client.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/commit.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/cvs.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/diff.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/edit.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/lock.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/log.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/myndbm.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/options.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cvs/src/parseinfo.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/patch.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/rcs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/recurse.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/remove.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/root.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/sanity.sh#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/scramble.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/server.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/status.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/tag.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/update.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/watch.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/zlib.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/archive#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/audio#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/compress#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/filesystems#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/flash#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/gringotts#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/hp#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/images#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/lisp#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/python#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/vorbis#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.std#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/ascmagic.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/config.h.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/patchlevel.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/print.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/readelf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/softmagic.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/Makefile.in#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/alias.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/basic-block.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/builtin-types.def#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/builtins.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-common.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-common.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-decl.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-format.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-parse.in#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-semantics.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-typeck.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/calls.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfganal.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgbuild.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgcleanup.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/combine.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config.gcc#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/t-osf4#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-netbsd#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/cygwin.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/mingw32.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000-protos.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.md#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rtems.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sysv4.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-aix43#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-rtems#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-slibgcc-elf-ver#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-slibgcc-sld#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/configure#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/configure.in#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/Make-lang.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/NEWS#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-tree.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cvt.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl2.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/error.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/except.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/init.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/operators.def#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/parse.y#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/pt.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/rtti.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/search.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/semantics.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/tree.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/typeck.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cpplib.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dbxout.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/cpp.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/gcc.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/gcc.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/gcov.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/gcov.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/include/gcc-common.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/invoke.texi#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/passes.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/tm.texi#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doloop.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/emit-rtl.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/expr.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/expr.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/ChangeLog#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/Make-lang.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/g77.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/invoke.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/root.texi#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/version.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/fold-const.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/function.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcc.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcc.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ginclude/stddef.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/global.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gthr-rtems.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hashtab.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/integrate.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/jump.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/loop.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/mklibgcc.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/optabs.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/print-rtl.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/recog.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/rtlanal.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/stmt.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tradcpp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tree.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tree.def#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tree.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-dw2.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/version.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/groff_out.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/mdate.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-common#9 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-ditroff#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-nroff#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-syms#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/strip.sed#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/Makefile#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/kupgrade#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/HISTORY#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/bpf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/common.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/fils.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_lfil.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_sfil.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipf.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipfs.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_ef.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_hx.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_pc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_sn.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_td.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_tx.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/iplang/iplang_y.y#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipmon.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipnat.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/44arp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/arp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ip.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipresend.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipsend.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipsopt.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/iptest.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/iptests.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/lsock.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/resend.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sirix.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sock.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipt.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/kmem.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipf.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipf.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipfs.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipfstat.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipftest.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipmon.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipnat.5#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipnat.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/misc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/mli_ipl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/mln_ipl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/natparse.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/opt.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/parse.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/printnat.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/printstate.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/relay.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/Makefile#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ipv6.3#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni5#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ipv6.3#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni5#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ipv6.3#1 branch .. //depot/projects/trustedbsd/base/contrib/libf2c/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/Version.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/Version.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/Version.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/libobjc/ChangeLog#9 integrate .. //depot/projects/trustedbsd/base/contrib/libobjc/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/libobjc/aclocal.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/libobjc/configure#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/VERSION#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-int.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/ChangeLog#10 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/Makefile.am#7 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/Makefile.in#9 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/acconfig.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/acinclude.m4#7 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/aclocal.m4#7 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config.h.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/linker-map.gnu#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/messages_members.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/time_members.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/time_members.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/messages_members.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/time_members.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/configure#7 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/configure.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/Makefile.am#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/backward/alloc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/c++config#8 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/fstream.tcc#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/locale_facets.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/locale_facets.tcc#8 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/localefwd.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/slice_array.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_alloc.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_bvector.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_vector.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/streambuf.tcc#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_fstream.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_streambuf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libmath/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/eh_personality.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/tinfo.cc#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/codecvt.cc#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/ios.cc#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/locale.cc#7 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/localename.cc#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/stl-inst.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/cmds.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/ftpcmd.y#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/ftpd.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/popen.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/src/version.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_borrow_cred.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_findenv.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_get_option.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_restore_cred.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_set_option.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_acct_mgmt.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_chauthtok.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_close_session.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_authtok.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_data.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_item.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_user.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenv.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_open_session.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_data.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_item.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setcred.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vprompt.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/opie/libopie/newseed.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/KNOWNBUGS#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.mc#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/local_procmail.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/cfhead.m4#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/proto.m4#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/sendmail.schema#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/contrib/cidrexpand#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/contrib/doublebounce.pl#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/doc/op/op.me#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/mfapi.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/mfdef.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/milter.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/libsmdb/smdb.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/bdb.h#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/conf.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/fdset.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_unixware.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/comm.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_settimeout.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/engine.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/handler.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/libmilter.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/listener.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/main.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/signal.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/local.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/mbdb.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/refill.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/stdio.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsmdb/smdb2.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsmutil/cf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/mail.local.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/mailstats/mailstats.8#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/smrsh.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/Makefile.m4#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/README#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/SECURITY#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/TRACEFLAGS#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/collect.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/control.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/envelope.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/headers.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mailq.1#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/main.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/map.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mci.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/milter.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/readcf.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/recipient.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sasl.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/savemail.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sysexits.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/tls.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/trace.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/udb.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/usersmtp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/util.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/vacation/vacation.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/VERSION#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kuser_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/admin/adm_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/admin/kdb_edit.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/admin/kdb_init.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/afsutil/kstring2key.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/bsd/bsd_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/enc_des.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/appl/telnet/telnetd/telnetd.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/kadm_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/kadmin.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/kpasswd_standalone.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/ksrvutil.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/ksrvutil_get.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/random_password.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/kadm/kadm_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb-protos.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/krb_check_auth.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/mk_priv.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/rd_priv.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/recvauth.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/sendauth.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/lib/krb/solaris_compat.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/server/kerberos.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-chall.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pam-freebsd.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.8#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/version.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/CHANGES#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Configure#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FAQ#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/INSTALL#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.org#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.ssl#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/NEWS#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/PROBLEMS#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/README#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/README.ASN1#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/README.ENGINE#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.pl.in#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/app_rand.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/apps.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/apps.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/asn1pars.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ca.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ciphers.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/crl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/crl2p7.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dgst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dh.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dhparam.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dsa.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dsaparam.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/enc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/engine.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/apps/errstr.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/gendh.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/gendsa.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/genrsa.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/nseq.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ocsp.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/apps/openssl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/openssl.cnf#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/passwd.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/pkcs12.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/pkcs7.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/pkcs8.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/progs.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/progs.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rand.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/req.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rsa.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rsautl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_apps.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_cb.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_client.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_server.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_socket.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_time.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/sess_id.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/smime.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/speed.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/testdsa.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/version.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/winrand.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/x509.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/bugs/stream.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/certs/RegTP-4R.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/RegTP-5R.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/RegTP-6R.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/config#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/Makefile.ssl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/README#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_cbc.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_cfb.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_core.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_ctr.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_ecb.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_locl.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_misc.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_ofb.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_bitstr.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_bmp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_bool.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_bytes.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_d2i_fp.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_digest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_dup.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_enum.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_gentm.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_i2d_fp.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_int.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_null.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_object.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_octet.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_print.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_set.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_sign.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_strex.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_strnid.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_time.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_type.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_utctm.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_utf8.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_verify.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_vis.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_lib.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_mac.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_par.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1t.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn_moid.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn_pack.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_dhp.c#3 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_dsap.c#3 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_pr.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_pu.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_r_pr.c#3 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_r_pu.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_s_pr.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_s_pu.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/f_int.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/i2d_dhp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/i2d_dsap.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/i2d_pr.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/i2d_pu.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/i2d_r_pr.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/i2d_r_pu.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/i2d_s_pr.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/i2d_s_pu.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/n_pkey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/nsseq.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p5_pbe.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p5_pbev2.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p7_dgst.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p7_enc.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p7_enc_c.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p7_evp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p7_i_s.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p7_lib.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p7_recip.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p7_s_e.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p7_signd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p7_signi.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p8_pkey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_crl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_pkey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_req.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_spki.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_x509.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_x509a.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_dec.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_enc.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_fre.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_new.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_prn.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_typ.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/tasn_utl.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_algor.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_attrib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_bignum.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_crl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_exten.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_info.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_long.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_name.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_pubkey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_req.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_sig.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_spki.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_val.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_x509.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_x509a.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/bf_opts.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/bf_skey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/bfspeed.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/bftest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/blowfish.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_print.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_sock.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bf_buff.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bf_nbio.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bf_null.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio_cb.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_acpt.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_bio.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_conn.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_fd.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_file.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_log.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_mem.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_sock.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/README#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/bn-586.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/ia64.S#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/pa-risc2.s#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_add.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_asm.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_ctx.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_div.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_exp.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_exp2.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_gcd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_kron.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_lcl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mod.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mont.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mpi.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mul.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_prime.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_print.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_rand.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_recp.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_shift.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_sqr.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_sqrt.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_word.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bnspeed.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bntest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/divtest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/expspeed.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/exptest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/test.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/buf_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/buffer.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/buffer.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/cast.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/cast_lcl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/cast_spd.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/castopts.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/casttest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/c_rle.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/c_zlib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/comp.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/comp_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/README#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/cnf_save.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_api.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_api.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_def.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_mall.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_mod.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_sap.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cpt_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cryptlib.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cryptlib.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/crypto.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cversion.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/FILES#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/FILES0#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/asm/crypt586.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/asm/des-586.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/asm/des686.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/asm/desboth.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/cbc3_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/cbc_cksm.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/cfb64ede.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/cfb64enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/cfb_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_old.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_old.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_old2.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_opts.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_ver.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/destest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/ecb3_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/ecb_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/ede_cbcm_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/enc_read.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/enc_writ.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/fcrypt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/fcrypt_b.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/ncbc_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/ofb64ede.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/ofb64enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/ofb_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/pcbc_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/qud_cksm.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/rand_key.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/read2pwd.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/read_pwd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/rnd_keys.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/rpc_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/rpw.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/set_key.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/speed.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/spr.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/str2key.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/xcbc_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_asn1.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_check.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_key.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dhtest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_asn1.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_gen.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_key.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_ossl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_sign.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_vrf.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsagen.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsatest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/README#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_dl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_dlfcn.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ebcdic.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/Makefile.ssl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_cvt.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_lcl.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_lib.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ec_mult.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ecp_mont.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ecp_nist.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ecp_recp.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ecp_smpl.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/ectest.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/Makefile.ssl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/README#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_all.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_cnf.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_ctrl.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_dyn.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_fat.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_init.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_int.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_lib.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_list.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_openssl.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_pkey.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/eng_table.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/engine.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/enginetest.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw.ec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_4758_cca.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_4758_cca_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_4758_cca_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_aep.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_aep_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_aep_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_atalla.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_atalla_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_atalla_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_cryptodev.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_cswift.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_cswift_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_cswift_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ncipher.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ncipher_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ncipher_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_nuron.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_nuron_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_nuron_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_sureware.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_sureware_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_sureware_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ubsec.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ubsec_err.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_ubsec_err.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_cipher.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_dh.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_digest.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_dsa.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_rand.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/tb_rsa.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/aep.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/atalla.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/cswift.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/vendor_defns/sureware.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err_all.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err_prn.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/openssl.ec#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_b64.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_enc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_md.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_ok.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/c_all.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/c_allc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/c_alld.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/digest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_aes.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_bf.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cast.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_des.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_des3.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_idea.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_null.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_rc2.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_rc4.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_rc5.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_xcbc_d.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/encode.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_acnf.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_key.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_pbe.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_pkey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_test.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evptests.txt#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_dss.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_dss1.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_md2.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_md4.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_md5.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_mdc2.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_null.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_ripemd.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_sha.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/m_sha1.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/names.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/openbsd_hw.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p5_crpt.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p5_crpt2.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_dec.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_open.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_seal.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_sign.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/p_verify.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ex_data.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/hmac/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/hmac/hmac.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/hmac/hmac.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/hmac/hmactest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/i_cbc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/i_cfb64.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/i_ecb.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/i_ofb64.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/i_skey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/idea.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/idea_lcl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/idea_spd.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/ideatest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/version#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/krb5/Makefile.ssl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/krb5/krb5_asn.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/krb5/krb5_asn.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/lh_stats.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/lhash.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/lhash.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2_dgst.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2_one.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/md2test.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md32_common.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4_dgst.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4_one.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/md4test.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/asm/md5-sparcv9.S#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/md5_dgst.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 21 8:42:35 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACEB037B405; Fri, 21 Feb 2003 08:42:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4057F37B401 for ; Fri, 21 Feb 2003 08:42:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA40543F75 for ; Fri, 21 Feb 2003 08:42:32 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1LGgW0U092235 for ; Fri, 21 Feb 2003 08:42:32 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1LGgWCu092232 for perforce@freebsd.org; Fri, 21 Feb 2003 08:42:32 -0800 (PST) Date: Fri, 21 Feb 2003 08:42:32 -0800 (PST) Message-Id: <200302211642.h1LGgWCu092232@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 25528 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25528 Change 25528 by rwatson@rwatson_tislabs on 2003/02/21 08:42:26 Submerge some gratuitous diffs. Affected files ... .. //depot/projects/trustedbsd/base/bin/sh/machdep.h#2 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#10 edit Differences ... ==== //depot/projects/trustedbsd/base/bin/sh/machdep.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)machdep.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/machdep.h,v 1.6 1999/08/27 23:15:15 peter Exp $ + * $FreeBSD: src/bin/sh/machdep.h,v 1.10 2003/02/18 02:08:20 tjr Exp $ */ /* ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#10 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#9 $ +.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#10 $ .\" .Dd January 6, 2003 .Dt PAM 3 @@ -94,7 +94,7 @@ .Ft const char * .Fn pam_strerror "pam_handle_t *pamh" "int error_number" .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#9 $ +.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#10 $ .\" .Sh DESCRIPTION The Pluggable Authentication Modules (PAM) library abstracts a number To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 21 8:45: 3 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F153D37B405; Fri, 21 Feb 2003 08:44:37 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 84EBC37B401 for ; Fri, 21 Feb 2003 08:44:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DB4043FDF for ; Fri, 21 Feb 2003 08:44:36 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1LGia0U092326 for ; Fri, 21 Feb 2003 08:44:36 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1LGiZ0e092323 for perforce@freebsd.org; Fri, 21 Feb 2003 08:44:35 -0800 (PST) Date: Fri, 21 Feb 2003 08:44:35 -0800 (PST) Message-Id: <200302211644.h1LGiZ0e092323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 25529 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25529 Change 25529 by rwatson@rwatson_tislabs on 2003/02/21 08:43:59 Integ recent changes from FreeBSD vendor branch. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#33 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/virecover#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dlopen.3#8 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.c#10 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.h#5 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#13 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.h#4 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#25 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#21 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_disk.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_disk.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ccd/ccd.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/iec68113.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/mlx/mlx_disk.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/raidframe/rf_freebsdkintf.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/twe/twe_freebsd.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#20 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#17 integrate .. //depot/projects/trustedbsd/base/sys/sys/disk.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sys/mchain.h#6 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.pl#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/Makefile#23 integrate .. //depot/projects/trustedbsd/base/usr.bin/wall/wall.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#20 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#33 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.317 2003/02/11 19:21:13 trhodes Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.318 2003/02/21 11:19:25 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -495,22 +495,21 @@ .if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN) cd ${KRNLOBJDIR}/${_kernel}; \ ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} -DNO_MODULES clean -.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KRNLSRCDIR}/modules) cd ${KRNLOBJDIR}/${_kernel}; \ ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} cleandir .endif -.endif cd ${KRNLOBJDIR}/${_kernel}; \ MAKESRCPATH=${KRNLSRCDIR}/dev/aic7xxx/aicasm \ ${MAKE} -DNO_CPU_CFLAGS -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile + cd ${KRNLOBJDIR}/${_kernel}; \ + ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} obj +# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KRNLSRCDIR}/modules) - cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} modules-obj +.for target in obj depend all cd ${.CURDIR}/sys/modules/aic7xxx/aicasm; \ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} -DNO_CPU_CFLAGS depend; \ - MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} -DNO_CPU_CFLAGS all + ${MAKE} -DNO_CPU_CFLAGS ${target} +.endfor .endif .if !defined(NO_KERNELDEPEND) cd ${KRNLOBJDIR}/${_kernel}; \ ==== //depot/projects/trustedbsd/base/etc/rc.d/virecover#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: virecover,v 1.6 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/virecover,v 1.3 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/virecover,v 1.4 2003/02/21 09:37:20 dougb Exp $ # # PROVIDE: virecover @@ -27,6 +27,7 @@ virecover_start() { + [ -d /var/tmp/vi.recover ] || return find /var/tmp/vi.recover ! -type f -a ! -type d -delete vibackup=`echo /var/tmp/vi.recover/vi.*` if [ "${vibackup}" != '/var/tmp/vi.recover/vi.*' ]; then ==== //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#6 (text+ko) ==== @@ -1,7 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.72 2002/09/17 01:43:21 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.73 2003/02/21 02:30:50 obrien Exp $ + +.if ${MACHINE_ARCH} != "powerpc" +_gperf=gperf +.endif SUBDIR= bc binutils cc cpio dc dialog diff diff3 \ - gperf grep groff gzip man patch rcs sdiff send-pr sort tar texinfo + ${_gperf} grep groff gzip man patch rcs sdiff send-pr sort tar texinfo .if !defined(NO_CVS) SUBDIR+=cvs ==== //depot/projects/trustedbsd/base/lib/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.148 2003/02/08 15:17:49 phk Exp $ +# $FreeBSD: src/lib/Makefile,v 1.149 2003/02/21 02:30:51 obrien Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -24,7 +24,7 @@ SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd \ libncurses libradius librpcsvc libsbuf libtacplus libutil libypclnt \ ${_compat} libalias libatm ${_libbind} libbz2 libc ${_libc_r} \ - libcalendar libcam libcompat libdevinfo libdevstat libdisk \ + libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap \ @@ -67,6 +67,10 @@ _compat= compat .endif +.if ${MACHINE_ARCH} != "powerpc" +_libdisk=libdisk +.endif + .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberosIV)) || \ defined(NOCRYPT) || (defined(NOSECURE) && !defined(MAKE_KERBEROS4)) ==== //depot/projects/trustedbsd/base/lib/libc/gen/dlopen.3#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" Copyright (c) 1991 Sun Microsystems, Inc. .\" .\" @(#) dlopen.3 1.6 90/01/31 SMI -.\" $FreeBSD: src/lib/libc/gen/dlopen.3,v 1.26 2003/02/14 10:57:20 phantom Exp $ +.\" $FreeBSD: src/lib/libc/gen/dlopen.3,v 1.27 2003/02/21 13:43:41 phantom Exp $ .\" .Dd September 10, 2002 .Os @@ -278,6 +278,8 @@ returns a null-terminated character string describing the last error that occurred during a call to .Fn dlopen , +.Fn dladdr , +.Fn dlinfo , .Fn dlsym , .Fn dlfunc , or ==== //depot/projects/trustedbsd/base/sbin/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.117 2003/01/31 07:40:25 jake Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.118 2003/02/21 02:16:35 obrien Exp $ # XXX MISSING: icheck ncheck @@ -12,7 +12,6 @@ clri \ comcontrol \ conscontrol \ - devd \ devfs \ dhclient \ dmesg \ @@ -78,6 +77,10 @@ umount \ vinum +.if !defined(NO_CXX) +SUBDIR+=devd +.endif + .if !defined(NO_IPFILTER) SUBDIR+=ipf \ ipfs \ ==== //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.38 2002/09/23 04:56:35 mjacob Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.39 2003/02/21 06:19:37 ken Exp $ */ #include @@ -1950,6 +1950,7 @@ #else /* !_KERNEL */ scsi_command_string(device, csio, sb); #endif /* _KERNEL/!_KERNEL */ + sbuf_printf(sb, "\n"); } /* @@ -2068,9 +2069,9 @@ /* Bit pointer is valid */ if (sense->sense_key_spec[0] & 0x08) snprintf(tmpstr2, sizeof(tmpstr2), - "bit %d", + "bit %d ", sense->sense_key_spec[0] & 0x7); - sbuf_printf(sb, ": %s byte %d %s is invalid", + sbuf_printf(sb, ": %s byte %d %sis invalid", bad_command ? "Command" : "Data", scsi_2btoul( &sense->sense_key_spec[1]), @@ -2447,12 +2448,24 @@ u_int8_t page, u_int8_t *param_buf, u_int32_t param_len, u_int8_t sense_len, u_int32_t timeout) { + return(scsi_mode_sense_len(csio, retries, cbfcnp, tag_action, dbd, + page_code, page, param_buf, param_len, 0, + sense_len, timeout)); +} +void +scsi_mode_sense_len(struct ccb_scsiio *csio, u_int32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + u_int8_t tag_action, int dbd, u_int8_t page_code, + u_int8_t page, u_int8_t *param_buf, u_int32_t param_len, + int minimum_cmd_size, u_int8_t sense_len, u_int32_t timeout) +{ u_int8_t cdb_len; /* * Use the smallest possible command to perform the operation. */ - if (param_len < 256) { + if ((param_len < 256) + && (minimum_cmd_size < 10)) { /* * We can fit in a 6 byte cdb. */ @@ -2500,12 +2513,26 @@ u_int8_t *param_buf, u_int32_t param_len, u_int8_t sense_len, u_int32_t timeout) { + return(scsi_mode_select_len(csio, retries, cbfcnp, tag_action, + scsi_page_fmt, save_pages, param_buf, + param_len, 0, sense_len, timeout)); +} + +void +scsi_mode_select_len(struct ccb_scsiio *csio, u_int32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + u_int8_t tag_action, int scsi_page_fmt, int save_pages, + u_int8_t *param_buf, u_int32_t param_len, + int minimum_cmd_size, u_int8_t sense_len, + u_int32_t timeout) +{ u_int8_t cdb_len; /* * Use the smallest possible command to perform the operation. */ - if (param_len < 256) { + if ((param_len < 256) + && (minimum_cmd_size < 10)) { /* * We can fit in a 6 byte cdb. */ ==== //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.h#5 (text+ko) ==== @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.21 2002/10/08 17:12:44 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.22 2003/02/21 06:19:38 ken Exp $ */ /* @@ -926,6 +926,15 @@ u_int8_t *param_buf, u_int32_t param_len, u_int8_t sense_len, u_int32_t timeout); +void scsi_mode_sense_len(struct ccb_scsiio *csio, u_int32_t retries, + void (*cbfcnp)(struct cam_periph *, + union ccb *), + u_int8_t tag_action, int dbd, + u_int8_t page_code, u_int8_t page, + u_int8_t *param_buf, u_int32_t param_len, + int minimum_cmd_size, u_int8_t sense_len, + u_int32_t timeout); + void scsi_mode_select(struct ccb_scsiio *csio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), @@ -934,6 +943,14 @@ u_int32_t param_len, u_int8_t sense_len, u_int32_t timeout); +void scsi_mode_select_len(struct ccb_scsiio *csio, u_int32_t retries, + void (*cbfcnp)(struct cam_periph *, + union ccb *), + u_int8_t tag_action, int scsi_page_fmt, + int save_pages, u_int8_t *param_buf, + u_int32_t param_len, int minimum_cmd_size, + u_int8_t sense_len, u_int32_t timeout); + void scsi_log_sense(struct ccb_scsiio *csio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t page_code, ==== //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#13 (text+ko) ==== @@ -1,6 +1,6 @@ /* * Copyright (c) 1997 Justin T. Gibbs. - * Copyright (c) 1997, 1998, 1999, 2000, 2001 Kenneth D. Merry. + * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Kenneth D. Merry. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.71 2003/02/19 05:46:57 imp Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.72 2003/02/21 06:19:38 ken Exp $ */ /* * Portions of this driver taken from the original FreeBSD cd driver. @@ -79,11 +79,12 @@ }; typedef enum { - CD_Q_NONE = 0x00, - CD_Q_NO_TOUCH = 0x01, - CD_Q_BCD_TRACKS = 0x02, - CD_Q_NO_CHANGER = 0x04, - CD_Q_CHANGER = 0x08 + CD_Q_NONE = 0x00, + CD_Q_NO_TOUCH = 0x01, + CD_Q_BCD_TRACKS = 0x02, + CD_Q_NO_CHANGER = 0x04, + CD_Q_CHANGER = 0x08, + CD_Q_10_BYTE_ONLY = 0x10 } cd_quirks; typedef enum { @@ -95,7 +96,9 @@ CD_FLAG_CHANGER = 0x040, CD_FLAG_ACTIVE = 0x080, CD_FLAG_SCHED_ON_COMP = 0x100, - CD_FLAG_RETRY_UA = 0x200 + CD_FLAG_RETRY_UA = 0x200, + CD_FLAG_VALID_MEDIA = 0x400, + CD_FLAG_VALID_TOC = 0x800 } cd_flags; typedef enum { @@ -116,6 +119,16 @@ #define ccb_state ppriv_field0 #define ccb_bp ppriv_ptr1 +struct cd_tocdata { + struct ioc_toc_header header; + struct cd_toc_entry entries[100]; +}; + +struct cd_toc_single { + struct ioc_toc_header header; + struct cd_toc_entry entry; +}; + typedef enum { CD_STATE_PROBE, CD_STATE_NORMAL @@ -137,20 +150,45 @@ struct cam_periph *periph; dev_t dev; eventhandler_tag clonetag; + int minimum_command_size; + struct sysctl_ctx_list sysctl_ctx; + struct sysctl_oid *sysctl_tree; + STAILQ_HEAD(, cd_mode_params) mode_queue; + struct cd_tocdata toc; }; +struct cd_page_sizes { + int page; + int page_size; +}; + +static struct cd_page_sizes cd_page_size_table[] = +{ + { AUDIO_PAGE, sizeof(struct cd_audio_page)} +}; + struct cd_quirk_entry { struct scsi_inquiry_pattern inq_pat; cd_quirks quirks; }; /* - * These quirk entries aren't strictly necessary. Basically, what they do - * is tell cdregister() up front that a device is a changer. Otherwise, it - * will figure that fact out once it sees a LUN on the device that is - * greater than 0. If it is known up front that a device is a changer, all - * I/O to the device will go through the changer scheduling routines, as + * The changer quirk entries aren't strictly necessary. Basically, what + * they do is tell cdregister() up front that a device is a changer. + * Otherwise, it will figure that fact out once it sees a LUN on the device + * that is greater than 0. If it is known up front that a device is a changer, + * all I/O to the device will go through the changer scheduling routines, as * opposed to the "normal" CD code. + * + * NOTE ON 10_BYTE_ONLY quirks: Any 10_BYTE_ONLY quirks MUST be because + * your device hangs when it gets a 10 byte command. Adding a quirk just + * to get rid of the informative diagnostic message is not acceptable. All + * 10_BYTE_ONLY quirks must be documented in full in a PR (which should be + * referenced in a comment along with the quirk) , and must be approved by + * ken@FreeBSD.org. Any quirks added that don't adhere to this policy may + * be removed until the submitter can explain why they are needed. + * 10_BYTE_ONLY quirks will be removed (as they will no longer be necessary) + * when the CAM_NEW_TRAN_CODE work is done. */ static struct cd_quirk_entry cd_quirk_table[] = { @@ -186,6 +224,7 @@ static periph_oninv_t cdoninvalidate; static void cdasync(void *callback_arg, u_int32_t code, struct cam_path *path, void *arg); +static int cdcmdsizesysctl(SYSCTL_HANDLER_ARGS); static void cdshorttimeout(void *arg); static void cdschedule(struct cam_periph *periph, int priority); static void cdrunchangerqueue(void *arg); @@ -195,21 +234,25 @@ u_int32_t cam_flags, u_int32_t sense_flags), u_int32_t cam_flags, u_int32_t sense_flags); -static union ccb *cdgetccb(struct cam_periph *periph, +static union ccb *cdgetccb(struct cam_periph *periph, u_int32_t priority); static void cddone(struct cam_periph *periph, union ccb *start_ccb); +static union cd_pages *cdgetpage(struct cd_mode_params *mode_params); +static int cdgetpagesize(int page_num); +static void cdprevent(struct cam_periph *periph, int action); +static int cdcheckmedia(struct cam_periph *periph); +static int cdsize(struct cam_periph *periph, u_int32_t *size); +static int cd6byteworkaround(union ccb *ccb); static int cderror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags); -static void cdprevent(struct cam_periph *periph, int action); -static int cdsize(dev_t dev, u_int32_t *size); static int cdreadtoc(struct cam_periph *periph, u_int32_t mode, - u_int32_t start, struct cd_toc_entry *data, - u_int32_t len); + u_int32_t start, u_int8_t *data, + u_int32_t len, u_int32_t sense_flags); static int cdgetmode(struct cam_periph *periph, - struct cd_mode_data *data, u_int32_t page); + struct cd_mode_params *data, u_int32_t page); static int cdsetmode(struct cam_periph *periph, - struct cd_mode_data *data); + struct cd_mode_params *data); static int cdplay(struct cam_periph *periph, u_int32_t blk, u_int32_t len); static int cdreadsubchannel(struct cam_periph *periph, @@ -226,7 +269,7 @@ u_int32_t etrack, u_int32_t eindex); static int cdpause(struct cam_periph *periph, u_int32_t go); static int cdstopunit(struct cam_periph *periph, u_int32_t eject); -static int cdstartunit(struct cam_periph *periph); +static int cdstartunit(struct cam_periph *periph, int load); static int cdsetspeed(struct cam_periph *periph, u_int32_t rdspeed, u_int32_t wrspeed); static int cdreportkey(struct cam_periph *periph, @@ -276,8 +319,10 @@ SYSCTL_NODE(_kern_cam_cd, OID_AUTO, changer, CTLFLAG_RD, 0, "CD Changer"); SYSCTL_INT(_kern_cam_cd_changer, OID_AUTO, min_busy_seconds, CTLFLAG_RW, &changer_min_busy_seconds, 0, "Minimum changer scheduling quantum"); +TUNABLE_INT("kern.cam.cd.changer.min_busy_seconds", &changer_min_busy_seconds); SYSCTL_INT(_kern_cam_cd_changer, OID_AUTO, max_busy_seconds, CTLFLAG_RW, &changer_max_busy_seconds, 0, "Maximum changer scheduling quantum"); +TUNABLE_INT("kern.cam.cd.changer.max_busy_seconds", &changer_max_busy_seconds); struct cdchanger { path_id_t path_id; @@ -554,12 +599,50 @@ } } +/* + * We have a handler function for this so we can check the values when the + * user sets them, instead of every time we look at them. + */ +static int +cdcmdsizesysctl(SYSCTL_HANDLER_ARGS) +{ + int error, value; + + value = *(int *)arg1; + + error = sysctl_handle_int(oidp, &value, 0, req); + + if ((error != 0) + || (req->newptr == NULL)) + return (error); + + /* + * The only real values we can have here are 6 or 10. I don't + * really forsee having 12 be an option at any time in the future. + * So if the user sets something less than or equal to 6, we'll set + * it to 6. If he sets something greater than 6, we'll set it to 10. + * + * I suppose we could just return an error here for the wrong values, + * but I don't think it's necessary to do so, as long as we can + * determine the user's intent without too much trouble. + */ + if (value < 6) + value = 6; + else if (value > 6) + value = 10; + + *(int *)arg1 = value; + + return (0); +} + static cam_status cdregister(struct cam_periph *periph, void *arg) { struct cd_softc *softc; struct ccb_setasync csa; struct ccb_getdev *cgd; + char tmpstr[80], tmpstr2[80]; caddr_t match; cgd = (struct ccb_getdev *)arg; @@ -582,6 +665,7 @@ bzero(softc, sizeof(*softc)); LIST_INIT(&softc->pending_ccbs); + STAILQ_INIT(&softc->mode_queue); softc->state = CD_STATE_PROBE; bioq_init(&softc->bio_queue); if (SID_IS_REMOVABLE(&cgd->inq_data)) @@ -605,7 +689,46 @@ else softc->quirks = CD_Q_NONE; + snprintf(tmpstr, sizeof(tmpstr), "CAM CD unit %d", periph->unit_number); + snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number); + softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx, + SYSCTL_STATIC_CHILDREN(_kern_cam_cd), OID_AUTO, + tmpstr2, CTLFLAG_RD, 0, tmpstr); + if (softc->sysctl_tree == NULL) { + printf("cdregister: unable to allocate sysctl tree\n"); + free(softc, M_DEVBUF); + return (CAM_REQ_CMP_ERR); + } + + /* The default is 6 byte commands, unless quirked otherwise */ + if (softc->quirks & CD_Q_10_BYTE_ONLY) + softc->minimum_command_size = 10; + else + softc->minimum_command_size = 6; + + /* + * Load the user's default, if any. + */ + snprintf(tmpstr, sizeof(tmpstr), "kern.cam.cd.%d.minimum_cmd_size", + periph->unit_number); + TUNABLE_INT_FETCH(tmpstr, &softc->minimum_command_size); + + /* 6 and 10 are the only permissible values here. */ + if (softc->minimum_command_size < 6) + softc->minimum_command_size = 6; + else if (softc->minimum_command_size > 6) + softc->minimum_command_size = 10; + /* + * Now register the sysctl handler, so the user can the value on + * the fly. + */ + SYSCTL_ADD_PROC(&softc->sysctl_ctx,SYSCTL_CHILDREN(softc->sysctl_tree), + OID_AUTO, "minimum_cmd_size", CTLTYPE_INT | CTLFLAG_RW, + &softc->minimum_command_size, 0, cdcmdsizesysctl, "I", + "Minimum CDB size"); + + /* * We need to register the statistics structure for this device, * but we don't have the blocksize yet for it. So, we register * the structure and indicate that we don't have the blocksize @@ -873,7 +996,6 @@ { struct cam_periph *periph; struct cd_softc *softc; - u_int32_t size; int error; int s; @@ -902,26 +1024,12 @@ if (cam_periph_acquire(periph) != CAM_REQ_CMP) return(ENXIO); - cdprevent(periph, PR_PREVENT); - - /* find out the size */ - if ((error = cdsize(dev, &size)) != 0) { - cdprevent(periph, PR_ALLOW); - cam_periph_unlock(periph); - cam_periph_release(periph); - return(error); - } - /* - * We unconditionally (re)set the blocksize each time the - * CD device is opened. This is because the CD can change, - * and therefore the blocksize might change. - * XXX problems here if some slice or partition is still - * open with the old size? + * Check for media, and set the appropriate flags. We don't bail + * if we don't have media, but then we don't allow anything but the + * CDIOCEJECT/CDIOCCLOSE ioctls if there is no media. */ - if ((softc->device_stats.flags & DEVSTAT_BS_UNAVAILABLE) != 0) - softc->device_stats.flags &= ~DEVSTAT_BS_UNAVAILABLE; - softc->device_stats.block_size = softc->params.blksize; + cdcheckmedia(periph); cam_periph_unlock(periph); @@ -951,10 +1059,15 @@ /* * Since we're closing this CD, mark the blocksize as unavailable. - * It will be marked as available whence the CD is opened again. + * It will be marked as available when the CD is opened again. */ softc->device_stats.flags |= DEVSTAT_BS_UNAVAILABLE; + /* + * We'll check the media and toc again at the next open(). + */ + softc->flags &= ~(CD_FLAG_VALID_MEDIA|CD_FLAG_VALID_TOC); + cam_periph_unlock(periph); cam_periph_release(periph); @@ -1330,6 +1443,21 @@ return; } + /* + * If we don't have valid media, look for it before trying to + * schedule the I/O. + */ + if ((softc->flags & CD_FLAG_VALID_MEDIA) == 0) { + int error; + + error = cdcheckmedia(periph); + if (error != 0) { + splx(s); + biofinish(bp, NULL, error); + return; + } + } + /* * Place it in the queue of disk activities for this disk */ @@ -1743,7 +1871,36 @@ xpt_release_ccb(done_ccb); } +static union cd_pages * +cdgetpage(struct cd_mode_params *mode_params) +{ + union cd_pages *page; + + if (mode_params->cdb_size == 10) + page = (union cd_pages *)find_mode_page_10( + (struct scsi_mode_header_10 *)mode_params->mode_buf); + else + page = (union cd_pages *)find_mode_page_6( + (struct scsi_mode_header_6 *)mode_params->mode_buf); + + return (page); +} + static int +cdgetpagesize(int page_num) +{ + int i; + + for (i = 0; i < (sizeof(cd_page_size_table)/ + sizeof(cd_page_size_table[0])); i++) { + if (cd_page_size_table[i].page == page_num) + return (cd_page_size_table[i].page_size); + } + + return (-1); +} + +static int cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) { @@ -1766,6 +1923,19 @@ if (error != 0) return(error); + /* + * If we don't have media loaded, check for it. If still don't + * have media loaded, we can only do a load or eject. + */ + if (((softc->flags & CD_FLAG_VALID_MEDIA) == 0) + && ((cmd != CDIOCCLOSE) + && (cmd != CDIOCEJECT))) { + error = cdcheckmedia(periph); + if (error != 0) { + cam_periph_unlock(periph); + return (error); + } + } switch (cmd) { @@ -1781,57 +1951,117 @@ { struct ioc_play_track *args = (struct ioc_play_track *) addr; - struct cd_mode_data *data; + struct cd_mode_params params; + union cd_pages *page; - data = malloc(sizeof(struct cd_mode_data), M_TEMP, - M_WAITOK); + params.alloc_len = sizeof(union cd_mode_data_6_10); + params.mode_buf = malloc(params.alloc_len, M_TEMP, + M_WAITOK | M_ZERO); CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, ("trying to do CDIOCPLAYTRACKS\n")); - error = cdgetmode(periph, data, AUDIO_PAGE); + error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(data, M_TEMP); + free(params.mode_buf, M_TEMP); break; } - data->page.audio.flags &= ~CD_PA_SOTC; - data->page.audio.flags |= CD_PA_IMMED; - error = cdsetmode(periph, data); - free(data, M_TEMP); + page = cdgetpage(¶ms); + + page->audio.flags &= ~CD_PA_SOTC; + page->audio.flags |= CD_PA_IMMED; + error = cdsetmode(periph, ¶ms); + free(params.mode_buf, M_TEMP); if (error) break; - if (softc->quirks & CD_Q_BCD_TRACKS) { - args->start_track = bin2bcd(args->start_track); - args->end_track = bin2bcd(args->end_track); + + /* + * This was originally implemented with the PLAY + * AUDIO TRACK INDEX command, but that command was + * deprecated after SCSI-2. Most (all?) SCSI CDROM + * drives support it but ATAPI and ATAPI-derivative + * drives don't seem to support it. So we keep a + * cache of the table of contents and translate + * track numbers to MSF format. + */ + if (softc->flags & CD_FLAG_VALID_TOC) { + union msf_lba *sentry, *eentry; + int st, et; + + if (args->end_track < + softc->toc.header.ending_track + 1) + args->end_track++; + if (args->end_track > + softc->toc.header.ending_track + 1) + args->end_track = + softc->toc.header.ending_track + 1; + st = args->start_track - + softc->toc.header.starting_track; + et = args->end_track - + softc->toc.header.starting_track; + if ((st < 0) + || (et < 0) + || (st > (softc->toc.header.ending_track - + softc->toc.header.starting_track))) { + error = EINVAL; + break; + } + sentry = &softc->toc.entries[st].addr; + eentry = &softc->toc.entries[et].addr; + error = cdplaymsf(periph, + sentry->msf.minute, + sentry->msf.second, + sentry->msf.frame, + eentry->msf.minute, + eentry->msf.second, + eentry->msf.frame); + } else { + /* + * If we don't have a valid TOC, try the + * play track index command. It is part of + * the SCSI-2 spec, but was removed in the + * MMC specs. ATAPI and ATAPI-derived + * drives don't support it. + */ + if (softc->quirks & CD_Q_BCD_TRACKS) { + args->start_track = + bin2bcd(args->start_track); + args->end_track = + bin2bcd(args->end_track); + } + error = cdplaytracks(periph, + args->start_track, + args->start_index, + args->end_track, + args->end_index); } - error = cdplaytracks(periph, - args->start_track, - args->start_index, - args->end_track, - args->end_index); } break; case CDIOCPLAYMSF: { struct ioc_play_msf *args = (struct ioc_play_msf *) addr; - struct cd_mode_data *data; + struct cd_mode_params params; + union cd_pages *page; - data = malloc(sizeof(struct cd_mode_data), M_TEMP, - M_WAITOK); + params.alloc_len = sizeof(union cd_mode_data_6_10); + params.mode_buf = malloc(params.alloc_len, M_TEMP, + M_WAITOK | M_ZERO); CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, ("trying to do CDIOCPLAYMSF\n")); - error = cdgetmode(periph, data, AUDIO_PAGE); + error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(data, M_TEMP); + free(params.mode_buf, M_TEMP); break; } - data->page.audio.flags &= ~CD_PA_SOTC; - data->page.audio.flags |= CD_PA_IMMED; - error = cdsetmode(periph, data); - free(data, M_TEMP); + page = cdgetpage(¶ms); + + page->audio.flags &= ~CD_PA_SOTC; + page->audio.flags |= CD_PA_IMMED; + error = cdsetmode(periph, ¶ms); + free(params.mode_buf, M_TEMP); if (error) break; error = cdplaymsf(periph, @@ -1847,23 +2077,27 @@ { struct ioc_play_blocks *args = (struct ioc_play_blocks *) addr; - struct cd_mode_data *data; + struct cd_mode_params params; + union cd_pages *page; CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, ("trying to do CDIOCPLAYBLOCKS\n")); - data = malloc(sizeof(struct cd_mode_data), M_TEMP, - M_WAITOK); + params.alloc_len = sizeof(union cd_mode_data_6_10); + params.mode_buf = malloc(params.alloc_len, M_TEMP, + M_WAITOK | M_ZERO); - error = cdgetmode(periph, data, AUDIO_PAGE); + error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(data, M_TEMP); + free(params.mode_buf, M_TEMP); break; } - data->page.audio.flags &= ~CD_PA_SOTC; - data->page.audio.flags |= CD_PA_IMMED; - error = cdsetmode(periph, data); - free(data, M_TEMP); + page = cdgetpage(¶ms); + + page->audio.flags &= ~CD_PA_SOTC; + page->audio.flags |= CD_PA_IMMED; + error = cdsetmode(periph, ¶ms); + free(params.mode_buf, M_TEMP); if (error) break; error = cdplay(periph, args->blk, args->len); @@ -1925,9 +2159,8 @@ th = malloc(sizeof(struct ioc_toc_header), M_TEMP, M_WAITOK); - error = cdreadtoc(periph, 0, 0, - (struct cd_toc_entry *)th, - sizeof (*th)); + error = cdreadtoc(periph, 0, 0, (u_int8_t *)th, + sizeof (*th), /*sense_flags*/0); if (error) { free(th, M_TEMP); break; @@ -1947,17 +2180,8 @@ break; case CDIOREADTOCENTRYS: { - typedef struct { - struct ioc_toc_header header; - struct cd_toc_entry entries[100]; - } data_t; - typedef struct { - struct ioc_toc_header header; - struct cd_toc_entry entry; - } lead_t; - - data_t *data; - lead_t *lead; + struct cd_tocdata *data; + struct cd_toc_single *lead; struct ioc_read_toc_entry *te = (struct ioc_read_toc_entry *) addr; struct ioc_toc_header *th; @@ -1967,8 +2191,8 @@ CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, ("trying to do CDIOREADTOCENTRYS\n")); - data = malloc(sizeof(data_t), M_TEMP, M_WAITOK); - lead = malloc(sizeof(lead_t), M_TEMP, M_WAITOK); + data = malloc(sizeof(*data), M_TEMP, M_WAITOK); + lead = malloc(sizeof(*lead), M_TEMP, M_WAITOK); if (te->data_len < sizeof(struct cd_toc_entry) || (te->data_len % sizeof(struct cd_toc_entry)) != 0 @@ -1983,9 +2207,8 @@ } th = &data->header; - error = cdreadtoc(periph, 0, 0, - (struct cd_toc_entry *)th, - sizeof (*th)); + error = cdreadtoc(periph, 0, 0, (u_int8_t *)th, + sizeof (*th), /*sense_flags*/0); if (error) { free(data, M_TEMP); free(lead, M_TEMP); @@ -2039,8 +2262,9 @@ if (readlen > 0) { error = cdreadtoc(periph, te->address_format, starting_track, - (struct cd_toc_entry *)data, - readlen + sizeof (*th)); + (u_int8_t *)data, + readlen + sizeof (*th), + /*sense_flags*/0); if (error) { free(data, M_TEMP); free(lead, M_TEMP); @@ -2054,9 +2278,9 @@ th->ending_track = bcd2bin(th->ending_track); if (idx == th->ending_track + 1) { error = cdreadtoc(periph, te->address_format, >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 21 8:46:41 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13D0737B405; Fri, 21 Feb 2003 08:46:40 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B6D4137B401 for ; Fri, 21 Feb 2003 08:46:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D73943FDF for ; Fri, 21 Feb 2003 08:46:39 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1LGkd0U092411 for ; Fri, 21 Feb 2003 08:46:39 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1LGkcgY092408 for perforce@freebsd.org; Fri, 21 Feb 2003 08:46:38 -0800 (PST) Date: Fri, 21 Feb 2003 08:46:38 -0800 (PST) Message-Id: <200302211646.h1LGkcgY092408@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 25530 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25530 Change 25530 by rwatson@rwatson_tislabs on 2003/02/21 08:45:38 Submerge more gratuitous differences in the base branch; should now be entirely in sync with the vendor branch. Affected files ... .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#11 edit Differences ... ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#11 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#10 $ +.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#11 $ .\" .Dd January 6, 2003 .Dt PAM 3 @@ -94,7 +94,7 @@ .Ft const char * .Fn pam_strerror "pam_handle_t *pamh" "int error_number" .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#10 $ +.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#11 $ .\" .Sh DESCRIPTION The Pluggable Authentication Modules (PAM) library abstracts a number To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 21 8:56: 6 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A86D37B405; Fri, 21 Feb 2003 08:55:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A89737B401 for ; Fri, 21 Feb 2003 08:55:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3EBCB43FBD for ; Fri, 21 Feb 2003 08:55:51 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1LGtp0U092958 for ; Fri, 21 Feb 2003 08:55:51 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1LGtoc2092955 for perforce@freebsd.org; Fri, 21 Feb 2003 08:55:50 -0800 (PST) Date: Fri, 21 Feb 2003 08:55:50 -0800 (PST) Message-Id: <200302211655.h1LGtoc2092955@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 25531 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25531 Change 25531 by rwatson@rwatson_tislabs on 2003/02/21 08:54:55 Null commit to prevent $P4$ expansion, avoiding bogus differences between the vendor branch and the trustedbsd base branch in the future. Affected files ... .. //depot/projects/trustedbsd/base/contrib/openpam/CREDITS#5 edit .. //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/INSTALL#5 edit .. //depot/projects/trustedbsd/base/contrib/openpam/LICENSE#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/MANIFEST#9 edit .. //depot/projects/trustedbsd/base/contrib/openpam/Makefile#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/README#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/su.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.3#4 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.man#2 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_nullconv.3#5 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#12 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.man#2 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_conv.3#2 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#11 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#11 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#11 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam.h#9 edit .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam_version.h#4 edit .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_appl.h#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_constants.h#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_modules.h#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_borrow_cred.c#5 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_configure.c#5 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dispatch.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_findenv.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_free_data.c#4 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_get_option.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_load.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_log.c#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_nullconv.c#5 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_restore_cred.c#5 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_set_option.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_static.c#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#11 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_acct_mgmt.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate_secondary.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_chauthtok.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_close_session.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_end.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_error.c#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_authtok.c#10 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_data.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_item.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_authtok.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_username.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_user.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenv.c#9 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenvlist.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_info.c#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_open_session.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_prompt.c#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_putenv.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_data.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_item.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_authtok.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_username.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setcred.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setenv.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_acct_mgmt.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate_secondary.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_chauthtok.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_close_session.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_username.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_open_session.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_username.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_setcred.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_start.c#8 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_strerror.c#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_verror.c#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vinfo.c#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vprompt.c#9 edit .. //depot/projects/trustedbsd/base/contrib/openpam/misc/gendoc.pl#9 edit .. //depot/projects/trustedbsd/base/contrib/openpam/modules/Makefile#7 edit .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/Makefile#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/pam_deny.c#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_dummy/Makefile#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_dummy/pam_dummy.c#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/Makefile#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/pam_permit.c#6 edit .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/Makefile#2 edit .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/pam_unix.c#3 edit Differences ... ==== //depot/projects/trustedbsd/base/contrib/openpam/CREDITS#5 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/INSTALL#5 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/LICENSE#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/MANIFEST#9 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/Makefile#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/README#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/bin/su/su.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.3#4 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.man#2 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#7 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#7 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_nullconv.3#5 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#7 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#12 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.man#2 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_conv.3#2 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#11 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#11 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#11 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam.h#9 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam_version.h#4 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_appl.h#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_constants.h#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_modules.h#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_borrow_cred.c#5 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_configure.c#5 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dispatch.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_findenv.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_free_data.c#4 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_get_option.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_load.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_log.c#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_nullconv.c#5 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_restore_cred.c#5 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_set_option.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_static.c#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#11 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_acct_mgmt.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate_secondary.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_chauthtok.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_close_session.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_end.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_error.c#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_authtok.c#10 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_data.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_item.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_authtok.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_username.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_user.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenv.c#9 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenvlist.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_info.c#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_open_session.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_prompt.c#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_putenv.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_data.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_item.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_authtok.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_username.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setcred.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setenv.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_acct_mgmt.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate_secondary.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_chauthtok.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_close_session.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_username.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_open_session.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_username.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_setcred.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_start.c#8 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_strerror.c#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_verror.c#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vinfo.c#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vprompt.c#9 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/misc/gendoc.pl#9 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/modules/Makefile#7 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/Makefile#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/pam_deny.c#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_dummy/Makefile#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_dummy/pam_dummy.c#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/Makefile#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/pam_permit.c#6 (text/text+ko) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/Makefile#2 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/pam_unix.c#3 (text) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 21 9: 5:37 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1FF537B405; Fri, 21 Feb 2003 09:05:04 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 951AA37B401 for ; Fri, 21 Feb 2003 09:05:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AF0243FA3 for ; Fri, 21 Feb 2003 09:05:03 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1LH530U093493 for ; Fri, 21 Feb 2003 09:05:03 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1LH52RD093490 for perforce@freebsd.org; Fri, 21 Feb 2003 09:05:02 -0800 (PST) Date: Fri, 21 Feb 2003 09:05:02 -0800 (PST) Message-Id: <200302211705.h1LH52RD093490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 25532 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25532 Change 25532 by rwatson@rwatson_tislabs on 2003/02/21 09:04:45 Force an integrate to prevent future conflicts. Affected files ... .. //depot/projects/trustedbsd/base/contrib/openpam/CREDITS#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/INSTALL#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/LICENSE#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/MANIFEST#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/Makefile#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/README#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/su.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.3#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_nullconv.3#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_conv.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam_version.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_appl.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_constants.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_modules.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_borrow_cred.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_configure.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dispatch.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_findenv.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_free_data.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_get_option.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_load.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_log.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_nullconv.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_restore_cred.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_set_option.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_static.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_acct_mgmt.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate_secondary.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_chauthtok.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_close_session.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_end.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_error.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_authtok.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_data.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_item.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_authtok.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_username.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_user.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenv.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenvlist.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_info.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_open_session.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_prompt.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_putenv.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_data.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_item.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_authtok.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_username.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setcred.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setenv.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_acct_mgmt.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate_secondary.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_chauthtok.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_close_session.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_username.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_open_session.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_username.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_setcred.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_start.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_strerror.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_verror.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vinfo.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vprompt.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/misc/gendoc.pl#10 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/Makefile#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/Makefile#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/pam_deny.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_dummy/Makefile#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_dummy/pam_dummy.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/Makefile#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/pam_permit.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/pam_unix.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/contrib/openpam/CREDITS#6 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#11 (text) ==== @@ -206,4 +206,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#9 $ +$P4: //depot/projects/openpam/HISTORY#17 $ ==== //depot/projects/trustedbsd/base/contrib/openpam/INSTALL#6 (text) ==== @@ -22,4 +22,4 @@ Change into the top-level OpenPAM directory and run 'make install'. -$P4: //depot/projects/trustedbsd/base/contrib/openpam/INSTALL#4 $ +$P4: //depot/projects/openpam/INSTALL#2 $ ==== //depot/projects/trustedbsd/base/contrib/openpam/LICENSE#7 (text) ==== @@ -31,4 +31,4 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$P4: //depot/projects/trustedbsd/base/contrib/openpam/LICENSE#5 $ +$P4: //depot/projects/openpam/LICENSE#5 $ ==== //depot/projects/trustedbsd/base/contrib/openpam/MANIFEST#10 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/base/contrib/openpam/MANIFEST#8 $ +# $P4: //depot/projects/openpam/MANIFEST#13 $ # CREDITS HISTORY ==== //depot/projects/trustedbsd/base/contrib/openpam/Makefile#7 (text) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/base/contrib/openpam/Makefile#5 $ +# $P4: //depot/projects/openpam/Makefile#7 $ # SUBDIR = ==== //depot/projects/trustedbsd/base/contrib/openpam/README#7 (text) ==== @@ -24,4 +24,4 @@ Please direct bug reports and inquiries to openpam@thinksec.com. -$P4: //depot/projects/trustedbsd/base/contrib/openpam/README#5 $ +$P4: //depot/projects/openpam/README#4 $ ==== //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#11 (text) ==== @@ -27,4 +27,4 @@ lost your name and email address. Please contact me so I can give you proper credit for your contribution. -$P4: //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#9 $ +$P4: //depot/projects/openpam/RELNOTES#14 $ ==== //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile#7 (text) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile#5 $ +# $P4: //depot/projects/openpam/bin/Makefile#6 $ # SUBDIR = ==== //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile#7 (text) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile#5 $ +# $P4: //depot/projects/openpam/bin/su/Makefile#5 $ # PROG = su ==== //depot/projects/trustedbsd/base/contrib/openpam/bin/su/su.c#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/bin/su/su.c#6 $ + * $P4: //depot/projects/openpam/bin/su/su.c#8 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile#7 (text) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile#5 $ +# $P4: //depot/projects/openpam/doc/Makefile#4 $ # SUBDIR = ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile#8 (text) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile#6 $ +# $P4: //depot/projects/openpam/doc/man/Makefile#11 $ # GENDOC = ${.CURDIR}/../../misc/gendoc.pl ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.3#5 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.man#3 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#8 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#8 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt OPENPAM_GET_OPTION 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt OPENPAM_LOG 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_nullconv.3#6 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#8 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt OPENPAM_SET_OPTION 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt OPENPAM_TTYCONV 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#13 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#11 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM 3 @@ -94,7 +94,7 @@ .Ft const char * .Fn pam_strerror "pam_handle_t *pamh" "int error_number" .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.man#1 $ .\" .Sh DESCRIPTION The Pluggable Authentication Modules (PAM) library abstracts a number ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.man#3 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_ACCT_MGMT 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_AUTHENTICATE 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_CHAUTHTOK 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_CLOSE_SESSION 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_conv.3#3 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_END 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_ERROR 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#12 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_GET_AUTHTOK 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_GET_DATA 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_GET_ITEM 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_GET_USER 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_GETENV 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#12 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_GETENVLIST 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_INFO 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_OPEN_SESSION 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_PROMPT 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_PUTENV 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SET_DATA 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SET_ITEM 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SETCRED 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SETENV 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SM_ACCT_MGMT 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SM_AUTHENTICATE 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SM_CHAUTHTOK 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SM_CLOSE_SESSION 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SM_OPEN_SESSION 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SM_SETCRED 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#12 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_START 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_STRERROR 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_VERROR 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_VINFO 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#9 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_VPROMPT 3 ==== //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam.h#10 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam.h#8 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#21 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED ==== //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam_version.h#5 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_appl.h#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_appl.h#5 $ + * $P4: //depot/projects/openpam/include/security/pam_appl.h#10 $ */ #ifndef _PAM_APPL_H_INCLUDED ==== //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_constants.h#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_constants.h#6 $ + * $P4: //depot/projects/openpam/include/security/pam_constants.h#19 $ */ #ifndef _PAM_CONSTANTS_H_INCLUDED ==== //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_modules.h#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_modules.h#5 $ + * $P4: //depot/projects/openpam/include/security/pam_modules.h#8 $ */ #ifndef _PAM_MODULES_H_INCLUDED ==== //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#6 $ + * $P4: //depot/projects/openpam/include/security/pam_types.h#9 $ */ #ifndef _PAM_TYPES_H_INCLUDED ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile#8 (text) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile#6 $ +# $P4: //depot/projects/openpam/lib/Makefile#16 $ # LIB = pam ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_borrow_cred.c#6 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_configure.c#6 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dispatch.c#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dispatch.c#6 $ + * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#18 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#6 $ + * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#6 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_findenv.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_findenv.c#7 $ + * $P4: //depot/projects/openpam/lib/openpam_findenv.c#10 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_free_data.c#5 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_get_option.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_get_option.c#7 $ + * $P4: //depot/projects/openpam/lib/openpam_get_option.c#6 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#11 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#9 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#20 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_load.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_load.c#7 $ + * $P4: //depot/projects/openpam/lib/openpam_load.c#15 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_log.c#11 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_log.c#9 $ + * $P4: //depot/projects/openpam/lib/openpam_log.c#17 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_nullconv.c#6 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_restore_cred.c#6 (text) ==== ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_set_option.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_set_option.c#7 $ + * $P4: //depot/projects/openpam/lib/openpam_set_option.c#7 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_static.c#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_static.c#5 $ + * $P4: //depot/projects/openpam/lib/openpam_static.c#5 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#12 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#10 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#15 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_acct_mgmt.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_acct_mgmt.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#11 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate.c#13 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate_secondary.c#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate_secondary.c#6 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate_secondary.c#7 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_chauthtok.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_chauthtok.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#14 $ */ #include ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_close_session.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_close_session.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_close_session.c#11 $ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 21 9:43: 3 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9015337B405; Fri, 21 Feb 2003 09:42:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F3DD37B401 for ; Fri, 21 Feb 2003 09:42:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84FFD43FB1 for ; Fri, 21 Feb 2003 09:42:51 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1LHgp0U095987 for ; Fri, 21 Feb 2003 09:42:51 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1LHgptx095984 for perforce@freebsd.org; Fri, 21 Feb 2003 09:42:51 -0800 (PST) Date: Fri, 21 Feb 2003 09:42:51 -0800 (PST) Message-Id: <200302211742.h1LHgptx095984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 25536 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25536 Change 25536 by jhb@jhb_laptop on 2003/02/21 09:41:54 Real eventhandler locking without evilness. Highlights: - Uses mutex rather than a sx lock for each list. - We use a runcount that we increment when starting to invoke a list and decrement when finished invoking a list. - When deleteing a handler, if the runcount is not 0, we mark the event as dead using a reserved priority value (-1) rather than removing it from the list right then and there. - When we finish invoking a list and the runcount goes down to 0, we prune the list of any dead handlers. - A bit more sane locking is used. - All the %^&#ing code duplication in the invoke methods is gone by having the two invoke macros lookup and lock the list before calling a common macro. - The pruning of the list is a function so as to not bloat the invoke macros too much. Affected files ... .. //depot/projects/smpng/sys/kern/subr_eventhandler.c#9 edit .. //depot/projects/smpng/sys/sys/eventhandler.h#9 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_eventhandler.c#9 (text+ko) ==== @@ -55,8 +55,8 @@ eventhandler_init(void *dummy __unused) { TAILQ_INIT(&eventhandler_lists); - mtx_init(&eventhandler_mutex, "eventhandler", NULL, MTX_DEF | MTX_RECURSE); - eventhandler_lists_initted = 1; + mtx_init(&eventhandler_mutex, "eventhandler", NULL, MTX_DEF); + atomic_store_rel_int(&eventhandler_lists_initted, 1); } SYSINIT(eventhandlers, SI_SUB_EVENTHANDLER, SI_ORDER_FIRST, eventhandler_init, NULL) @@ -80,43 +80,49 @@ /* Do we need to find/create the (slow) list? */ if (list == NULL) { /* look for a matching, existing list */ - list = eventhandler_find_list(name); + list = _eventhandler_find_list(name); /* Do we need to create the list? */ if (list == NULL) { - if ((list = malloc(sizeof(struct eventhandler_list) + strlen(name) - + 1, M_EVENTHANDLER, M_NOWAIT)) == NULL) { - mtx_unlock(&eventhandler_mutex); - return(NULL); + mtx_unlock(&eventhandler_mutex); + + new_list = malloc(sizeof(struct eventhandler_list) + + strlen(name) + 1, M_EVENTHANDLER, M_WAITOK); + + /* If someone else created it already, then use that one. */ + mtx_lock(&eventhandler_mutex); + list = _eventhandler_find_list(name); + if (list != NULL) { + free(new_list, M_EVENTHANDLER); + } else { + list = new_list; + list->el_flags = 0; + bzero(&list->el_lock, sizeof(list->el_lock)); + list->el_name = (char *)list + sizeof(struct eventhandler_list); + strcpy(list->el_name, name); + TAILQ_INSERT_HEAD(&eventhandler_lists, list, el_link); } - list->el_flags = 0; - bzero(&list->el_lock, sizeof(list->el_lock)); - list->el_name = (char *)list + sizeof(struct eventhandler_list); - strcpy(list->el_name, name); - TAILQ_INSERT_HEAD(&eventhandler_lists, list, el_link); } } - if (!(list->el_flags & EHE_INITTED)) { + if (!(list->el_flags & EHL_INITTED)) { TAILQ_INIT(&list->el_entries); - sx_init(&list->el_lock, name); - list->el_flags = EHE_INITTED; + mtx_init(&list->el_lock, name, "eventhandler list", MTX_DEF); + atomic_store_rel_int(&list->el_flags, EHL_INITTED); } mtx_unlock(&eventhandler_mutex); - + /* allocate an entry for this handler, populate it */ - if ((eg = malloc(sizeof(struct eventhandler_entry_generic), - M_EVENTHANDLER, M_NOWAIT)) == NULL) { - return(NULL); - } + eg = malloc(sizeof(struct eventhandler_entry_generic), M_EVENTHANDLER, + M_WAITOK | M_ZERO); eg->func = func; eg->ee.ee_arg = arg; eg->ee.ee_priority = priority; - + KASSERT(priority != EHE_DEAD_PRIORITY, + ("%s: handler for %s registered with dead priority", __func__, name)); + /* sort it into the list */ - EHE_LOCK(list); - for (ep = TAILQ_FIRST(&list->el_entries); - ep != NULL; - ep = TAILQ_NEXT(ep, ee_link)) { + EHL_LOCK(list); + TAILQ_FOREACH(ep, &list->el_entries, ee_link) { if (eg->ee.ee_priority < ep->ee_priority) { TAILQ_INSERT_BEFORE(ep, &eg->ee, ee_link); break; @@ -124,7 +130,7 @@ } if (ep == NULL) TAILQ_INSERT_TAIL(&list->el_entries, &eg->ee, ee_link); - EHE_UNLOCK(list); + EHL_UNLOCK(list); return(&eg->ee); } @@ -133,23 +139,49 @@ { struct eventhandler_entry *ep = tag; - /* XXX insert diagnostic check here? */ - EHE_LOCK(list); + EHL_LOCK_ASSERT(list, MA_OWNED); if (ep != NULL) { /* remove just this entry */ - TAILQ_REMOVE(&list->el_entries, ep, ee_link); - free(ep, M_EVENTHANDLER); + if (list->el_runcount == 0) { + TAILQ_REMOVE(&list->el_entries, ep, ee_link); + free(ep, M_EVENTHANDLER); + } else + ep->ee_priority = EHE_DEAD_PRIORITY; } else { /* remove entire list */ - while (!TAILQ_EMPTY(&list->el_entries)) { - ep = TAILQ_FIRST(&list->el_entries); - TAILQ_REMOVE(&list->el_entries, ep, ee_link); - free(ep, M_EVENTHANDLER); + if (list->el_runcount == 0) { + while (!TAILQ_EMPTY(&list->el_entries)) { + ep = TAILQ_FIRST(&list->el_entries); + TAILQ_REMOVE(&list->el_entries, ep, ee_link); + free(ep, M_EVENTHANDLER); + } + } else { + TAILQ_FOREACH(ep, &list->el_entries, ee_link) + ep->ee_priority = EHE_DEAD_PRIORITY; } } - EHE_UNLOCK(list); + EHL_UNLOCK(list); +} + +/* + * Internal version for use when eventhandler list is already locked. + */ +static struct eventhandler_list * +_eventhandler_find_list(char *name) +{ + struct eventhandler_list *list; + + mtx_assert(&eventhandler_mutex, MA_OWNED); + TAILQ_FOREACH(list, &eventhandler_lists, el_link) { + if (!strcmp(name, list->el_name)) + break; + } + return (list); } +/* + * Lookup a "slow" list by name. Returns with the list locked. + */ struct eventhandler_list * eventhandler_find_list(char *name) { @@ -160,14 +192,30 @@ /* scan looking for the requested list */ mtx_lock(&eventhandler_mutex); - for (list = TAILQ_FIRST(&eventhandler_lists); - list != NULL; - list = TAILQ_NEXT(list, el_link)) { - if (!strcmp(name, list->el_name)) - break; - } + list = _eventhandler_find_list(name); + EHL_LOCK(list); mtx_unlock(&eventhandler_mutex); return(list); } +/* + * Prune "dead" entries from an eventhandler list. + */ +void +eventhandler_prune_list(struct eventhandler_list *list) +{ + struct eventhandler_entry *ep, *en; + + EHL_LOCK_ASSERT(list, MA_OWNED); + ep = TAILQ_FIRST(&list->el_entries)); + while (ep != NULL) { + en = TAILQ_NEXT(ep, ee_link); + if (ep->ee_priority == EHE_DEAD_PRIORITY) { + TAILQ_REMOVE(&list->el_entries, ep, ee_link); + free(ep, M_EVENTHANDLER); + } + ep = en; + } +} + ==== //depot/projects/smpng/sys/sys/eventhandler.h#9 (text+ko) ==== @@ -30,28 +30,59 @@ #define SYS_EVENTHANDLER_H #include -#include +#include #include struct eventhandler_entry { TAILQ_ENTRY(eventhandler_entry) ee_link; int ee_priority; +#define EHE_DEAD_PRIORITY (-1) void *ee_arg; }; struct eventhandler_list { char *el_name; int el_flags; -#define EHE_INITTED (1<<0) - struct sx el_lock; +#define EHL_INITTED (1<<0) + u_int el_runcount; + struct mtx el_lock; TAILQ_ENTRY(eventhandler_list) el_link; TAILQ_HEAD(,eventhandler_entry) el_entries; }; typedef struct eventhandler_entry *eventhandler_tag; -#define EHE_LOCK(p) sx_xlock(&(p)->el_lock) -#define EHE_UNLOCK(p) sx_xunlock(&(p)->el_lock) +#define EHL_LOCK(p) mtx_lock(&(p)->el_lock) +#define EHL_UNLOCK(p) mtx_unlock(&(p)->el_lock) +#define EHL_LOCK_ASSERT(p, x) mtx_assert(&(p)->el_lock, x) + +/* + * Macro to invoke the handlers for a given event. + */ +#define _EVENTHANDLER_INVOKE(list, ...) do { \ + struct eventhandler_entry *_ep, *_en; \ + \ + KASSERT((list)->el_flags & EHL_INITTED, \ + ("eventhandler_invoke: running non-inited list")); \ + EHL_LOCK_ASSERT((list), MA_OWNED); \ + (list)->el_runcount++; \ + KASSERT((list)->el_runcount > 0, \ + ("eventhandler_invoke: runcount overflow")); \ + TAILQ_FOREACH(_ep, &((list)->el_entries), ee_link) { \ + if (!(_ep->ee_priority != EHE_DEAD_PRIORITY)) { \ + EHL_UNLOCK((list)); \ + _ep->eh_func(_ep->ee_arg , __VA_ARGS__); \ + EHL_LOCK((list)); \ + } \ + } \ + KASSERT((list)->el_runcount > 0, \ + ("eventhandler_invoke: runcount underflow")); \ + (list)->el_runcount--; \ + if ((list)->el_runcount == 0) \ + eventhandler_prune_list(list); \ + EHL_UNLOCK((list)); \ +} while (0) + /* * Fast handler lists require the eventhandler list be present @@ -75,22 +106,12 @@ struct eventhandler_list Xeventhandler_list_ ## name = { #name }; \ struct __hack -#define EVENTHANDLER_FAST_INVOKE(name, ...) \ -do { \ +#define EVENTHANDLER_FAST_INVOKE(name, ...) do { \ struct eventhandler_list *_el = &Xeventhandler_list_ ## name ; \ - struct eventhandler_entry *_ep, *_en; \ - struct eventhandler_entry_ ## name *_t; \ \ - if (_el->el_flags & EHE_INITTED) { \ - EHE_LOCK(_el); \ - _ep = TAILQ_FIRST(&(_el->el_entries)); \ - while (_ep != NULL) { \ - _en = TAILQ_NEXT(_ep, ee_link); \ - _t = (struct eventhandler_entry_ ## name *)_ep; \ - _t->eh_func(_ep->ee_arg , __VA_ARGS__); \ - _ep = _en; \ - } \ - EHE_UNLOCK(_el); \ + if (_el->el_flags & EHL_INITTED) { \ + EHL_LOCK(_el); \ + _EVENTHANDLER_INVOKE(_el, __VA_ARGS__); \ } \ } while (0) @@ -98,8 +119,14 @@ eventhandler_register(&Xeventhandler_list_ ## name, \ #name, func, arg, priority) -#define EVENTHANDLER_FAST_DEREGISTER(name, tag) \ - eventhandler_deregister(&Xeventhandler_list_ ## name, tag) +#define EVENTHANDLER_FAST_DEREGISTER(name, tag) do { \ + struct eventhandler_list *_el = &Xeventhandler_list_ ## name ; \ + \ + KASSERT(_el->el_flags & EHL_INITTED, \ + ("eventhandler_fast_deregister on un-inited list %s", ## name)); \ + EHL_LOCK(el); \ + eventhandler_deregister(_el, tag); \ +} while (0) /* * Slow handlers are entirely dynamic; lists are created @@ -119,21 +146,9 @@ #define EVENTHANDLER_INVOKE(name, ...) \ do { \ struct eventhandler_list *_el; \ - struct eventhandler_entry *_ep, *_en; \ - struct eventhandler_entry_ ## name *_t; \ \ - if (((_el = eventhandler_find_list(#name)) != NULL) && \ - (_el->el_flags & EHE_INITTED)) { \ - EHE_LOCK(_el); \ - _ep = TAILQ_FIRST(&(_el->el_entries)); \ - while (_ep != NULL) { \ - _en = TAILQ_NEXT(_ep, ee_link); \ - _t = (struct eventhandler_entry_ ## name *)_ep; \ - _t->eh_func(_ep->ee_arg , __VA_ARGS__); \ - _ep = _en; \ - } \ - EHE_UNLOCK(_el); \ - } \ + if ((_el = eventhandler_find_list(#name)) != NULL) \ + _EVENTHANDLER_INVOKE(el, __VA_ARGS__); \ } while (0) #define EVENTHANDLER_REGISTER(name, func, arg, priority) \ @@ -148,14 +163,12 @@ } while(0) -extern eventhandler_tag eventhandler_register(struct eventhandler_list *list, - char *name, - void *func, - void *arg, - int priority); -extern void eventhandler_deregister(struct eventhandler_list *list, - eventhandler_tag tag); -extern struct eventhandler_list *eventhandler_find_list(char *name); +eventhandler_tag eventhandler_register(struct eventhandler_list *list, + char *name, void *func, void *arg, int priority); +void eventhandler_deregister(struct eventhandler_list *list, + eventhandler_tag tag); +struct eventhandler_list *eventhandler_find_list(char *name); +void eventhandler_prune_list(struct eventhandler_list *list); /* * Standard system event queues. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 21 9:58:14 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD78A37B405; Fri, 21 Feb 2003 09:58:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5878137B401 for ; Fri, 21 Feb 2003 09:58:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0029F43F3F for ; Fri, 21 Feb 2003 09:58:10 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1LHwA0U096820 for ; Fri, 21 Feb 2003 09:58:10 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1LHwAgq096816 for perforce@freebsd.org; Fri, 21 Feb 2003 09:58:10 -0800 (PST) Date: Fri, 21 Feb 2003 09:58:10 -0800 (PST) Message-Id: <200302211758.h1LHwAgq096816@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 25538 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25538 Change 25538 by rwatson@rwatson_tislabs on 2003/02/21 09:57:51 Submerge changes due to conflicts in base tree. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.8#13 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.8#13 (text+ko) ==== @@ -501,7 +501,6 @@ sectors/cylinder: 969 cylinders: 1211 sectors/unit: 1173930 -boot block size: 8192 rpm: 3600 interleave: 1 trackskew: 0 @@ -543,11 +542,6 @@ specifies that the drive can perform bad sector remapping. .It Nm sectors/unit describes the total size of the disk. This value must be correct. -.It Nm boot block size -specifies the total length of the boot block allowable on the disk. -This defaults to 8192, as it always has, but may be increased if there is -more space available, with a UFS2 filesystem as the first partition or -via other means. .It Nm the partition table This is the .Ux @@ -786,7 +780,6 @@ sectors/cylinder: 1008 cylinders: 40633 sectors/unit: 40959009 -boot block size: 8192 rpm: 3600 interleave: 1 trackskew: 0 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 21 9:58:37 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C187F37B401; Fri, 21 Feb 2003 09:58:12 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D511D37B410 for ; Fri, 21 Feb 2003 09:58:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84AD043FDF for ; Fri, 21 Feb 2003 09:58:10 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1LHwA0U096813 for ; Fri, 21 Feb 2003 09:58:10 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1LHwAKu096810 for perforce@freebsd.org; Fri, 21 Feb 2003 09:58:10 -0800 (PST) Date: Fri, 21 Feb 2003 09:58:10 -0800 (PST) Message-Id: <200302211758.h1LHwAKu096810@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 25537 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25537 Change 25537 by rwatson@rwatson_tislabs on 2003/02/21 09:57:16 Submerge local revisions due to extensive conflicts with main tree revisions. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/disklabel/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.5#7 integrate .. //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.8#12 integrate .. //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.c#17 integrate .. //depot/projects/trustedbsd/mac/sbin/disklabel/pathnames.h#2 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sbin/disklabel/Makefile#4 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.5#7 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.8#12 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)disklabel.8 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.43 2002/12/24 13:41:46 ru Exp $ +.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.45 2003/01/26 14:35:53 phk Exp $ .\" .Dd July 30, 1999 .Dt DISKLABEL 8 @@ -61,15 +61,11 @@ .Op Fl r .Op Fl n .Ar disk Ar protofile -.Nm -.Op Fl NW -.Ar disk .Pp .Nm .Fl B .Oo -.Fl b Ar boot1 -.Fl s Ar boot2 +.Fl b Ar boot .Oc .Ar disk .Oo Ar disktype/auto Oc @@ -78,8 +74,7 @@ .Fl B .Op Fl n .Oo -.Fl b Ar boot1 -.Fl s Ar boot2 +.Fl b Ar boot .Oc .Ar disk Ar disktype/auto .Oo Ar packid Oc @@ -88,8 +83,7 @@ .Fl B .Op Fl n .Oo -.Fl b Ar boot1 -.Fl s Ar boot2 +.Fl b Ar boot .Oc .Ar disk Ar protofile .Oo Ar disktype/auto Oc @@ -311,27 +305,6 @@ is used, no data will be written to the device, and instead the disklabel that would have been written will be printed to stdout. This is useful to see how a partitioning scheme will work out for a specific disk. -.Ss Enabling and disabling writing to the disk label area -.Pp -By default, it is not possible to write to the disk label area at the beginning -of a disk. The disk driver arranges for -.Xr write 2 -and similar system calls -to return -.Er EROFS -on any attempt to do so. If you need -to write to this area (for example, to obliterate the label), use the form -.Pp -.Nm -.Fl W -.Ar disk -.Pp -To disallow writing to the label area after previously allowing it, use the -command -.Pp -.Nm -.Fl N -.Ar disk .Ss Installing bootstraps .Pp The final three forms of @@ -354,8 +327,7 @@ .Nm .Fl B .Oo -.Fl b Ar boot1 -.Fl s Ar boot2 +.Fl b Ar boot .Oc .Ar disk .Oo Ar disktype Oc @@ -373,8 +345,7 @@ .Fl B .Op Fl n .Oo -.Fl b Ar boot1 -.Fl s Ar boot2 +.Fl b Ar boot .Oc .Ar disk Ar disktype .Oo Ar packid Oc @@ -396,8 +367,7 @@ .Fl B .Op Fl n .Oo -.Fl b Ar boot1 -.Fl s Ar boot2 +.Fl b Ar boot .Oc .Ar disk Ar protofile .Oo Ar disktype Oc @@ -447,12 +417,8 @@ .Xr disktab 5 entry for the disk if the disktab entry exists and includes those parameters. .It -Otherwise, the default boot image names are used: -.Pa /boot/boot1 -and -.Pa /boot/boot2 -for the standard stage1 and stage2 boot images (details may vary -on architectures like the Alpha, where only a single-stage boot is used). +Otherwise, the default boot image name are used: +.Pa /boot/boot . .El .Ss Initializing/Formatting a bootable disk from scratch .Pp @@ -773,21 +739,17 @@ Install a new bootstrap on .Pa da0s1 . The boot code comes from -.Pa /boot/boot1 -and possibly -.Pa /boot/boot2 . +.Pa /boot/boot . On-disk and in-core labels are unchanged. .Pp -.Dl disklabel -w -B /dev/da0s1 -b newboot1 -s newboot2 da2212 +.Dl disklabel -w -B /dev/da0s1 -b newboot da2212 .Pp Install a new label and bootstrap. The label is derived from disktab information for .Dq da2212 and installed both in-core and on-disk. The bootstrap code comes from the files -.Pa /boot/newboot1 -and -.Pa /boot/newboot2 . +.Pa /boot/newboot .Pp .Dl dd if=/dev/zero of=/dev/da0 bs=512 count=32 .Dl fdisk -BI da0 ==== //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.c#17 (text+ko) ==== @@ -54,7 +54,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/disklabel/disklabel.c,v 1.66 2003/01/16 12:57:53 des Exp $"); +__FBSDID("$FreeBSD: src/sbin/disklabel/disklabel.c,v 1.77 2003/01/26 21:55:43 phk Exp $"); #include #include @@ -69,9 +69,6 @@ #else #include #endif -#ifdef __sparc64__ -#include -#endif #include #include @@ -97,12 +94,6 @@ #ifndef BBSIZE #define BBSIZE 8192 /* size of boot area, with label */ #endif -/* - * Define an upper boundary for the boot blocks. - */ -#ifndef MAXBBSIZE -#define MAXBBSIZE 262144 /* max size of boot area, with label */ -#endif /* FIX! These are too low, but are traditional */ #define DEFAULT_NEWFS_BLOCK 8192U @@ -113,12 +104,11 @@ #define BIG_NEWFS_FRAG 2048U #define BIG_NEWFS_CPG 64U -#if defined(__i386__) || defined(__ia64__) -#define NUMBOOT 2 -#elif defined(__alpha__) || defined(__sparc64__) || defined(__powerpc__) -#define NUMBOOT 1 +#if defined(__i386__) +#elif defined(__alpha__) +#elif defined(__ia64__) #else -#error I do not know about this architecture. +#error I do not know about this architecture, and shall probably not be compiled for it. #endif void makelabel(const char *, const char *, struct disklabel *); @@ -134,7 +124,6 @@ int getasciilabel(FILE *, struct disklabel *); int getasciipartspec(char *, struct disklabel *, int, int); int checklabel(struct disklabel *); -void setbootflag(struct disklabel *); void Warning(const char *, ...) __printflike(1, 2); void usage(void); struct disklabel *getvirginlabel(void); @@ -148,7 +137,7 @@ char namebuf[BBSIZE], *np = namebuf; struct disklabel lab; -char bootarea[MAXBBSIZE]; +char bootarea[BBSIZE]; char blank[] = ""; char unknown[] = "unknown"; @@ -158,53 +147,35 @@ char part_offset_type[MAX_NUM_PARTS]; int part_set[MAX_NUM_PARTS]; -#if NUMBOOT > 0 int installboot; /* non-zero if we should install a boot program */ -char *bootbuf; /* pointer to buffer with remainder of boot prog */ -int bootsize; /* size of remaining boot program */ char *xxboot; /* primary boot */ -char *bootxx; /* secondary boot */ char boot0[MAXPATHLEN]; -char boot1[MAXPATHLEN]; -#endif enum { - UNSPEC, EDIT, NOWRITE, READ, RESTORE, WRITE, WRITEABLE, WRITEBOOT + UNSPEC, EDIT, READ, RESTORE, WRITE, WRITEBOOT } op = UNSPEC; int rflag; int disable_write; /* set to disable writing to disk label */ -#define OPTIONS "BNRWb:enrs:w" +#define OPTIONS "BRb:enrs:w" int main(int argc, char *argv[]) { struct disklabel *lp; FILE *t; - int ch, f = 0, flag, error = 0; + int ch, f = 0, error = 0; char *name = 0; while ((ch = getopt(argc, argv, OPTIONS)) != -1) switch (ch) { -#if NUMBOOT > 0 case 'B': ++installboot; break; case 'b': xxboot = optarg; break; -#if NUMBOOT > 1 - case 's': - bootxx = optarg; - break; -#endif -#endif - case 'N': - if (op != UNSPEC) - usage(); - op = NOWRITE; - break; case 'n': disable_write = 1; break; @@ -213,11 +184,6 @@ usage(); op = RESTORE; break; - case 'W': - if (op != UNSPEC) - usage(); - op = WRITEABLE; - break; case 'e': if (op != UNSPEC) usage(); @@ -237,19 +203,15 @@ } argc -= optind; argv += optind; -#if NUMBOOT > 0 if (installboot) { + rflag++; if (op == UNSPEC) op = WRITEBOOT; } else { if (op == UNSPEC) op = READ; - xxboot = bootxx = 0; + xxboot = 0; } -#else - if (op == UNSPEC) - op = READ; -#endif if (argc < 1) usage(); @@ -266,6 +228,10 @@ np = namebuf + strlen(specname) + 1; f = open(specname, op == READ ? O_RDONLY : O_RDWR); } + if (f < 0 && errno == EBUSY) { + /* lets try to get by with ioctls */ + f = open(specname, O_RDONLY); + } if (f < 0) err(4, "%s", specname); @@ -281,12 +247,6 @@ error = edit(lp, f); break; - case NOWRITE: - flag = 0; - if (ioctl(f, DIOCWLABEL, (char *)&flag) < 0) - err(4, "ioctl DIOCWLABEL"); - break; - case READ: if (argc != 1) usage(); @@ -296,7 +256,6 @@ break; case RESTORE: -#if NUMBOOT > 0 if (installboot && argc == 3) { makelabel(argv[2], 0, &lab); argc--; @@ -309,7 +268,6 @@ */ bzero((char *)&lab, sizeof(lab)); } -#endif if (argc != 2) usage(); if (!(t = fopen(argv[1], "r"))) @@ -335,13 +293,6 @@ error = writelabel(f, bootarea, lp); break; - case WRITEABLE: - flag = 1; - if (ioctl(f, DIOCWLABEL, (char *)&flag) < 0) - err(4, "ioctl DIOCWLABEL"); - break; - -#if NUMBOOT > 0 case WRITEBOOT: { struct disklabel tlab; @@ -350,14 +301,12 @@ tlab = *lp; if (argc == 2) makelabel(argv[1], 0, &lab); - lab.d_bbsize = lp->d_bbsize; lp = makebootarea(bootarea, &lab, f); *lp = tlab; if (checklabel(lp) == 0) error = writelabel(f, bootarea, lp); break; } -#endif } exit(error); } @@ -387,149 +336,58 @@ int writelabel(int f, const char *boot, struct disklabel *lp) { - int flag; #ifdef __alpha__ u_long *p, sum; int i; #endif -#ifdef __sparc64__ - struct sun_disklabel *sl; - u_short cksum, *sp1, *sp2; - struct partition *npp; - struct sun_dkpart *spp; - int i, secpercyl; -#endif if (disable_write) { Warning("write to disk label supressed - label was as follows:"); display(stdout, lp); return (0); - } else { - setbootflag(lp); - lp->d_magic = DISKMAGIC; - lp->d_magic2 = DISKMAGIC; - lp->d_checksum = 0; - lp->d_checksum = dkcksum(lp); - if (rflag || op == WRITEBOOT) { - /* - * First set the kernel disk label, - * then write a label to the raw disk. - * If the SDINFO ioctl fails because it is unimplemented, - * keep going; otherwise, the kernel consistency checks - * may prevent us from changing the current (in-core) - * label. - */ - if (op != WRITEBOOT && ioctl(f, DIOCSDINFO, lp) < 0 && - errno != ENODEV && errno != ENOTTY) { - l_perror("ioctl DIOCSDINFO"); - return (1); - } - (void)lseek(f, (off_t)0, SEEK_SET); - -#ifdef __alpha__ - /* - * Generate the bootblock checksum for the SRM console. - */ - for (p = (u_long *)boot, i = 0, sum = 0; i < 63; i++) - sum += p[i]; - p[63] = sum; -#endif -#ifdef __sparc64__ - /* - * Generate a Sun disklabel around the BSD label for - * PROM compatability. - */ - sl = (struct sun_disklabel *)boot; - memcpy(sl->sl_text, lp->d_packname, sizeof(lp->d_packname)); - sl->sl_rpm = lp->d_rpm; - sl->sl_pcylinders = lp->d_ncylinders + - lp->d_acylinders; /* XXX */ - sl->sl_sparespercyl = lp->d_sparespercyl; - sl->sl_interleave = lp->d_interleave; - sl->sl_ncylinders = lp->d_ncylinders; - sl->sl_acylinders = lp->d_acylinders; - sl->sl_ntracks = lp->d_ntracks; - sl->sl_nsectors = lp->d_nsectors; - sl->sl_magic = SUN_DKMAGIC; - secpercyl = sl->sl_nsectors * sl->sl_ntracks; - for (i = 0; i < 8; i++) { - spp = &sl->sl_part[i]; - npp = &lp->d_partitions[i]; - /* - * SunOS partitions must start on a cylinder - * boundary. Note this restriction is forced - * upon FreeBSD/sparc64 labels too, since we - * want to keep both labels synchronised. - */ - spp->sdkp_cyloffset = npp->p_offset / secpercyl; - spp->sdkp_nsectors = npp->p_size; - } + } - /* Compute the XOR checksum. */ - sp1 = (u_short *)sl; - sp2 = (u_short *)(sl + 1); - sl->sl_cksum = cksum = 0; - while (sp1 < sp2) - cksum ^= *sp1++; - sl->sl_cksum = cksum; -#endif - if (op != WRITEBOOT) { - /* - * write enable label sector before write (if - * necessary), disable after writing. - */ - flag = 1; - (void)ioctl(f, DIOCWLABEL, &flag); - if (write(f, boot, lp->d_bbsize) != (int)lp->d_bbsize) { - warn("write"); - return (1); - } - } else { - /* - * Write out all of the boot area except - * for the sector reserved for the disklabel - * itself; that part is written only by - * the kernel, and we can't get it right. - */ - ssize_t labelareabegin, labelareaend; - - labelareabegin = (LABELSECTOR * lp->d_secsize) - + LABELOFFSET; - labelareaend = labelareabegin + lp->d_secsize; - if (write(f, boot, labelareabegin) != - labelareabegin) { - warn("write"); - return (1); - } - (void)lseek(f, (off_t)labelareaend, SEEK_SET); - if (write(f, boot + labelareaend, - lp->d_bbsize - labelareaend) != - lp->d_bbsize - labelareaend) { - warn("write"); - return (1); - } - } -#if NUMBOOT > 0 - /* - * Output the remainder of the disklabel - */ - if (bootbuf && write(f, bootbuf, bootsize) != bootsize) { - warn("write"); - return(1); - } -#endif - if (op != WRITEBOOT) { - flag = 0; - (void) ioctl(f, DIOCWLABEL, &flag); - } else if (ioctl(f, DIOCWDINFO, lp) < 0) { - l_perror("ioctl DIOCWDINFO"); - return (1); - } - } else if (ioctl(f, DIOCWDINFO, lp) < 0) { + lp->d_magic = DISKMAGIC; + lp->d_magic2 = DISKMAGIC; + lp->d_checksum = 0; + lp->d_checksum = dkcksum(lp); + if (!rflag) { + if (ioctl(f, DIOCWDINFO, lp) < 0) { l_perror("ioctl DIOCWDINFO"); return (1); } + return (0); } + + /* + * First set the kernel disk label, + * then write a label to the raw disk. + * If the SDINFO ioctl fails because it is unimplemented, + * keep going; otherwise, the kernel consistency checks + * may prevent us from changing the current (in-core) + * label. + */ + if (ioctl(f, DIOCSDINFO, lp) < 0 && + errno != ENODEV && errno != ENOTTY) { + l_perror("ioctl DIOCSDINFO"); + return (1); + } + (void)lseek(f, (off_t)0, SEEK_SET); + +#ifdef __alpha__ + /* + * Generate the bootblock checksum for the SRM console. + */ + for (p = (u_long *)boot, i = 0, sum = 0; i < 63; i++) + sum += p[i]; + p[63] = sum; +#endif + if (ioctl(f, DIOCBSDBB, &boot) == 0) + return (0); + if (write(f, boot, lp->d_bbsize) != (int)lp->d_bbsize) { + warn("write"); + return (1); + } return (0); } @@ -604,28 +462,25 @@ struct disklabel *lp; char *p; int b; -#if NUMBOOT > 0 char *dkbasename; struct stat sb; -#endif #ifdef __alpha__ u_long *bootinfo; int n; #endif #ifdef __i386__ char *tmpbuf; - int i, found; + int i, found, dps; #endif /* XXX */ - if (dp->d_secsize == 0) + if (dp->d_secsize == 0) { dp->d_secsize = DEV_BSIZE; - if (dp->d_bbsize == 0) dp->d_bbsize = BBSIZE; + } lp = (struct disklabel *) (boot + (LABELSECTOR * dp->d_secsize) + LABELOFFSET); bzero((char *)lp, sizeof *lp); -#if NUMBOOT > 0 /* * If we are not installing a boot program but we are installing a * label on disk then we must read the current bootarea so we don't @@ -633,7 +488,7 @@ */ if (!installboot) { if (rflag) { - if (read(f, boot, lp->d_bbsize) < lp->d_bbsize) + if (read(f, boot, BBSIZE) < BBSIZE) err(4, "%s", specname); bzero((char *)lp, sizeof *lp); } @@ -643,7 +498,7 @@ * We are installing a boot program. Determine the name(s) and * read them into the appropriate places in the boot area. */ - if (!xxboot || !bootxx) { + if (!xxboot) { dkbasename = np; if ((p = rindex(dkname, '/')) == NULL) p = dkname; @@ -654,36 +509,22 @@ *np++ = '\0'; if (!xxboot) { - (void)sprintf(boot0, "%s/boot1", _PATH_BOOTDIR); + (void)sprintf(boot0, "%s/boot", _PATH_BOOTDIR); xxboot = boot0; } -#if NUMBOOT > 1 - if (!bootxx) { - (void)sprintf(boot1, "%s/boot2", _PATH_BOOTDIR); - bootxx = boot1; - } -#endif } - /* - * Strange rules: - * 1. One-piece bootstrap (hp300/hp800) - * 1. One-piece bootstrap (alpha/sparc64) - * up to d_bbsize bytes of ``xxboot'' go in bootarea, the rest - * is remembered and written later following the bootarea. - * 2. Two-piece bootstraps (i386/ia64) - * up to d_secsize bytes of ``xxboot'' go in first d_secsize - * bytes of bootarea, remaining d_bbsize-d_secsize filled - * from ``bootxx''. - */ b = open(xxboot, O_RDONLY); if (b < 0) err(4, "%s", xxboot); -#if NUMBOOT > 1 + if (fstat(b, &sb) != 0) + err(4, "%s", xxboot); #ifdef __i386__ + if (sb.st_size > BBSIZE) + errx(4, "%s too large", xxboot); /* * XXX Botch alert. - * The i386 has the so-called fdisk table embedded into the + * The i386/PC98 has the so-called fdisk table embedded into the * primary bootstrap. We take care to not clobber it, but * only if it does already contain some data. (Otherwise, * the xxboot provides a template.) @@ -691,77 +532,46 @@ if ((tmpbuf = (char *)malloc((int)dp->d_secsize)) == 0) err(4, "%s", xxboot); memcpy((void *)tmpbuf, (void *)boot, (int)dp->d_secsize); -#endif /* __i386__ */ - if (read(b, boot, (int)dp->d_secsize) < 0) + + if (read(b, boot, BBSIZE) < 0) err(4, "%s", xxboot); - (void)close(b); + + /* XXX: rely on some very precise overlaps in definitions */ #ifdef PC98 + dps = sizeof(struct pc98_partition); +#else + dps = sizeof(struct dos_partition); +#endif for (i = DOSPARTOFF, found = 0; - !found && i < (int)(DOSPARTOFF + NDOSPART * sizeof(struct pc98_partition)); + !found && i < (int)(DOSPARTOFF + NDOSPART * dps); i++) found = tmpbuf[i] != 0; if (found) memcpy((void *)&boot[DOSPARTOFF], (void *)&tmpbuf[DOSPARTOFF], - NDOSPART * sizeof(struct pc98_partition)); + NDOSPART * dps); free(tmpbuf); -#elif defined(__i386__) - for (i = DOSPARTOFF, found = 0; - !found && i < (int)(DOSPARTOFF + NDOSPART*sizeof(struct dos_partition)); - i++) - found = tmpbuf[i] != 0; - if (found) - memcpy((void *)&boot[DOSPARTOFF], - (void *)&tmpbuf[DOSPARTOFF], - NDOSPART * sizeof(struct dos_partition)); - free(tmpbuf); #endif /* __i386__ */ - b = open(bootxx, O_RDONLY); - if (b < 0) - err(4, "%s", bootxx); - if (fstat(b, &sb) != 0) - err(4, "%s", bootxx); - if (dp->d_secsize + sb.st_size > dp->d_bbsize) - errx(4, "%s too large", bootxx); - if (read(b, &boot[dp->d_secsize], - (int)(dp->d_bbsize-dp->d_secsize)) < 0) - err(4, "%s", bootxx); -#else /* !(NUMBOOT > 1) */ + #ifdef __alpha__ + if (sb.st_size > BBSIZE - dp->d_secsize) + errx(4, "%s too large", xxboot); /* * On the alpha, the primary bootstrap starts at the * second sector of the boot area. The first sector * contains the label and must be edited to contain the * size and location of the primary bootstrap. */ - n = read(b, boot + dp->d_secsize, (int)dp->d_bbsize); + n = read(b, boot + dp->d_secsize, BBSIZE - dp->d_secsize); if (n < 0) err(4, "%s", xxboot); bootinfo = (u_long *)(boot + 480); bootinfo[0] = (n + dp->d_secsize - 1) / dp->d_secsize; bootinfo[1] = 1; /* start at sector 1 */ bootinfo[2] = 0; /* flags (must be zero) */ -#else /* !__alpha__ */ - if (read(b, boot, (int)dp->d_bbsize) < 0) - err(4, "%s", xxboot); #endif /* __alpha__ */ - if (fstat(b, &sb) != 0) - err(4, "%s", xxboot); - bootsize = (int)sb.st_size - dp->d_bbsize; - if (bootsize > 0) { - /* XXX assume d_secsize is a power of two */ - bootsize = (bootsize + dp->d_secsize-1) & ~(dp->d_secsize-1); - bootbuf = (char *)malloc((size_t)bootsize); - if (bootbuf == 0) - err(4, "%s", xxboot); - if (read(b, bootbuf, bootsize) < 0) { - free(bootbuf); - err(4, "%s", xxboot); - } - } -#endif /* NUMBOOT > 1 */ + (void)close(b); -#endif /* NUMBOOT > 0 */ /* * Make sure no part of the bootstrap is written in the area * reserved for the label. @@ -801,7 +611,6 @@ fprintf(f, "sectors/cylinder: %lu\n", (u_long)lp->d_secpercyl); fprintf(f, "cylinders: %lu\n", (u_long)lp->d_ncylinders); fprintf(f, "sectors/unit: %lu\n", (u_long)lp->d_secperunit); - fprintf(f, "boot block size: %u\n", lp->d_bbsize); fprintf(f, "rpm: %u\n", lp->d_rpm); fprintf(f, "interleave: %u\n", lp->d_interleave); fprintf(f, "trackskew: %u\n", lp->d_trackskew); @@ -1143,16 +952,6 @@ lp->d_secperunit = v; continue; } - if (streq(cp, "boot block size")) { - v = strtoul(tp, NULL, 10); - if (v == 0 || v > UINT_MAX) { - fprintf(stderr, "line %d: %s: bad %s\n", - lineno, tp, cp); - errors++; - } else - lp->d_bbsize = v; - continue; - } if (streq(cp, "rpm")) { v = strtoul(tp, NULL, 10); if (v == 0 || v > USHRT_MAX) { @@ -1553,14 +1352,6 @@ if (pp->p_size == 0 && pp->p_offset != 0) Warning("partition %c: size 0, but offset %lu", part, (u_long)pp->p_offset); -#ifdef __sparc64__ - /* See comment in writelabel(). */ - if (pp->p_offset % lp->d_secpercyl != 0) { - fprintf(stderr, "partition %c: does not start on a " - "cylinder boundary!\n", part); - errors++; - } -#endif #ifdef notdef if (pp->p_size % lp->d_secpercyl) Warning("partition %c: size %% cylinder-size != 0", @@ -1686,10 +1477,10 @@ loclab.d_secpercyl = loclab.d_ntracks * loclab.d_nsectors; loclab.d_ncylinders = loclab.d_secperunit / loclab.d_secpercyl; loclab.d_npartitions = MAXPARTITIONS; - loclab.d_bbsize = BBSIZE; /* Various (unneeded) compat stuff */ loclab.d_rpm = 3600; + loclab.d_bbsize = BBSIZE; loclab.d_interleave = 1;; strncpy(loclab.d_typename, "amnesiac", sizeof(loclab.d_typename)); @@ -1701,48 +1492,7 @@ return (&loclab); } -/* - * If we are installing a boot program that doesn't fit in d_bbsize - * we need to mark those partitions that the boot overflows into. - * This allows newfs to prevent creation of a file system where it might - * clobber bootstrap code. - */ -void -setbootflag(struct disklabel *lp) -{ - struct partition *pp; - int i, errors = 0; - char part; - u_long boffset; - if (bootbuf == 0) - return; - boffset = bootsize / lp->d_secsize; - for (i = 0; i < lp->d_npartitions; i++) { - part = 'a' + i; - pp = &lp->d_partitions[i]; - if (pp->p_size == 0) - continue; - if (boffset <= pp->p_offset) { - if (pp->p_fstype == FS_BOOT) - pp->p_fstype = FS_UNUSED; - } else if (pp->p_fstype != FS_BOOT) { - if (pp->p_fstype != FS_UNUSED) { - fprintf(stderr, - "boot overlaps used partition %c\n", - part); - errors++; - } else { - pp->p_fstype = FS_BOOT; - Warning("boot overlaps partition %c, %s", - part, "marked as FS_BOOT"); - } - } - } - if (errors) - errx(4, "cannot install boot program"); -} - /*VARARGS1*/ void Warning(const char *fmt, ...) @@ -1759,8 +1509,7 @@ void usage(void) { -#if NUMBOOT > 0 - fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n", + fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n", "usage: disklabel [-r] disk", "\t\t(to read label)", " disklabel -w [-r] [-n] disk type [ packid ]", @@ -1769,34 +1518,12 @@ "\t\t(to edit label)", " disklabel -R [-r] [-n] disk protofile", "\t\t(to restore label with existing boot program)", -#if NUMBOOT > 1 - " disklabel -B [-n] [ -b boot1 [ -s boot2 ] ] disk [ type ]", - "\t\t(to install boot program with existing label)", - " disklabel -w -B [-n] [ -b boot1 [ -s boot2 ] ] disk type [ packid ]", - "\t\t(to write label and boot program)", - " disklabel -R -B [-n] [ -b boot1 [ -s boot2 ] ] disk protofile [ type ]", - "\t\t(to restore label and boot program)", -#else " disklabel -B [-n] [ -b bootprog ] disk [ type ]", "\t\t(to install boot program with existing on-disk label)", " disklabel -w -B [-n] [ -b bootprog ] disk type [ packid ]", "\t\t(to write label and install boot program)", " disklabel -R -B [-n] [ -b bootprog ] disk protofile [ type ]", - "\t\t(to restore label and install boot program)", -#endif - " disklabel [-NW] disk", - "\t\t(to write disable/enable label)"); -#else - fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n", - "usage: disklabel [-r] disk", "(to read label)", - " disklabel -w [-r] [-n] disk type [ packid ]", - "\t\t(to write label)", - " disklabel -e [-r] [-n] disk", - "\t\t(to edit label)", - " disklabel -R [-r] [-n] disk protofile", - "\t\t(to restore label)", - " disklabel [-NW] disk", - "\t\t(to write disable/enable label)"); -#endif + "\t\t(to restore label and install boot program)" + ); exit(1); } ==== //depot/projects/trustedbsd/mac/sbin/disklabel/pathnames.h#2 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 21 10: 6:21 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1747837B405; Fri, 21 Feb 2003 10:05:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7F5937B401 for ; Fri, 21 Feb 2003 10:05:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E9E543F3F for ; Fri, 21 Feb 2003 10:05:50 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1LI5n0U097424 for ; Fri, 21 Feb 2003 10:05:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1LI5Jj6097396 for perforce@freebsd.org; Fri, 21 Feb 2003 10:05:19 -0800 (PST) Date: Fri, 21 Feb 2003 10:05:19 -0800 (PST) Message-Id: <200302211805.h1LI5Jj6097396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 25539 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25539 Change 25539 by rwatson@rwatson_tislabs on 2003/02/21 10:04:40 Integ the MAC branch from the trustedbsd base branch. Countless changes, including substantial KSE updates, buffer cache lockdown, ctty changes, and much more. This may take a couple of days to settle due to some conflicts, especially in the tty code. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#15 integrate .. //depot/projects/trustedbsd/mac/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#33 integrate .. //depot/projects/trustedbsd/mac/UPDATING#25 integrate .. //depot/projects/trustedbsd/mac/bin/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/Makefile#1 branch .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#1 branch .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.c#1 branch .. //depot/projects/trustedbsd/mac/bin/chmod/chmod.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/Makefile#3 delete .. //depot/projects/trustedbsd/mac/bin/date/date.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/date/date.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/date/netdate.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/ps/fmt.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#16 integrate .. //depot/projects/trustedbsd/mac/bin/ps/nlist.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/ps/print.c#20 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.c#17 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/bltin/echo.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/eval.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/sh/machdep.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/memalloc.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/nodes.c.pat#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#11 integrate .. //depot/projects/trustedbsd/mac/bin/sh/show.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/CHANGES#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/README#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/Version#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_defs.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_sec.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_defs.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_ncache.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_req.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_resp.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/logging.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/options.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/named.conf.5#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/resolver.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_name.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_samedomain.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/FAQ#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/INSTALL#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/NEWS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/config.h.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/configure#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/configure.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/Makefile.am#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/cvs_acls.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/HACKING.DOCS#3 delete .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/stamp-1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/stamp-vti#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/version-client.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/version.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/Makefile.am#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/admin.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/annotate.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/buffer.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/client.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/commit.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/cvs.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/diff.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/edit.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/lock.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/log.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/myndbm.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/options.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/cvs/src/parseinfo.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/patch.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/rcs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/recurse.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/remove.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/root.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/sanity.sh#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/scramble.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/server.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/status.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/tag.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/update.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/watch.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/zlib.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/archive#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/audio#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/compress#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/ctags#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/filesystems#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/flash#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/gringotts#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/hp#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/images#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/lisp#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/msdos#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/python#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/sgml#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/vorbis#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Makefile.am#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Makefile.std#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/ascmagic.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/config.h.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/configure#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/configure.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/file.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/file.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/file.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/magic.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/patchlevel.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/print.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/readelf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/softmagic.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/Makefile.in#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/alias.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/basic-block.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/builtin-types.def#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/builtins.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-common.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-common.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-decl.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-format.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-parse.in#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-semantics.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-typeck.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/calls.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfganal.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfgbuild.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfgcleanup.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/combine.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config.gcc#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/t-osf4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/t-netbsd#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/cygwin.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/mingw32.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/linux.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000-protos.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.md#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rtems.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/sysv4.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-aix43#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-rtems#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-slibgcc-elf-ver#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-slibgcc-sld#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/configure#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/configure.in#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/ChangeLog#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/Make-lang.in#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/NEWS#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cp-tree.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cvt.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/decl.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/decl2.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/error.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/except.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/init.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/operators.def#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/parse.y#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/pt.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/rtti.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/search.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/semantics.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/tree.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/typeck.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpplib.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dbxout.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/cpp.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/gcc.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/gcc.texi#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/gcov.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/gcov.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/include/gcc-common.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/invoke.texi#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/passes.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/tm.texi#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doloop.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/emit-rtl.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expr.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expr.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/ChangeLog#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/Make-lang.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/g77.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/invoke.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/root.texi#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/version.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/fold-const.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/function.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcc.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcc.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/stddef.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/global.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr-rtems.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hashtab.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/integrate.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/jump.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/loop.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/mklibgcc.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/optabs.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/print-rtl.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/recog.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/rtlanal.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/stmt.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tradcpp.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree.def#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-dw2.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/version.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/groff_out.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/mdate.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-common#9 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-ditroff#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-nroff#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-syms#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/strip.sed#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/kupgrade#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/HISTORY#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/bpf.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/common.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/fils.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_lfil.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_sfil.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipf.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipfs.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_ef.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_hx.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_pc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_sn.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_td.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_tx.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/iplang/iplang_y.y#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipmon.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipnat.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/44arp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/arp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ip.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipresend.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipsend.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipsopt.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/iptest.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/iptests.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/lsock.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/resend.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/sirix.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/sock.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipt.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/kmem.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipf.5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipf.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipfs.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipfstat.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipftest.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipmon.8#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipnat.5#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipnat.8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/misc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/mli_ipl.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/mln_ipl.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/natparse.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/opt.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/parse.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/printnat.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/printstate.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/relay.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ipv6.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ipv6.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ipv6.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/libf2c/ChangeLog#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/configure#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/Version.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/Version.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/Version.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libobjc/ChangeLog#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libobjc/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libobjc/aclocal.m4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libobjc/configure#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/VERSION#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/gencode.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-bpf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap-int.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libpcap/pcap.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/ChangeLog#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/Makefile.am#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/Makefile.in#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/acconfig.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/acinclude.m4#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/aclocal.m4#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config.h.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/linker-map.gnu#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/generic/messages_members.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/generic/time_members.cc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/generic/time_members.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/gnu/messages_members.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/gnu/time_members.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/configure#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/configure.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/Makefile.am#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/Makefile.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/backward/alloc.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/c++config#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/fstream.tcc#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/locale_facets.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/locale_facets.tcc#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/localefwd.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/slice_array.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/stl_alloc.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/stl_bvector.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/stl_vector.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/streambuf.tcc#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/std/std_fstream.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/std/std_streambuf.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libmath/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libsupc++/Makefile.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libsupc++/eh_personality.cc#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libsupc++/tinfo.cc#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/codecvt.cc#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/ios.cc#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/locale.cc#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/localename.cc#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/stl-inst.cc#5 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/cmds.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/ftpcmd.y#5 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/ftpd.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/popen.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/version.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/CREDITS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/HISTORY#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/INSTALL#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/LICENSE#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/MANIFEST#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/README#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/RELNOTES#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/su.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_borrow_cred.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_free_data.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_get_option.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_log.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_nullconv.3#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_restore_cred.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_set_option.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_ttyconv.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_acct_mgmt.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_authenticate.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_chauthtok.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_close_session.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_end.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_error.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_data.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_item.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_user.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenv.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_info.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_open_session.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_prompt.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_putenv.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_data.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_item.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setcred.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setenv.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_authenticate.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_chauthtok.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_close_session.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_open_session.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_setcred.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_strerror.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_verror.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vinfo.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vprompt.3#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam_version.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_appl.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_constants.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_modules.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_types.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_borrow_cred.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_configure.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dispatch.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dynamic.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_findenv.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_free_data.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_get_option.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_impl.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_load.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_log.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_nullconv.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_restore_cred.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_set_option.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_static.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_acct_mgmt.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate_secondary.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_chauthtok.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_close_session.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_end.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_error.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_authtok.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_data.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_item.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_mapped_authtok.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_mapped_username.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_user.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_getenv.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_getenvlist.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_info.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_open_session.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_prompt.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_putenv.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_data.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_item.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_mapped_authtok.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_mapped_username.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_setcred.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_setenv.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_acct_mgmt.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_authenticate.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_authenticate_secondary.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_chauthtok.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_close_session.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_get_mapped_username.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_open_session.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_set_mapped_username.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_setcred.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_start.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_strerror.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_verror.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_vinfo.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_vprompt.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/misc/gendoc.pl#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/pam_deny.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_dummy/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_dummy/pam_dummy.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/pam_permit.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_unix/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_unix/pam_unix.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/opie/libopie/newseed.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/KNOWNBUGS#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/README#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/RELEASE_NOTES#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/README#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.cf#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.mc#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/local_procmail.m4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/cfhead.m4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/proto.m4#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/version.m4#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/sendmail.schema#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/cidrexpand#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/doublebounce.pl#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/doc/op/op.me#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/mfapi.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/mfdef.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/milter.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/libsmdb/smdb.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/bdb.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/conf.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/fdset.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_unixware.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/README#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/comm.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_settimeout.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/engine.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/handler.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/libmilter.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/listener.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/main.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/signal.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/local.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/mbdb.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/refill.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/stdio.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/smdb2.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsmutil/cf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/mail.local.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/mailstats/mailstats.8#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/smrsh.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/Makefile.m4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/README#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/SECURITY#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/TRACEFLAGS#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/collect.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/control.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/daemon.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/envelope.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/headers.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mailq.1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/main.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/map.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mci.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/milter.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/parseaddr.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/queue.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/readcf.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/recipient.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sasl.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/savemail.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sfsasl.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/srvrsmtp.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sysexits.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/tls.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/trace.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/udb.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/usersmtp.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/util.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/version.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/vacation/vacation.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/VERSION#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/tcpdump.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/tcpdump.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/kuser_locl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/admin/adm_locl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/admin/kdb_edit.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/admin/kdb_init.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/afsutil/kstring2key.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/bsd/bsd_locl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/enc_des.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/appl/telnet/telnetd/telnetd.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/kadm_locl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/kadmin.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/kpasswd_standalone.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/ksrvutil.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/ksrvutil_get.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/random_password.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/kadm/kadm_locl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb-protos.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/krb_check_auth.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/mk_priv.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/rd_priv.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/recvauth.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/sendauth.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/lib/krb/solaris_compat.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/server/kerberos.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-chall.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pam-freebsd.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config.5#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.8#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/version.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/CHANGES#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Configure#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/FAQ#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/INSTALL#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.org#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.ssl#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/NEWS#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/PROBLEMS#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/README#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/README.ASN1#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/README.ENGINE#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/CA.pl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/CA.pl.in#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/app_rand.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/apps.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/apps.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/asn1pars.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ca.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ciphers.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/crl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/crl2p7.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dgst.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dh.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dhparam.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dsa.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dsaparam.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/enc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/engine.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/errstr.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/gendh.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/gendsa.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/genrsa.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/nseq.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ocsp.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/openssl.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/openssl.cnf#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/passwd.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/pkcs12.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/pkcs7.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/pkcs8.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/progs.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/progs.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rand.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/req.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rsa.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rsautl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_apps.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_cb.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_client.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_server.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_socket.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_time.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/sess_id.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/smime.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/speed.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/testdsa.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/version.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/winrand.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/x509.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/bugs/stream.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/RegTP-4R.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/RegTP-5R.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/RegTP-6R.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/config#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/Makefile.ssl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/README#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_cbc.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_cfb.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_core.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_ctr.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_ecb.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_locl.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_misc.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_ofb.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_bitstr.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_bmp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_bool.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_bytes.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_d2i_fp.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_digest.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_dup.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_enum.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_gentm.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_i2d_fp.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_int.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_null.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_object.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_octet.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_print.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_set.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_sign.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_strex.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_strnid.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_time.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_type.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_utctm.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_utf8.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_verify.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_vis.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_lib.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_mac.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_par.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1t.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn_moid.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn_pack.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/d2i_dhp.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/d2i_dsap.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/d2i_pr.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/d2i_pu.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/d2i_r_pr.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/d2i_r_pu.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/d2i_s_pr.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/d2i_s_pu.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/f_int.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/i2d_dhp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/i2d_dsap.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/i2d_pr.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/i2d_pu.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/i2d_r_pr.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/i2d_r_pu.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/i2d_s_pr.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/i2d_s_pu.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/n_pkey.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/nsseq.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p5_pbe.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p5_pbev2.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p7_dgst.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p7_enc.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p7_enc_c.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p7_evp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p7_i_s.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p7_lib.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p7_recip.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p7_s_e.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p7_signd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p7_signi.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p8_pkey.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/t_crl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/t_pkey.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/t_req.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/t_spki.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/t_x509.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/t_x509a.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_dec.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_enc.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_fre.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_new.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_prn.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_typ.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/tasn_utl.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_algor.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_attrib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_bignum.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_crl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_exten.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_info.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_long.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_name.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_pubkey.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_req.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_sig.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_spki.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_val.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_x509.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_x509a.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/bf_opts.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/bf_skey.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/bfspeed.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/bftest.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/blowfish.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_print.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_sock.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bf_buff.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bf_nbio.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bf_null.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bio.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bio_cb.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bio_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bio_lib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_acpt.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_bio.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_conn.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_fd.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_file.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_log.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_mem.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_sock.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/README#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/bn-586.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/ia64.S#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/pa-risc2.s#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_add.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_asm.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_ctx.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_div.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_exp.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_exp2.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_gcd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_kron.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_lcl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_lib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_mod.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_mont.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_mpi.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_mul.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_prime.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_print.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_rand.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_recp.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_shift.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_sqr.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_sqrt.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_word.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bnspeed.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bntest.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/divtest.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/expspeed.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/exptest.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/test.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/buffer/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/buffer/buf_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/buffer/buffer.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/buffer/buffer.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/cast.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/cast_lcl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/cast_spd.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/castopts.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/casttest.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/c_rle.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/c_zlib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/comp.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/comp_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/README#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/cnf_save.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_api.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_api.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_def.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_lib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_mall.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_mod.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_sap.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cpt_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cryptlib.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cryptlib.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/crypto.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cversion.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/FILES#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/FILES0#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/asm/crypt586.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/asm/des-586.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/asm/des686.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/asm/desboth.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/cbc3_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/cbc_cksm.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/cfb64ede.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/cfb64enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/cfb_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_locl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_old.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_old.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_old2.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_opts.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_ver.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/destest.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/ecb3_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/ecb_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/ede_cbcm_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/enc_read.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/enc_writ.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/fcrypt.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/fcrypt_b.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/ncbc_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/ofb64ede.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/ofb64enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/ofb_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/pcbc_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/qud_cksm.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/rand_key.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/read2pwd.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/read_pwd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/rnd_keys.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/rpc_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/rpw.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/set_key.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/speed.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/spr.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/str2key.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/xcbc_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_asn1.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_check.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_key.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dhtest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_asn1.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_gen.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_key.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_ossl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_sign.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_vrf.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsagen.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsatest.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/README#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso_dl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso_dlfcn.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso_lib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ebcdic.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/Makefile.ssl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_cvt.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_lcl.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_lib.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ec_mult.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ecp_mont.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ecp_nist.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ecp_recp.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ecp_smpl.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/ectest.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/Makefile.ssl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/README#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_all.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_cnf.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_ctrl.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_dyn.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_fat.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_init.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_int.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_lib.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_list.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_openssl.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_pkey.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/eng_table.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/engine.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/enginetest.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw.ec#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_4758_cca.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_4758_cca_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_4758_cca_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_aep.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_aep_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_aep_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_atalla.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_atalla_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_atalla_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_cryptodev.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_cswift.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_cswift_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_cswift_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_ncipher.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_ncipher_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_ncipher_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_nuron.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_nuron_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_nuron_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_sureware.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_sureware_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_sureware_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_ubsec.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_ubsec_err.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_ubsec_err.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/tb_cipher.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/tb_dh.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 21 10:35:36 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B9F437B405; Fri, 21 Feb 2003 10:35:34 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C45DE37B401 for ; Fri, 21 Feb 2003 10:35:33 -0800 (PST) Received: from mail.speakeasy.net (mail16.speakeasy.net [216.254.0.216]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EC5A43F75 for ; Fri, 21 Feb 2003 10:35:33 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 7903 invoked from network); 21 Feb 2003 18:35:37 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail16.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 21 Feb 2003 18:35:37 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.6/8.12.6) with ESMTP id h1LIZ3hT004665; Fri, 21 Feb 2003 13:35:03 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200302211742.h1LHgptx095984@repoman.freebsd.org> Date: Fri, 21 Feb 2003 13:35:43 -0500 (EST) From: John Baldwin To: John Baldwin Subject: RE: PERFORCE change 25536 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 21-Feb-2003 John Baldwin wrote: > http://perforce.freebsd.org/chv.cgi?CH=25536 > > Change 25536 by jhb@jhb_laptop on 2003/02/21 09:41:54 > > Real eventhandler locking without evilness. Highlights: > - Uses mutex rather than a sx lock for each list. > - We use a runcount that we increment when starting to invoke a > list and decrement when finished invoking a list. > - When deleteing a handler, if the runcount is not 0, we mark > the event as dead using a reserved priority value (-1) rather > than removing it from the list right then and there. > - When we finish invoking a list and the runcount goes down to 0, > we prune the list of any dead handlers. > - A bit more sane locking is used. > - All the %^&#ing code duplication in the invoke methods is gone > by having the two invoke macros lookup and lock the list before > calling a common macro. > - The pruning of the list is a function so as to not bloat the > invoke macros too much. Cons: not compiled or tested yet. :) -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 21 10:47:44 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A6DD37B405; Fri, 21 Feb 2003 10:47:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 918AA37B401 for ; Fri, 21 Feb 2003 10:47:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A43243FD7 for ; Fri, 21 Feb 2003 10:47:42 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1LIlf0U099738 for ; Fri, 21 Feb 2003 10:47:41 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1LIlfEm099735 for perforce@freebsd.org; Fri, 21 Feb 2003 10:47:41 -0800 (PST) Date: Fri, 21 Feb 2003 10:47:41 -0800 (PST) Message-Id: <200302211847.h1LIlfEm099735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov Subject: PERFORCE change 25541 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25541 Change 25541 by tzukanov@tzukanov_antares on 2003/02/21 10:47:26 Compilation fix. Affected files ... .. //depot/projects/s390/sys/boot/Makefile#4 edit Differences ... ==== //depot/projects/s390/sys/boot/Makefile#4 (text+ko) ==== @@ -5,6 +5,7 @@ .if ${MACHINE_ARCH} != "s390" && ${MACHINE_ARCH} != "s390x" SUBDIR+= ficl .endif +.endif # Build OpenFirmware library .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 21 11:37:40 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71FFA37B405; Fri, 21 Feb 2003 11:37:13 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 16CD337B401 for ; Fri, 21 Feb 2003 11:37:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8359443FAF for ; Fri, 21 Feb 2003 11:37:10 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1LJbA0U008275 for ; Fri, 21 Feb 2003 11:37:10 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1LJarTw008093 for perforce@freebsd.org; Fri, 21 Feb 2003 11:36:53 -0800 (PST) Date: Fri, 21 Feb 2003 11:36:53 -0800 (PST) Message-Id: <200302211936.h1LJarTw008093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov Subject: PERFORCE change 25543 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25543 Change 25543 by tzukanov@tzukanov_antares on 2003/02/21 11:36:41 IFC. Affected files ... .. //depot/projects/s390/MAINTAINERS#8 integrate .. //depot/projects/s390/Makefile#7 integrate .. //depot/projects/s390/Makefile.inc1#10 integrate .. //depot/projects/s390/bin/Makefile#4 integrate .. //depot/projects/s390/bin/chflags/Makefile#1 branch .. //depot/projects/s390/bin/chflags/chflags.1#1 branch .. //depot/projects/s390/bin/chflags/chflags.c#1 branch .. //depot/projects/s390/bin/date/date.1#3 integrate .. //depot/projects/s390/bin/sh/machdep.h#3 branch .. //depot/projects/s390/bin/sh/memalloc.c#3 integrate .. //depot/projects/s390/bin/sh/nodes.c.pat#3 integrate .. //depot/projects/s390/contrib/file/Magdir/archive#3 integrate .. //depot/projects/s390/contrib/file/Magdir/audio#3 integrate .. //depot/projects/s390/contrib/file/Magdir/compress#3 integrate .. //depot/projects/s390/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/s390/contrib/file/Magdir/filesystems#3 integrate .. //depot/projects/s390/contrib/file/Magdir/flash#2 integrate .. //depot/projects/s390/contrib/file/Magdir/gringotts#2 integrate .. //depot/projects/s390/contrib/file/Magdir/hp#2 integrate .. //depot/projects/s390/contrib/file/Magdir/images#3 integrate .. //depot/projects/s390/contrib/file/Magdir/lisp#3 integrate .. //depot/projects/s390/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/s390/contrib/file/Magdir/python#2 integrate .. //depot/projects/s390/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/s390/contrib/file/Magdir/vorbis#3 integrate .. //depot/projects/s390/contrib/file/Makefile.am#3 integrate .. //depot/projects/s390/contrib/file/Makefile.in#3 integrate .. //depot/projects/s390/contrib/file/Makefile.std#3 integrate .. //depot/projects/s390/contrib/file/README#3 integrate .. //depot/projects/s390/contrib/file/ascmagic.c#3 integrate .. //depot/projects/s390/contrib/file/config.h.in#3 integrate .. //depot/projects/s390/contrib/file/configure#3 integrate .. //depot/projects/s390/contrib/file/configure.in#3 integrate .. //depot/projects/s390/contrib/file/file.c#3 integrate .. //depot/projects/s390/contrib/file/file.h#3 integrate .. //depot/projects/s390/contrib/file/file.man#3 integrate .. //depot/projects/s390/contrib/file/magic.man#3 integrate .. //depot/projects/s390/contrib/file/patchlevel.h#3 integrate .. //depot/projects/s390/contrib/file/print.c#3 integrate .. //depot/projects/s390/contrib/file/readelf.c#3 integrate .. //depot/projects/s390/contrib/file/softmagic.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_vprompt.c#3 integrate .. //depot/projects/s390/crypto/openssh/auth2-pam-freebsd.c#7 integrate .. //depot/projects/s390/crypto/openssl/CHANGES#4 integrate .. //depot/projects/s390/crypto/openssl/Configure#4 integrate .. //depot/projects/s390/crypto/openssl/FAQ#4 integrate .. //depot/projects/s390/crypto/openssl/INSTALL#4 integrate .. //depot/projects/s390/crypto/openssl/Makefile.org#4 integrate .. //depot/projects/s390/crypto/openssl/Makefile.ssl#4 integrate .. //depot/projects/s390/crypto/openssl/NEWS#4 integrate .. //depot/projects/s390/crypto/openssl/PROBLEMS#3 integrate .. //depot/projects/s390/crypto/openssl/README#4 integrate .. //depot/projects/s390/crypto/openssl/apps/Makefile.ssl#4 integrate .. //depot/projects/s390/crypto/openssl/apps/apps.c#4 integrate .. //depot/projects/s390/crypto/openssl/apps/apps.h#3 integrate .. //depot/projects/s390/crypto/openssl/apps/ca.c#4 integrate .. //depot/projects/s390/crypto/openssl/apps/dgst.c#4 integrate .. //depot/projects/s390/crypto/openssl/apps/dh.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/dhparam.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/dsa.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/dsaparam.c#4 integrate .. //depot/projects/s390/crypto/openssl/apps/enc.c#4 integrate .. //depot/projects/s390/crypto/openssl/apps/engine.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/gendh.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/gendsa.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/genrsa.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/ocsp.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/openssl.c#4 integrate .. //depot/projects/s390/crypto/openssl/apps/pkcs12.c#4 integrate .. //depot/projects/s390/crypto/openssl/apps/pkcs7.c#4 integrate .. //depot/projects/s390/crypto/openssl/apps/pkcs8.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/progs.h#3 integrate .. //depot/projects/s390/crypto/openssl/apps/rand.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/req.c#4 integrate .. //depot/projects/s390/crypto/openssl/apps/rsa.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/rsautl.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/s_client.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/s_server.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/smime.c#4 integrate .. //depot/projects/s390/crypto/openssl/apps/speed.c#4 integrate .. //depot/projects/s390/crypto/openssl/apps/spkac.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/verify.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/x509.c#4 integrate .. //depot/projects/s390/crypto/openssl/config#4 integrate .. //depot/projects/s390/crypto/openssl/crypto/aes/aes_core.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_time.c#4 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/asn1.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/asn1_err.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bf/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/b_sock.c#4 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bio.h#4 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bio_lib.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/asm/ia64.S#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/asm/pa-risc2.s#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_lcl.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_prime.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/cast/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/conf/conf_mall.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/conf/conf_sap.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/asm/crypt586.pl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/asm/des-586.pl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/cbc_cksm.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/des_locl.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/destest.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/dh/dh_key.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/dh/dh_lib.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa_lib.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa_ossl.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa_sign.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa_vrf.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsagen.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsatest.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/dso/dso_dl.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/ec/ec.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/ec/ec_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/ec/ec_lib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/ec/ec_mult.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/ec/ectest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/engine/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/engine/engine.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/engine/enginetest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/err/err.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/err/err_all.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/digest.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/evp_acnf.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/evp_enc.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/evp_test.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/krb5/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md2/md2test.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/md4/md4.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/md5/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/md5/md5.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md5/md5.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/mem.c#4 integrate .. //depot/projects/s390/crypto/openssl/crypto/o_time.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/objects/obj_dat.h#4 integrate .. //depot/projects/s390/crypto/openssl/crypto/objects/obj_mac.h#4 integrate .. //depot/projects/s390/crypto/openssl/crypto/objects/objects.txt#4 integrate .. //depot/projects/s390/crypto/openssl/crypto/ocsp/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/opensslv.h#4 integrate .. //depot/projects/s390/crypto/openssl/crypto/perlasm/x86asm.pl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/perlasm/x86ms.pl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/perlasm/x86nasm.pl#4 integrate .. //depot/projects/s390/crypto/openssl/crypto/perlasm/x86unix.pl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/rand/rand.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/rand/rand_lib.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc4/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc5/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc5/rc5_locl.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/ripemd/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/ripemd/rmd160.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_eay.c#4 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_lib.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_sign.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_test.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/sha/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/ui/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/ui/ui_openssl.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/ext_dat.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_ocsp.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_purp.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3conf.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/x509v3.h#3 integrate .. //depot/projects/s390/crypto/openssl/demos/x509/mkcert.c#2 integrate .. //depot/projects/s390/crypto/openssl/demos/x509/mkreq.c#2 integrate .. //depot/projects/s390/crypto/openssl/doc/HOWTO/certificates.txt#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/ca.pod#3 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/dhparam.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/dsa.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/dsaparam.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/gendsa.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/genrsa.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/pkcs7.pod#3 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/pkcs8.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/req.pod#3 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/rsa.pod#3 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/spkac.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/x509.pod#3 integrate .. //depot/projects/s390/crypto/openssl/doc/crypto/BN_generate_prime.pod#3 integrate .. //depot/projects/s390/crypto/openssl/doc/crypto/EVP_SealInit.pod#3 integrate .. //depot/projects/s390/crypto/openssl/doc/standards.txt#3 integrate .. //depot/projects/s390/crypto/openssl/openssl.spec#4 integrate .. //depot/projects/s390/crypto/openssl/ssl/bio_ssl.c#3 integrate .. //depot/projects/s390/crypto/openssl/ssl/s2_clnt.c#4 integrate .. //depot/projects/s390/crypto/openssl/ssl/s3_both.c#4 integrate .. //depot/projects/s390/crypto/openssl/ssl/s3_enc.c#4 integrate .. //depot/projects/s390/crypto/openssl/ssl/s3_pkt.c#4 integrate .. //depot/projects/s390/crypto/openssl/ssl/ssl.h#4 integrate .. //depot/projects/s390/crypto/openssl/ssl/ssl_cert.c#4 integrate .. //depot/projects/s390/crypto/openssl/ssl/ssl_lib.c#4 integrate .. //depot/projects/s390/crypto/openssl/ssl/ssltest.c#4 integrate .. //depot/projects/s390/crypto/openssl/test/Makefile.ssl#4 integrate .. //depot/projects/s390/crypto/openssl/test/testgen#3 integrate .. //depot/projects/s390/crypto/openssl/util/bat.sh#2 integrate .. //depot/projects/s390/crypto/openssl/util/libeay.num#4 integrate .. //depot/projects/s390/crypto/openssl/util/mk1mf.pl#4 integrate .. //depot/projects/s390/crypto/openssl/util/mkdef.pl#3 integrate .. //depot/projects/s390/crypto/openssl/util/ssleay.num#3 integrate .. //depot/projects/s390/etc/defaults/pccard.conf#6 integrate .. //depot/projects/s390/etc/mtree/BSD.usr.dist#6 integrate .. //depot/projects/s390/etc/newsyslog.conf#3 integrate .. //depot/projects/s390/etc/opieaccess#2 integrate .. //depot/projects/s390/etc/pam.d/ftpd#3 integrate .. //depot/projects/s390/etc/pam.d/login#3 integrate .. //depot/projects/s390/etc/pam.d/other#3 integrate .. //depot/projects/s390/etc/pam.d/sshd#5 integrate .. //depot/projects/s390/etc/pam.d/su#5 integrate .. //depot/projects/s390/etc/pam.d/telnetd#3 integrate .. //depot/projects/s390/etc/pam.d/xdm#3 integrate .. //depot/projects/s390/etc/rc.d/diskless#5 integrate .. //depot/projects/s390/etc/rc.d/initdiskless#5 integrate .. //depot/projects/s390/etc/rc.d/ipsec#3 integrate .. //depot/projects/s390/etc/rc.d/virecover#3 integrate .. //depot/projects/s390/etc/rc.diskless1#5 integrate .. //depot/projects/s390/games/fortune/Notes#3 integrate .. //depot/projects/s390/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/s390/games/fortune/datfiles/fortunes2#4 integrate .. //depot/projects/s390/gnu/lib/libstdc++/c++config.h#3 integrate .. //depot/projects/s390/gnu/lib/libstdc++/config.h#3 integrate .. //depot/projects/s390/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/s390/lib/Makefile#5 integrate .. //depot/projects/s390/lib/compat/compat4x.alpha/Makefile#3 integrate .. //depot/projects/s390/lib/compat/compat4x.alpha/libcrypto.so.2.gz.uu#1 branch .. //depot/projects/s390/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu#1 branch .. //depot/projects/s390/lib/compat/compat4x.alpha/libssl.so.2.gz.uu#1 branch .. //depot/projects/s390/lib/compat/compat4x.i386/Makefile#4 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/libcrypto.so.2.gz.uu#1 branch .. //depot/projects/s390/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu#1 branch .. //depot/projects/s390/lib/compat/compat4x.i386/libssl.so.2.gz.uu#1 branch .. //depot/projects/s390/lib/libc/alpha/gen/getcontext.S#3 delete .. //depot/projects/s390/lib/libc/db/btree/bt_put.c#2 integrate .. //depot/projects/s390/lib/libc/db/btree/bt_split.c#2 integrate .. //depot/projects/s390/lib/libc/db/hash/hash_bigkey.c#2 integrate .. //depot/projects/s390/lib/libc/db/hash/hash_func.c#2 integrate .. //depot/projects/s390/lib/libc/db/recno/rec_close.c#2 integrate .. //depot/projects/s390/lib/libc/db/recno/rec_seq.c#2 integrate .. //depot/projects/s390/lib/libc/gen/dlopen.3#5 integrate .. //depot/projects/s390/lib/libc/gen/getgrouplist.c#3 integrate .. //depot/projects/s390/lib/libc/gen/getpwent.c#2 integrate .. //depot/projects/s390/lib/libc/gen/nlist.c#3 integrate .. //depot/projects/s390/lib/libc/gen/semctl.c#3 integrate .. //depot/projects/s390/lib/libc/gen/sysctl.c#2 integrate .. //depot/projects/s390/lib/libc/gen/unvis.c#3 integrate .. //depot/projects/s390/lib/libc/i386/gen/getcontext.S#3 delete .. //depot/projects/s390/lib/libc/i386/gen/signalcontext.c#2 integrate .. //depot/projects/s390/lib/libc/i386/sys/i386_get_ioperm.c#2 integrate .. //depot/projects/s390/lib/libc/i386/sys/i386_get_ldt.c#2 integrate .. //depot/projects/s390/lib/libc/i386/sys/i386_set_ioperm.c#2 integrate .. //depot/projects/s390/lib/libc/i386/sys/i386_set_ldt.c#2 integrate .. //depot/projects/s390/lib/libc/i386/sys/i386_vm86.c#2 integrate .. //depot/projects/s390/lib/libc/include/namespace.h#4 integrate .. //depot/projects/s390/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/s390/lib/libc/locale/utf8.c#2 integrate .. //depot/projects/s390/lib/libc/net/if_nametoindex.c#3 integrate .. //depot/projects/s390/lib/libc/net/name6.c#4 integrate .. //depot/projects/s390/lib/libc/net/ns_name.c#3 integrate .. //depot/projects/s390/lib/libc/net/ns_ttl.c#2 integrate .. //depot/projects/s390/lib/libc/net/rcmd.c#3 integrate .. //depot/projects/s390/lib/libc/net/res_debug.c#2 integrate .. //depot/projects/s390/lib/libc/net/res_mkupdate.c#2 integrate .. //depot/projects/s390/lib/libc/net/res_query.c#3 integrate .. //depot/projects/s390/lib/libc/posix1e/mac.c#2 integrate .. //depot/projects/s390/lib/libc/posix1e/mac_exec.c#2 integrate .. //depot/projects/s390/lib/libc/posix1e/mac_get.c#3 integrate .. //depot/projects/s390/lib/libc/regex/engine.c#2 integrate .. //depot/projects/s390/lib/libc/regex/regcomp.c#3 integrate .. //depot/projects/s390/lib/libc/regex/regexec.c#3 integrate .. //depot/projects/s390/lib/libc/rpc/crypt_client.c#2 integrate .. //depot/projects/s390/lib/libc/rpc/getnetconfig.c#4 integrate .. //depot/projects/s390/lib/libc/rpc/mt_misc.c#2 integrate .. //depot/projects/s390/lib/libc/stdio/mktemp.c#2 integrate .. //depot/projects/s390/lib/libc/stdio/stdio.3#5 integrate .. //depot/projects/s390/lib/libc/stdlib/rand.c#4 integrate .. //depot/projects/s390/lib/libc/stdtime/asctime.c#2 integrate .. //depot/projects/s390/lib/libc/stdtime/difftime.c#2 integrate .. //depot/projects/s390/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/s390/lib/libc/stdtime/strptime.c#3 integrate .. //depot/projects/s390/lib/libc/sys/intro.2#5 integrate .. //depot/projects/s390/lib/libc/sys/sem.c#3 integrate .. //depot/projects/s390/lib/libdevinfo/devinfo_var.h#3 integrate .. //depot/projects/s390/lib/libdevstat/devstat.3#2 integrate .. //depot/projects/s390/lib/libdevstat/devstat.c#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#2 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_cancel.c#2 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_init.c#3 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_kern.c#3 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_private.h#3 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_sig.c#2 integrate .. //depot/projects/s390/lib/libpthread/thread/thr_sigpending.c#2 integrate .. //depot/projects/s390/lib/libufs/block.c#4 integrate .. //depot/projects/s390/lib/libufs/sblock.c#4 integrate .. //depot/projects/s390/libexec/rpc.rstatd/rstat_proc.c#3 integrate .. //depot/projects/s390/libexec/rtld-elf/rtld.c#5 integrate .. //depot/projects/s390/release/Makefile#10 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/installation/common/install.sgml#5 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 integrate .. //depot/projects/s390/release/i386/dokern.sh#5 integrate .. //depot/projects/s390/release/i386/drivers.conf#9 integrate .. //depot/projects/s390/sbin/Makefile#5 integrate .. //depot/projects/s390/sbin/camcontrol/Makefile#2 integrate .. //depot/projects/s390/sbin/camcontrol/camcontrol.c#4 integrate .. //depot/projects/s390/sbin/camcontrol/modeedit.c#2 integrate .. //depot/projects/s390/sbin/camcontrol/util.c#2 integrate .. //depot/projects/s390/sbin/newfs/newfs.8#4 integrate .. //depot/projects/s390/sbin/vinum/commands.c#3 integrate .. //depot/projects/s390/sbin/vinum/list.c#3 integrate .. //depot/projects/s390/sbin/vinum/vext.h#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/Makefile#6 integrate .. //depot/projects/s390/secure/lib/libcrypto/Makefile.inc#6 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ASN1_STRING_length.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ASN1_STRING_new.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_ctrl.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_f_base64.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_f_buffer.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_f_cipher.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_f_md.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_f_null.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_f_ssl.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_find_type.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_new.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_push.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_read.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_s_accept.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_s_bio.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_s_connect.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_s_fd.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_s_file.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_s_mem.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_s_null.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_s_socket.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_set_callback.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BIO_should_retry.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_CTX_new.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_CTX_start.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_add.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_add_word.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_bn2bin.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_cmp.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_copy.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_generate_prime.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_mod_inverse.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_new.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_num_bytes.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_rand.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_set_bit.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_swap.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/BN_zero.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DH_generate_key.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DH_generate_parameters.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DH_get_ex_new_index.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DH_new.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DH_set_method.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DH_size.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DSA_SIG_new.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DSA_do_sign.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DSA_dup_DH.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DSA_generate_key.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DSA_generate_parameters.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DSA_new.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DSA_set_method.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DSA_sign.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/DSA_size.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ERR_GET_LIB.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ERR_clear_error.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ERR_error_string.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ERR_get_error.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ERR_load_strings.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ERR_print_errors.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ERR_put_error.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ERR_remove_state.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/EVP_BytesToKey.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/EVP_DigestInit.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/EVP_EncryptInit.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/EVP_OpenInit.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/EVP_PKEY_new.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/EVP_SealInit.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/EVP_SignInit.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/EVP_VerifyInit.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/OBJ_nid2obj.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/PKCS12_create.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/PKCS12_parse.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/PKCS7_decrypt.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/PKCS7_encrypt.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/PKCS7_sign.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/PKCS7_verify.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RAND_add.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RAND_bytes.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RAND_cleanup.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RAND_egd.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RAND_load_file.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RAND_set_rand_method.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RSA_blinding_on.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RSA_check_key.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RSA_generate_key.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RSA_new.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RSA_print.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RSA_private_encrypt.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RSA_public_encrypt.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RSA_set_method.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RSA_sign.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/RSA_size.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/X509_NAME_print_ex.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/X509_new.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/bio.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/blowfish.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/bn.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/bn_internal.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/buffer.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/crypto.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/d2i_DHparams.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/d2i_X509.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/d2i_X509_CRL.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/d2i_X509_NAME.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/d2i_X509_REQ.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/d2i_X509_SIG.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/des.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/dh.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/dsa.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/engine.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/err.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/evp.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/hmac.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/lh_stats.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/lhash.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/md5.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/mdc2.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/pem.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/rand.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/rc4.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ripemd.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/rsa.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/sha.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/threads.3#5 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ui.3#3 integrate .. //depot/projects/s390/secure/lib/libcrypto/man/ui_compat.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CIPHER_get_name.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_COMP_add_compression_method.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_add_session.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_ctrl.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_flush_sessions.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_free.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_new.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_sess_number.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_sessions.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_cert_store.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_info_callback.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_mode.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_options.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_timeout.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_set_verify.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_CTX_use_certificate.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_SESSION_free.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_SESSION_get_time.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_accept.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_alert_type_string.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_clear.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_connect.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_do_handshake.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_free.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_SSL_CTX.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_ciphers.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_client_CA_list.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_current_cipher.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_default_timeout.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_error.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_ex_new_index.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_fd.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_peer_cert_chain.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_peer_certificate.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_rbio.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_session.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_verify_result.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_get_version.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_library_init.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_load_client_CA_file.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_new.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_pending.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_read.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_rstate_string.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_session_reused.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_set_bio.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_set_connect_state.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_set_fd.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_set_session.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_set_shutdown.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_set_verify_result.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_shutdown.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_state_string.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_want.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/SSL_write.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/d2i_SSL_SESSION.3#3 integrate .. //depot/projects/s390/secure/lib/libssl/man/ssl.3#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/CA.pl.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/asn1parse.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/ca.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/ciphers.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/crl.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/crl2pkcs7.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/dgst.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/dhparam.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/dsa.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/dsaparam.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/enc.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/gendsa.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/genrsa.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/nseq.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/ocsp.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/openssl.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/passwd.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/pkcs12.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/pkcs7.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/pkcs8.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/rand.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/req.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/rsa.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/rsautl.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/s_client.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/s_server.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/sess_id.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/smime.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/speed.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/spkac.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/verify.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/version.1#3 integrate .. //depot/projects/s390/secure/usr.bin/openssl/man/x509.1#3 integrate .. //depot/projects/s390/share/man/man4/Makefile#7 integrate .. //depot/projects/s390/share/man/man4/aac.4#2 integrate .. //depot/projects/s390/share/man/man4/an.4#2 integrate .. //depot/projects/s390/share/man/man4/aue.4#2 integrate .. //depot/projects/s390/share/man/man4/awi.4#2 integrate .. //depot/projects/s390/share/man/man4/bge.4#3 integrate .. //depot/projects/s390/share/man/man4/cue.4#2 integrate .. //depot/projects/s390/share/man/man4/dc.4#2 integrate .. //depot/projects/s390/share/man/man4/ed.4#2 integrate .. //depot/projects/s390/share/man/man4/fxp.4#3 integrate .. //depot/projects/s390/share/man/man4/kue.4#2 integrate .. //depot/projects/s390/share/man/man4/mac.4#2 integrate .. //depot/projects/s390/share/man/man4/mac_biba.4#5 integrate .. //depot/projects/s390/share/man/man4/mac_mls.4#5 integrate .. //depot/projects/s390/share/man/man4/man4.i386/tx.4#2 integrate .. //depot/projects/s390/share/man/man4/miibus.4#1 branch .. //depot/projects/s390/share/man/man4/pcn.4#2 integrate .. //depot/projects/s390/share/man/man4/rl.4#3 integrate .. //depot/projects/s390/share/man/man4/sf.4#2 integrate .. //depot/projects/s390/share/man/man4/sis.4#2 integrate .. //depot/projects/s390/share/man/man4/ste.4#2 integrate .. //depot/projects/s390/share/man/man4/tl.4#2 integrate .. //depot/projects/s390/share/man/man4/trm.4#3 integrate .. //depot/projects/s390/share/man/man4/txp.4#2 integrate .. //depot/projects/s390/share/man/man4/usb.4#4 integrate .. //depot/projects/s390/share/man/man4/vr.4#2 integrate .. //depot/projects/s390/share/man/man4/wb.4#2 integrate .. //depot/projects/s390/share/man/man4/wi.4#7 integrate .. //depot/projects/s390/share/man/man4/xl.4#2 integrate .. //depot/projects/s390/share/man/man5/group.5#2 integrate .. //depot/projects/s390/share/man/man5/rc.conf.5#8 integrate .. //depot/projects/s390/share/man/man9/mutex.9#4 integrate .. //depot/projects/s390/sys/alpha/alpha/alpha-gdbstub.c#2 integrate .. //depot/projects/s390/sys/alpha/alpha/busdma_machdep.c#5 integrate .. //depot/projects/s390/sys/alpha/alpha/exception.s#3 integrate .. //depot/projects/s390/sys/alpha/alpha/genassym.c#3 integrate .. //depot/projects/s390/sys/alpha/alpha/machdep.c#4 integrate .. //depot/projects/s390/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/s390/sys/alpha/alpha/prom.c#3 integrate .. //depot/projects/s390/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/s390/sys/alpha/alpha/trap.c#5 integrate .. //depot/projects/s390/sys/alpha/alpha/vm_machdep.c#6 integrate .. //depot/projects/s390/sys/alpha/include/prom.h#2 integrate .. //depot/projects/s390/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/s390/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/s390/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/s390/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/s390/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/s390/sys/alpha/osf1/imgact_osf1.c#4 integrate .. //depot/projects/s390/sys/alpha/osf1/osf1_misc.c#6 integrate .. //depot/projects/s390/sys/alpha/osf1/osf1_signal.c#5 integrate .. //depot/projects/s390/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/s390/sys/boot/efi/libefi/bootinfo.c#4 integrate .. //depot/projects/s390/sys/boot/ia64/libski/bootinfo.c#3 integrate .. //depot/projects/s390/sys/cam/cam_periph.c#5 integrate .. //depot/projects/s390/sys/cam/cam_sim.c#3 integrate .. //depot/projects/s390/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_cd.c#8 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_cd.h#3 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_da.c#10 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_low.c#5 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_target.c#5 integrate .. //depot/projects/s390/sys/coda/cnode.h#3 integrate .. //depot/projects/s390/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/s390/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/s390/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/s390/sys/compat/linux/linux_ioctl.c#7 integrate .. //depot/projects/s390/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/s390/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/s390/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/s390/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/s390/sys/compat/linux/linux_sysctl.c#5 integrate .. //depot/projects/s390/sys/compat/linux/linux_util.c#5 integrate .. //depot/projects/s390/sys/compat/pecoff/imgact_pecoff.c#5 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_filio.c#5 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_socket.c#4 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_stream.c#6 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/s390/sys/conf/files#11 integrate .. //depot/projects/s390/sys/conf/files.sparc64#6 integrate .. //depot/projects/s390/sys/conf/kern.post.mk#6 integrate .. //depot/projects/s390/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/s390/sys/contrib/dev/fla/fla.c#5 integrate .. //depot/projects/s390/sys/contrib/dev/oltr/if_oltr.c#5 integrate .. //depot/projects/s390/sys/contrib/ipfilter/netinet/fil.c#6 integrate .. //depot/projects/s390/sys/contrib/ipfilter/netinet/ip_fil.c#5 integrate .. //depot/projects/s390/sys/ddb/db_command.c#4 integrate .. //depot/projects/s390/sys/ddb/db_ps.c#6 integrate .. //depot/projects/s390/sys/ddb/ddb.h#4 integrate .. //depot/projects/s390/sys/dev/aac/aac.c#8 integrate .. //depot/projects/s390/sys/dev/aac/aac_disk.c#4 integrate .. //depot/projects/s390/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/s390/sys/dev/aac/aacvar.h#5 integrate .. //depot/projects/s390/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/s390/sys/dev/amr/amr.c#7 integrate .. //depot/projects/s390/sys/dev/amr/amr_disk.c#5 integrate .. //depot/projects/s390/sys/dev/an/if_an.c#7 integrate .. //depot/projects/s390/sys/dev/an/if_an_isa.c#3 integrate .. //depot/projects/s390/sys/dev/an/if_an_pccard.c#4 integrate .. //depot/projects/s390/sys/dev/an/if_an_pci.c#5 integrate .. //depot/projects/s390/sys/dev/ar/if_ar.c#5 integrate .. //depot/projects/s390/sys/dev/asr/asr.c#6 integrate .. //depot/projects/s390/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/s390/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/s390/sys/dev/ata/ata-card.c#4 integrate .. //depot/projects/s390/sys/dev/ata/ata-cbus.c#4 integrate .. //depot/projects/s390/sys/dev/ata/ata-chipset.c#1 branch .. //depot/projects/s390/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/s390/sys/dev/ata/ata-disk.h#3 integrate .. //depot/projects/s390/sys/dev/ata/ata-dma.c#6 integrate .. //depot/projects/s390/sys/dev/ata/ata-isa.c#4 integrate .. //depot/projects/s390/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/s390/sys/dev/ata/ata-pci.h#1 branch .. //depot/projects/s390/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/s390/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/s390/sys/dev/ata/atapi-all.c#3 integrate .. //depot/projects/s390/sys/dev/ata/atapi-all.h#4 integrate .. //depot/projects/s390/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/s390/sys/dev/ata/atapi-cd.c#6 integrate .. //depot/projects/s390/sys/dev/ata/atapi-cd.h#4 integrate .. //depot/projects/s390/sys/dev/ata/atapi-fd.c#5 integrate .. //depot/projects/s390/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/s390/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/s390/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/s390/sys/dev/awi/awi.c#6 integrate .. //depot/projects/s390/sys/dev/awi/awi_wep.c#5 integrate .. //depot/projects/s390/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/s390/sys/dev/cardbus/cardbus.c#6 integrate .. //depot/projects/s390/sys/dev/cardbus/cardbus_cis.c#6 integrate .. //depot/projects/s390/sys/dev/ccd/ccd.c#6 integrate .. //depot/projects/s390/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/s390/sys/dev/cm/smc90cx6.c#6 integrate .. //depot/projects/s390/sys/dev/cnw/if_cnw.c#4 integrate .. //depot/projects/s390/sys/dev/cs/if_cs.c#5 integrate .. //depot/projects/s390/sys/dev/dgb/dgb.c#3 integrate .. //depot/projects/s390/sys/dev/digi/digi.c#4 integrate .. //depot/projects/s390/sys/dev/dpt/dpt_scsi.c#4 integrate .. //depot/projects/s390/sys/dev/drm/drm_drv.h#4 integrate .. //depot/projects/s390/sys/dev/drm/drm_memory.h#4 integrate .. //depot/projects/s390/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/s390/sys/dev/em/if_em.c#6 integrate .. //depot/projects/s390/sys/dev/en/midway.c#6 integrate .. //depot/projects/s390/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/s390/sys/dev/ex/if_ex.c#4 integrate .. //depot/projects/s390/sys/dev/fb/fb.c#3 integrate .. //depot/projects/s390/sys/dev/fb/vga.c#5 integrate .. //depot/projects/s390/sys/dev/fe/if_fe.c#5 integrate .. //depot/projects/s390/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/s390/sys/dev/firewire/firewirereg.h#7 integrate .. //depot/projects/s390/sys/dev/firewire/fwohci.c#7 integrate .. //depot/projects/s390/sys/dev/firewire/fwohci_pci.c#7 integrate .. //depot/projects/s390/sys/dev/firewire/fwohcireg.h#4 integrate .. //depot/projects/s390/sys/dev/firewire/iec68113.h#3 integrate .. //depot/projects/s390/sys/dev/firewire/if_fwe.c#6 integrate .. //depot/projects/s390/sys/dev/firewire/sbp.c#7 integrate .. //depot/projects/s390/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/s390/sys/dev/gem/if_gem.c#6 integrate .. //depot/projects/s390/sys/dev/gx/if_gx.c#5 integrate .. //depot/projects/s390/sys/dev/hifn/hifn7751.c#7 integrate .. //depot/projects/s390/sys/dev/hme/if_hme.c#6 integrate .. //depot/projects/s390/sys/dev/idt/idt.c#4 integrate .. //depot/projects/s390/sys/dev/ie/if_ie.c#5 integrate .. //depot/projects/s390/sys/dev/iicbus/if_ic.c#5 integrate .. //depot/projects/s390/sys/dev/isp/isp.c#5 integrate .. //depot/projects/s390/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/s390/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/s390/sys/dev/isp/isp_target.c#4 integrate .. //depot/projects/s390/sys/dev/ispfw/asm_2300.h#3 integrate .. //depot/projects/s390/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/s390/sys/dev/lge/if_lge.c#5 integrate .. //depot/projects/s390/sys/dev/lmc/if_lmc.c#5 integrate .. //depot/projects/s390/sys/dev/lnc/if_lnc.c#5 integrate .. //depot/projects/s390/sys/dev/md/md.c#8 integrate .. //depot/projects/s390/sys/dev/mii/inphy.c#4 integrate .. //depot/projects/s390/sys/dev/mlx/mlx.c#3 integrate .. //depot/projects/s390/sys/dev/mlx/mlx_disk.c#3 integrate .. //depot/projects/s390/sys/dev/mly/mly.c#9 integrate .. //depot/projects/s390/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/s390/sys/dev/musycc/musycc.c#4 integrate .. //depot/projects/s390/sys/dev/my/if_my.c#4 integrate .. //depot/projects/s390/sys/dev/nge/if_nge.c#6 integrate .. //depot/projects/s390/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/s390/sys/dev/null/null.c#4 integrate .. //depot/projects/s390/sys/dev/ofw/ofw_console.c#5 integrate .. //depot/projects/s390/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/s390/sys/dev/ofw/openfirmio.c#3 integrate .. //depot/projects/s390/sys/dev/pccard/pccard.c#5 integrate .. //depot/projects/s390/sys/dev/pccard/pccarddevs#6 integrate .. //depot/projects/s390/sys/dev/pccard/pccarddevs.h#6 integrate .. //depot/projects/s390/sys/dev/pci/pci.c#6 integrate .. //depot/projects/s390/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/s390/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/s390/sys/dev/pdq/pdq_freebsd.h#3 integrate .. //depot/projects/s390/sys/dev/pdq/pdq_ifsubr.c#4 integrate .. //depot/projects/s390/sys/dev/pdq/pdqvar.h#3 integrate .. //depot/projects/s390/sys/dev/ppbus/if_plip.c#5 integrate .. //depot/projects/s390/sys/dev/ppbus/lpt.c#4 integrate .. //depot/projects/s390/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/s390/sys/dev/puc/puc.c#5 integrate .. //depot/projects/s390/sys/dev/raidframe/rf_freebsdkintf.c#5 integrate .. //depot/projects/s390/sys/dev/raidframe/rf_shutdown.c#3 integrate .. //depot/projects/s390/sys/dev/random/randomdev.c#4 integrate .. //depot/projects/s390/sys/dev/ray/if_ray.c#5 integrate .. //depot/projects/s390/sys/dev/rc/rc.c#2 integrate .. //depot/projects/s390/sys/dev/rp/rp.c#4 integrate .. //depot/projects/s390/sys/dev/sab/sab.c#5 integrate .. //depot/projects/s390/sys/dev/sbni/if_sbni.c#5 integrate .. //depot/projects/s390/sys/dev/si/si.c#4 integrate .. //depot/projects/s390/sys/dev/sio/sio.c#5 integrate .. //depot/projects/s390/sys/dev/sio/sio_pccard.c#3 integrate .. //depot/projects/s390/sys/dev/sio/sio_pci.c#3 integrate .. //depot/projects/s390/sys/dev/sn/if_sn.c#5 integrate .. //depot/projects/s390/sys/dev/snc/dp83932.c#5 integrate .. //depot/projects/s390/sys/dev/snp/snp.c#4 integrate .. //depot/projects/s390/sys/dev/sound/midi/midi.c#3 integrate .. //depot/projects/s390/sys/dev/sound/midi/midibuf.c#3 integrate .. //depot/projects/s390/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/s390/sys/dev/sound/midi/timer.c#3 integrate .. //depot/projects/s390/sys/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/s390/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/s390/sys/dev/sound/pci/cmi.c#5 integrate .. //depot/projects/s390/sys/dev/sound/pci/cs4281.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/s390/sys/dev/sound/pci/ds1.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/s390/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/s390/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/s390/sys/dev/sound/pci/t4dwave.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/s390/sys/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/s390/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/s390/sys/dev/sound/pcm/ac97.c#6 integrate .. //depot/projects/s390/sys/dev/sound/pcm/buffer.c#5 integrate .. //depot/projects/s390/sys/dev/sound/pcm/buffer.h#3 integrate .. //depot/projects/s390/sys/dev/sound/pcm/fake.c#3 integrate .. //depot/projects/s390/sys/dev/sound/pcm/feeder.c#5 integrate .. //depot/projects/s390/sys/dev/sound/pcm/mixer.c#5 integrate .. //depot/projects/s390/sys/dev/sound/pcm/sndstat.c#5 integrate .. //depot/projects/s390/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/s390/sys/dev/sound/pcm/vchan.c#6 integrate .. //depot/projects/s390/sys/dev/sr/if_sr.c#5 integrate .. //depot/projects/s390/sys/dev/streams/streams.c#5 integrate .. //depot/projects/s390/sys/dev/syscons/apm/apm_saver.c#2 integrate .. //depot/projects/s390/sys/dev/syscons/daemon/daemon_saver.c#3 integrate .. //depot/projects/s390/sys/dev/syscons/schistory.c#4 integrate .. //depot/projects/s390/sys/dev/syscons/scmouse.c#4 integrate .. //depot/projects/s390/sys/dev/syscons/scvtb.c#4 integrate .. //depot/projects/s390/sys/dev/syscons/snake/snake_saver.c#3 integrate .. //depot/projects/s390/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/s390/sys/dev/trm/trm.c#5 integrate .. //depot/projects/s390/sys/dev/trm/trm.h#3 integrate .. //depot/projects/s390/sys/dev/twe/twe.c#4 integrate .. //depot/projects/s390/sys/dev/twe/twe_freebsd.c#5 integrate .. //depot/projects/s390/sys/dev/tx/if_tx.c#5 integrate .. //depot/projects/s390/sys/dev/tx/if_txvar.h#5 integrate .. //depot/projects/s390/sys/dev/txp/if_txp.c#4 integrate .. //depot/projects/s390/sys/dev/ubsec/ubsec.c#8 integrate .. //depot/projects/s390/sys/dev/usb/hid.c#4 integrate .. //depot/projects/s390/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/s390/sys/dev/usb/if_cue.c#4 integrate .. //depot/projects/s390/sys/dev/usb/if_kue.c#5 integrate .. //depot/projects/s390/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/s390/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/s390/sys/dev/usb/uftdi.c#5 integrate .. //depot/projects/s390/sys/dev/usb/ugen.c#5 integrate .. //depot/projects/s390/sys/dev/usb/uhci.c#5 integrate .. //depot/projects/s390/sys/dev/usb/uhid.c#4 integrate .. //depot/projects/s390/sys/dev/usb/umass.c#8 integrate .. //depot/projects/s390/sys/dev/usb/umodem.c#5 integrate .. //depot/projects/s390/sys/dev/usb/uplcom.c#5 integrate .. //depot/projects/s390/sys/dev/usb/urio.c#5 integrate .. //depot/projects/s390/sys/dev/usb/usb.c#4 integrate .. //depot/projects/s390/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/s390/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/s390/sys/dev/usb/uvscom.c#6 integrate .. //depot/projects/s390/sys/dev/vinum/vinumext.h#4 integrate .. //depot/projects/s390/sys/dev/vinum/vinumhdr.h#3 integrate .. //depot/projects/s390/sys/dev/vinum/vinummemory.c#3 integrate .. //depot/projects/s390/sys/dev/vx/if_vx.c#5 integrate .. //depot/projects/s390/sys/dev/wi/if_wi.c#7 integrate .. //depot/projects/s390/sys/dev/wi/if_wi_pccard.c#6 integrate .. //depot/projects/s390/sys/dev/wl/if_wl.c#5 integrate .. //depot/projects/s390/sys/dev/xe/if_xe.c#6 integrate .. //depot/projects/s390/sys/dev/zs/zs.c#3 integrate .. //depot/projects/s390/sys/dev/zs/zs_sbus.c#3 integrate .. //depot/projects/s390/sys/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/s390/sys/fs/devfs/devfs_rule.c#5 integrate .. //depot/projects/s390/sys/fs/devfs/devfs_vfsops.c#6 integrate .. //depot/projects/s390/sys/fs/devfs/devfs_vnops.c#9 integrate .. //depot/projects/s390/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate .. //depot/projects/s390/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/s390/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/s390/sys/fs/hpfs/hpfs_subr.c#3 integrate .. //depot/projects/s390/sys/fs/hpfs/hpfs_vfsops.c#6 integrate .. //depot/projects/s390/sys/fs/hpfs/hpfs_vnops.c#7 integrate .. //depot/projects/s390/sys/fs/msdosfs/msdosfs_denode.c#5 integrate .. //depot/projects/s390/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/s390/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/s390/sys/fs/ntfs/ntfs_subr.c#4 integrate .. //depot/projects/s390/sys/fs/ntfs/ntfs_vfsops.c#5 integrate .. //depot/projects/s390/sys/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/s390/sys/fs/nullfs/null_subr.c#5 integrate .. //depot/projects/s390/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/s390/sys/fs/nwfs/nwfs_node.c#5 integrate .. //depot/projects/s390/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/s390/sys/fs/portalfs/portal_vfsops.c#4 integrate .. //depot/projects/s390/sys/fs/portalfs/portal_vnops.c#5 integrate .. //depot/projects/s390/sys/fs/pseudofs/pseudofs.c#4 integrate .. //depot/projects/s390/sys/fs/pseudofs/pseudofs_fileno.c#3 integrate .. //depot/projects/s390/sys/fs/pseudofs/pseudofs_vncache.c#5 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_node.c#6 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_smb.c#7 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_vnops.c#7 integrate .. //depot/projects/s390/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/s390/sys/fs/udf/udf_vnops.c#6 integrate .. //depot/projects/s390/sys/fs/umapfs/umap_subr.c#4 integrate .. //depot/projects/s390/sys/fs/umapfs/umap_vfsops.c#5 integrate .. //depot/projects/s390/sys/fs/unionfs/union_subr.c#5 integrate .. //depot/projects/s390/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/s390/sys/geom/bde/g_bde.c#5 integrate .. //depot/projects/s390/sys/geom/geom_aes.c#6 integrate .. //depot/projects/s390/sys/geom/geom_ctl.c#4 integrate .. //depot/projects/s390/sys/geom/geom_dev.c#10 integrate .. //depot/projects/s390/sys/geom/geom_disk.c#10 integrate .. //depot/projects/s390/sys/geom/geom_event.c#5 integrate .. //depot/projects/s390/sys/geom/geom_gpt.c#6 integrate .. //depot/projects/s390/sys/geom/geom_io.c#10 integrate .. //depot/projects/s390/sys/geom/geom_mirror.c#2 integrate .. //depot/projects/s390/sys/geom/geom_slice.c#8 integrate .. //depot/projects/s390/sys/geom/geom_stats.c#3 integrate .. //depot/projects/s390/sys/geom/geom_subr.c#10 integrate .. //depot/projects/s390/sys/gnu/ext2fs/ext2_inode.c#5 integrate .. //depot/projects/s390/sys/gnu/ext2fs/ext2_lookup.c#5 integrate .. //depot/projects/s390/sys/gnu/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/s390/sys/i386/i386/bios.c#4 integrate .. //depot/projects/s390/sys/i386/i386/busdma_machdep.c#5 integrate .. //depot/projects/s390/sys/i386/i386/elan-mmcr.c#3 integrate .. //depot/projects/s390/sys/i386/i386/exception.s#5 integrate .. //depot/projects/s390/sys/i386/i386/genassym.c#5 integrate .. //depot/projects/s390/sys/i386/i386/i386-gdbstub.c#3 integrate .. //depot/projects/s390/sys/i386/i386/i686_mem.c#5 integrate .. //depot/projects/s390/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/s390/sys/i386/i386/mem.c#6 integrate .. //depot/projects/s390/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/s390/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/s390/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/s390/sys/i386/i386/trap.c#5 integrate .. //depot/projects/s390/sys/i386/i386/vm86.c#5 integrate .. //depot/projects/s390/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_misc.c#6 integrate .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_util.c#3 integrate .. //depot/projects/s390/sys/i386/ibcs2/imgact_coff.c#4 integrate .. //depot/projects/s390/sys/i386/include/pci_cfgreg.h#3 integrate .. //depot/projects/s390/sys/i386/isa/ctx.c#3 integrate .. //depot/projects/s390/sys/i386/isa/cy.c#2 integrate .. //depot/projects/s390/sys/i386/isa/gpib.c#5 integrate .. //depot/projects/s390/sys/i386/isa/if_cx.c#4 integrate .. //depot/projects/s390/sys/i386/isa/if_el.c#5 integrate .. //depot/projects/s390/sys/i386/isa/if_le.c#4 integrate .. //depot/projects/s390/sys/i386/isa/if_rdp.c#5 integrate .. //depot/projects/s390/sys/i386/isa/loran.c#4 integrate .. //depot/projects/s390/sys/i386/isa/npx.c#4 integrate .. //depot/projects/s390/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate .. //depot/projects/s390/sys/i386/isa/pcvt/pcvt_kbd.c#3 integrate .. //depot/projects/s390/sys/i386/isa/pcvt/pcvt_out.c#3 integrate .. //depot/projects/s390/sys/i386/isa/pcvt/pcvt_sup.c#3 integrate .. //depot/projects/s390/sys/i386/isa/spic.c#2 integrate .. //depot/projects/s390/sys/i386/isa/spkr.c#5 integrate .. //depot/projects/s390/sys/i386/isa/vesa.c#5 integrate .. //depot/projects/s390/sys/i386/isa/wt.c#3 integrate .. //depot/projects/s390/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/s390/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/s390/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/s390/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/s390/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/s390/sys/i386/pci/pci_bus.c#6 integrate .. //depot/projects/s390/sys/i386/pci/pci_cfgreg.c#4 integrate .. //depot/projects/s390/sys/i4b/driver/i4b_ipr.c#5 integrate .. //depot/projects/s390/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#5 integrate .. //depot/projects/s390/sys/i4b/layer2/i4b_mbuf.c#3 integrate .. //depot/projects/s390/sys/i4b/layer4/i4b_i4bdrv.c#4 integrate .. //depot/projects/s390/sys/ia64/ia32/ia32_misc.c#4 integrate .. //depot/projects/s390/sys/ia64/ia64/busdma_machdep.c#5 integrate .. //depot/projects/s390/sys/ia64/ia64/exception.s#4 integrate .. //depot/projects/s390/sys/ia64/ia64/genassym.c#5 integrate .. //depot/projects/s390/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/s390/sys/ia64/ia64/mca.c#5 integrate .. //depot/projects/s390/sys/ia64/ia64/mp_machdep.c#6 integrate .. //depot/projects/s390/sys/ia64/ia64/pmap.c#9 integrate .. //depot/projects/s390/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/s390/sys/ia64/ia64/sscdisk.c#6 integrate .. //depot/projects/s390/sys/ia64/ia64/trap.c#5 integrate .. //depot/projects/s390/sys/ia64/ia64/vm_machdep.c#6 integrate .. //depot/projects/s390/sys/ia64/include/param.h#3 integrate .. //depot/projects/s390/sys/isofs/cd9660/cd9660_vfsops.c#6 integrate .. //depot/projects/s390/sys/isofs/cd9660/cd9660_vnops.c#7 integrate .. //depot/projects/s390/sys/kern/imgact_aout.c#4 integrate .. //depot/projects/s390/sys/kern/imgact_elf.c#8 integrate .. //depot/projects/s390/sys/kern/inflate.c#3 integrate .. //depot/projects/s390/sys/kern/init_main.c#9 integrate .. //depot/projects/s390/sys/kern/init_sysent.c#6 integrate .. //depot/projects/s390/sys/kern/kern_acct.c#5 integrate .. //depot/projects/s390/sys/kern/kern_alq.c#3 integrate .. //depot/projects/s390/sys/kern/kern_clock.c#7 integrate .. //depot/projects/s390/sys/kern/kern_conf.c#6 integrate .. //depot/projects/s390/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/s390/sys/kern/kern_environment.c#6 integrate .. //depot/projects/s390/sys/kern/kern_event.c#7 integrate .. //depot/projects/s390/sys/kern/kern_exec.c#8 integrate .. //depot/projects/s390/sys/kern/kern_exit.c#10 integrate .. //depot/projects/s390/sys/kern/kern_fork.c#9 integrate .. //depot/projects/s390/sys/kern/kern_intr.c#7 integrate .. //depot/projects/s390/sys/kern/kern_jail.c#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 21 20:26: 6 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2443A37B405; Fri, 21 Feb 2003 20:26:05 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD39D37B401 for ; Fri, 21 Feb 2003 20:26:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57E3043FB1 for ; Fri, 21 Feb 2003 20:26:04 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1M4Q40U024203 for ; Fri, 21 Feb 2003 20:26:04 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1M4Q3rm024185 for perforce@freebsd.org; Fri, 21 Feb 2003 20:26:03 -0800 (PST) Date: Fri, 21 Feb 2003 20:26:03 -0800 (PST) Message-Id: <200302220426.h1M4Q3rm024185@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 25565 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25565 Change 25565 by rwatson@rwatson_tislabs on 2003/02/21 20:25:20 Merge results of a KSE change that affect a feature in the test module in the MAC branch, but not main branch. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#93 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#93 (text+ko) ==== @@ -831,7 +831,7 @@ { mtx_lock_spin(&sched_lock); - curthread->td_kse->ke_flags |= KEF_ASTPENDING; + curthread->td_flags |= TDF_ASTPENDING; curthread->td_proc->p_sflag |= PS_MACPEND; mtx_unlock_spin(&sched_lock); return (sysctl_handle_int(oidp, NULL, curthread->td_proc->p_pid, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 21 23:42:19 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01D2A37B405; Fri, 21 Feb 2003 23:42:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BC7C37B401 for ; Fri, 21 Feb 2003 23:42:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1665A43F75 for ; Fri, 21 Feb 2003 23:42:11 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1M7gA0U025300 for ; Fri, 21 Feb 2003 23:42:10 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1M7gAvl025297 for perforce@freebsd.org; Fri, 21 Feb 2003 23:42:10 -0800 (PST) Date: Fri, 21 Feb 2003 23:42:10 -0800 (PST) Message-Id: <200302220742.h1M7gAvl025297@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov Subject: PERFORCE change 25579 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=25579 Change 25579 by tzukanov@tzukanov_antares on 2003/02/21 23:41:13 Compilation fixes. Affected files ... .. //depot/projects/s390/lib/libc/s390/gen/Makefile.inc#4 edit .. //depot/projects/s390/lib/libc/s390/gen/getcontext.S#3 delete .. //depot/projects/s390/lib/libc/s390/sys/s390_sysinfo.c#3 edit .. //depot/projects/s390/lib/libc/s390x/gen/getcontext.S#2 delete .. //depot/projects/s390/lib/libc/s390x/sys/s390_sysinfo.c#2 edit .. //depot/projects/s390/sys/dev/md/md.c#9 edit .. //depot/projects/s390/sys/s390/s390/exception.S#2 edit .. //depot/projects/s390/sys/s390/s390/genassym.c#2 edit .. //depot/projects/s390/sys/s390/s390/trap.c#4 edit .. //depot/projects/s390/sys/s390/s390/vm_machdep.c#7 edit .. //depot/projects/s390/sys/s390x/s390x/genassym.c#2 edit Differences ... ==== //depot/projects/s390/lib/libc/s390/gen/Makefile.inc#4 (text+ko) ==== ==== //depot/projects/s390/lib/libc/s390/sys/s390_sysinfo.c#3 (text+ko) ==== @@ -9,6 +9,8 @@ #include +extern int sysarch(int op, char *parms); + int s390_sysinfo(unsigned int r0, unsigned int r1, void *buf) { ==== //depot/projects/s390/lib/libc/s390x/sys/s390_sysinfo.c#2 (text+ko) ==== @@ -9,6 +9,8 @@ #include +extern int sysarch(int op, char *parms); + int s390_sysinfo(unsigned int r0, unsigned int r1, void *buf) { ==== //depot/projects/s390/sys/dev/md/md.c#9 (text+ko) ==== @@ -1199,7 +1199,7 @@ md_takeroot(void *junk) { if (mdrootready) - rootdevnames[0] = "ufs:/dev/md0c"; + rootdevnames[0] = "ufs:/dev/md0"; } SYSINIT(md_root, SI_SUB_MOUNT_ROOT, SI_ORDER_FIRST, md_takeroot, NULL); ==== //depot/projects/s390/sys/s390/s390/exception.S#2 (text+ko) ==== @@ -92,8 +92,8 @@ 1: stnsm PSA_SM, 0x04 l %r1, PSA_PCPU l %r1, PC_CURTHREAD(%r1) - l %r1, TD_KSE(%r1) - tm 2 + KE_FLAGS(%r1), KEF_AP_NR + l %r0, TD_FLAGS(%r1) + n %r0, LP(td_flags) jz 2f ic %r1, PSA_SM 7: stosm PSA_SM, 0x00 @@ -111,6 +111,8 @@ l %r15, 15*4 + TF_GPR(%r15) lpsw PSA_PSW +LP_ENTRY(td_flags) + .long TDF_NEEDRESCHED | TDF_ASTPENDING LP_REF(ast) ==== //depot/projects/s390/sys/s390/s390/genassym.c#2 (text+ko) ==== @@ -27,15 +27,11 @@ #include #include -#define MK_AP_NR ((uint32_t)((KEF_NEEDRESCHED | KEF_ASTPENDING) >> 8)) -CTASSERT(MK_AP_NR < 0xff); - ASSYM(ENAMETOOLONG, ENAMETOOLONG); ASSYM(EFAULT, EFAULT); -ASSYM(KE_FLAGS, offsetof(struct kse, ke_flags)); - -ASSYM(KEF_AP_NR, MK_AP_NR); +ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); +ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); ASSYM(CR0_UNUSED, CR0_UNUSED); ASSYM(CR0_SECONDARY_SPACE, CR0_SECONDARY_SPACE); @@ -87,6 +83,7 @@ ASSYM(SF_GPR6, offsetof(struct stackframe, gpr6)); ASSYM(SF_SIZEOF, sizeof(struct stackframe)); +ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_FRAME, offsetof(struct thread, td_frame)); ASSYM(TD_KSE, offsetof(struct thread, td_kse)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ==== //depot/projects/s390/sys/s390/s390/trap.c#4 (text+ko) ==== @@ -360,7 +360,7 @@ td = curthread; p = td->td_proc; if (usermode) { - sticks = td->td_kse->ke_sticks; + sticks = td->td_sticks; td->td_frame = tf; if (td->td_ucred != p->p_ucred) cred_update_thread(td); @@ -502,7 +502,7 @@ td = curthread; - sticks = td->td_kse->ke_sticks; + sticks = td->td_sticks; td->td_frame = tf; ==== //depot/projects/s390/sys/s390/s390/vm_machdep.c#7 (text+ko) ==== @@ -150,8 +150,6 @@ CTR2(KTR_PROC, "cpu_set_upcall: td = %p, pcb0 = %p", td, pcb0); - td->td_flags |= TDF_UPCALLING; - pcb = td->td_pcb; bcopy(pcb0, pcb, sizeof(*pcb)); @@ -166,7 +164,7 @@ } void -cpu_set_upcall_kse(struct thread *td, struct kse *ke) +cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) { struct trapframe *tf; @@ -174,10 +172,10 @@ tf = td->td_frame; tf->tf_gpr[15] = - (int)ke->ke_stack.ss_sp + ke->ke_stack.ss_size; - psw_define_addr(&tf->tf_psw, (u_long)ke->ke_upcall); + (int)ku->ku_stack.ss_sp + ku->ku_stack.ss_size; + psw_define_addr(&tf->tf_psw, (u_long)ku->ku_func); - suword(&td->td_frame->tf_gpr[2], (u_long)ke->ke_mailbox); + suword(&td->td_frame->tf_gpr[2], (u_long)ku->ku_mailbox); } void ==== //depot/projects/s390/sys/s390x/s390x/genassym.c#2 (text+ko) ==== @@ -15,25 +15,47 @@ #include #include #include +#include #include - #include #include #include #include - #include #include +#include +#include +#include + +ASSYM(ENAMETOOLONG, ENAMETOOLONG); +ASSYM(EFAULT, EFAULT); + +ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); +ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); -#define MK_AP_NR ((uint32_t)((KEF_NEEDRESCHED | KEF_ASTPENDING) >> 8)) -CTASSERT(MK_AP_NR < 0xff); +ASSYM(CR0_UNUSED, CR0_UNUSED); +ASSYM(CR0_SECONDARY_SPACE, CR0_SECONDARY_SPACE); +ASSYM(CR0_ADDRESS_SPACE_FUNCTION, CR0_ADDRESS_SPACE_FUNCTION); +ASSYM(CR0_MALFUNCTION_ALERT, CR0_MALFUNCTION_ALERT); +ASSYM(CR0_EMERGENCY_SIGNAL, CR0_EMERGENCY_SIGNAL); +ASSYM(CR0_EXTERNAL_CALL, CR0_EXTERNAL_CALL); +ASSYM(CR0_SERVICE_SIGNAL, CR0_SERVICE_SIGNAL); +ASSYM(CR0_INTERRUPT_KEY, CR0_INTERRUPT_KEY); + +ASSYM(M_DATA, offsetof(struct mbuf, m_data)); +ASSYM(M_NEXT, offsetof(struct mbuf, m_next)); +ASSYM(M_LEN, offsetof(struct mbuf, m_len)); ASSYM(SA_EXTERNAL_OLD_PSW, offsetof(struct esa_sysarea, external_old_psw)); +ASSYM(SA_GPR_SAVE_AREA, offsetof(struct esa_sysarea, gpr_save_area)); ASSYM(SA_IO_OLD_PSW, offsetof(struct esa_sysarea, io_old_psw)); ASSYM(SA_MCHECK_OLD_PSW, offsetof(struct esa_sysarea, mcheck_old_psw)); ASSYM(SA_PROGRAM_OLD_PSW, offsetof(struct esa_sysarea, program_old_psw)); ASSYM(SA_SVC_OLD_PSW, offsetof(struct esa_sysarea, svc_old_psw)); +ASSYM(SACF_ACCESS_REGISTER, SACF_ACCESS_REGISTER); +ASSYM(SACF_PRIMARY_SPACE, SACF_PRIMARY_SPACE); + ASSYM(PSA_GPR15, offsetof(struct esa_sysarea, gpr15)); ASSYM(PSA_KERNEL_AR, offsetof(struct esa_sysarea, kernel_ar)); ASSYM(PSA_KSP, offsetof(struct esa_sysarea, ksp)); @@ -41,14 +63,6 @@ ASSYM(PSA_PSW, offsetof(struct esa_sysarea, psw)); ASSYM(PSA_SM, offsetof(struct esa_sysarea, sm)); ASSYM(PSA_SP_ALIGN_MASK, offsetof(struct esa_sysarea, sp_align_mask)); - -ASSYM(ENAMETOOLONG, ENAMETOOLONG); -ASSYM(EFAULT, EFAULT); - -ASSYM(KE_FLAGS, offsetof(struct kse, ke_flags)); - -ASSYM(KEF_AP_NR, MK_AP_NR); - ASSYM(PAGE_SIZE, PAGE_SIZE); ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); @@ -69,6 +83,7 @@ ASSYM(SF_GPR6, offsetof(struct stackframe, gpr6)); ASSYM(SF_SIZEOF, sizeof(struct stackframe)); +ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_FRAME, offsetof(struct thread, td_frame)); ASSYM(TD_KSE, offsetof(struct thread, td_kse)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message