From owner-p4-projects Sun Feb 2 2:10:54 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4929737B405; Sun, 2 Feb 2003 02: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 E892D37B401 for ; Sun, 2 Feb 2003 02:10:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4B2D43F3F for ; Sun, 2 Feb 2003 02:10:27 -0800 (PST) (envelope-from marcel@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 h12AARbv002342 for ; Sun, 2 Feb 2003 02:10:27 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h12AAQit002320 for perforce@freebsd.org; Sun, 2 Feb 2003 02:10:26 -0800 (PST) Date: Sun, 2 Feb 2003 02:10:26 -0800 (PST) Message-Id: <200302021010.h12AAQit002320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 24559 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=24559 Change 24559 by marcel@marcel_nfs on 2003/02/02 02:10:06 IFC @24557 Affected files ... .. //depot/projects/ia64/contrib/gcc/gcc.1#4 integrate .. //depot/projects/ia64/etc/MAKEDEV#16 delete .. //depot/projects/ia64/etc/MAKEDEV.local#3 delete .. //depot/projects/ia64/etc/Makefile#21 integrate .. //depot/projects/ia64/lib/libfetch/Makefile#12 integrate .. //depot/projects/ia64/release/scripts/doFS.sh#8 integrate .. //depot/projects/ia64/sbin/dumpfs/dumpfs.c#13 integrate .. //depot/projects/ia64/sbin/newfs/mkfs.c#23 integrate .. //depot/projects/ia64/sbin/newfs/newfs.8#13 integrate .. //depot/projects/ia64/sbin/newfs/newfs.c#19 integrate .. //depot/projects/ia64/sbin/newfs/newfs.h#10 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.8#13 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.c#11 integrate .. //depot/projects/ia64/share/examples/cvsup/cvs-supfile#3 integrate .. //depot/projects/ia64/share/examples/cvsup/refuse#3 integrate .. //depot/projects/ia64/share/examples/cvsup/refuse.README#4 integrate .. //depot/projects/ia64/share/man/man4/mac.4#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/interrupt.c#10 integrate .. //depot/projects/ia64/sys/alpha/alpha/trap.c#19 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#16 integrate .. //depot/projects/ia64/sys/boot/ia64/Makefile.inc#4 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/Makefile#7 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/acpi_stub.c#1 branch .. //depot/projects/ia64/sys/boot/ia64/libski/bootinfo.c#5 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/efi_stub.c#1 branch .. //depot/projects/ia64/sys/boot/ia64/libski/elf_freebsd.c#6 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/libski.h#2 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/pal_stub.s#1 branch .. //depot/projects/ia64/sys/boot/ia64/libski/sal_stub.c#1 branch .. //depot/projects/ia64/sys/boot/ia64/libski/ssc.c#2 integrate .. //depot/projects/ia64/sys/conf/files.ia64#32 integrate .. //depot/projects/ia64/sys/conf/files.powerpc#13 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#13 integrate .. //depot/projects/ia64/sys/dev/ccd/ccd.c#15 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#15 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.h#6 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#8 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#8 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.c#5 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#13 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#10 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#7 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#13 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#19 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#19 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#22 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#22 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#30 integrate .. //depot/projects/ia64/sys/dev/zs/zs_macio.c#1 branch .. //depot/projects/ia64/sys/geom/geom_sunlabel.c#14 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#30 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#30 integrate .. //depot/projects/ia64/sys/i386/i386/critical.c#4 integrate .. //depot/projects/ia64/sys/i386/i386/exception.s#8 integrate .. //depot/projects/ia64/sys/i386/i386/genassym.c#11 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#15 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#22 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#18 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_isppp.c#8 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#24 integrate .. //depot/projects/ia64/sys/ia64/conf/SKI#11 integrate .. //depot/projects/ia64/sys/ia64/ia64/autoconf.c#9 integrate .. //depot/projects/ia64/sys/ia64/ia64/efi.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/genassym.c#10 integrate .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#26 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#60 integrate .. //depot/projects/ia64/sys/ia64/ia64/mca.c#9 integrate .. //depot/projects/ia64/sys/ia64/ia64/pal.s#2 integrate .. //depot/projects/ia64/sys/ia64/ia64/pal_stub.s#3 delete .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#53 integrate .. //depot/projects/ia64/sys/ia64/ia64/sal.c#9 integrate .. //depot/projects/ia64/sys/ia64/ia64/ski.c#5 delete .. //depot/projects/ia64/sys/ia64/ia64/ssc.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/sscdisk.c#7 integrate .. //depot/projects/ia64/sys/ia64/ia64/swtch.s#11 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#40 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#21 integrate .. //depot/projects/ia64/sys/ia64/include/md_var.h#5 integrate .. //depot/projects/ia64/sys/ia64/include/sal.h#3 integrate .. //depot/projects/ia64/sys/kern/init_main.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#13 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#43 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#32 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#28 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_malloc.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_resource.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#18 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#27 integrate .. //depot/projects/ia64/sys/kern/kern_timeout.c#5 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#3 integrate .. //depot/projects/ia64/sys/kern/subr_prof.c#9 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#21 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#27 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#22 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#26 integrate .. //depot/projects/ia64/sys/pc98/pc98/wd.c#6 integrate .. //depot/projects/ia64/sys/pci/if_vr.c#14 integrate .. //depot/projects/ia64/sys/pci/if_vrreg.h#6 integrate .. //depot/projects/ia64/sys/powerpc/conf/GENERIC#15 integrate .. //depot/projects/ia64/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/openpic.c#5 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#21 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/trap.c#20 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#17 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#28 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/tick.c#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#18 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#18 integrate .. //depot/projects/ia64/sys/sys/buf.h#14 integrate .. //depot/projects/ia64/sys/sys/ccdvar.h#4 integrate .. //depot/projects/ia64/sys/sys/lockmgr.h#8 integrate .. //depot/projects/ia64/sys/sys/proc.h#46 integrate .. //depot/projects/ia64/sys/sys/resourcevar.h#8 integrate .. //depot/projects/ia64/sys/sys/systm.h#23 integrate .. //depot/projects/ia64/sys/sys/vmmeter.h#3 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#37 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#28 integrate .. //depot/projects/ia64/tools/tools/README#9 integrate .. //depot/projects/ia64/tools/tools/backout_commit/backout_commit.rb#1 branch .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#23 integrate .. //depot/projects/ia64/usr.bin/whois/whois.c#6 integrate .. //depot/projects/ia64/usr.sbin/config/SMM.doc/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/pkg_install/sign/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/sendmail/Makefile#4 integrate Differences ... ==== //depot/projects/ia64/contrib/gcc/gcc.1#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/gcc/gcc.1,v 1.17 2002/11/27 03:36:49 obrien Exp $ +.\" $FreeBSD: src/contrib/gcc/gcc.1,v 1.18 2003/02/01 18:39:32 imp Exp $ .\" Copyright (c) 1991, 1992, 1993, 1994 Free Software Foundation -*-Text-*- .\" See section COPYING for conditions for redistribution .\" @@ -543,11 +543,6 @@ .BI "\-pthread" Link a user-threaded process against libc_r instead of libc. Objects linked into user-threaded processes should be compiled with -D_THREAD_SAFE. -.TP -.BI "\-kthread" -Link a kernel-threaded process against libpthread in addition to libc. -Objects linked into kernel-threaded processes should be compiled with --D_THREAD_SAFE. .SH OVERALL OPTIONS .TP .BI "\-x " "language" ==== //depot/projects/ia64/etc/Makefile#21 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.302 2003/01/09 04:05:05 imp Exp $ +# $FreeBSD: src/etc/Makefile,v 1.303 2003/02/01 22:22:06 phk Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -95,13 +95,6 @@ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SSL} ${DESTDIR}/etc/ssl .endif -.if defined(MAKEDEV_INSTALL) - cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 555 \ - MAKEDEV.local MAKEDEV ${DESTDIR}/dev -.if defined(MAKEDEV_RUN) - cd ${DESTDIR}/dev; sh MAKEDEV all -.endif -.endif cd ${.CURDIR}/root; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.cshrc ${DESTDIR}/root/.cshrc; \ ==== //depot/projects/ia64/lib/libfetch/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libfetch/Makefile,v 1.38 2003/01/28 23:02:28 markm Exp $ +# $FreeBSD: src/lib/libfetch/Makefile,v 1.39 2003/01/31 23:26:55 markm Exp $ LIB= fetch CFLAGS+= -I. @@ -10,7 +10,7 @@ CLEANFILES= ftperr.h httperr.h .if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) -CFLAGS+= -DWITH_SSL -DOPENSSL_NO_KRB5 +CFLAGS+= -DWITH_SSL DPADD= ${LIBSSL} ${LIBCRYPTO} LDADD= -lssl -lcrypto WARNS?= 2 ==== //depot/projects/ia64/release/scripts/doFS.sh#8 (text+ko) ==== @@ -1,9 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/doFS.sh,v 1.42 2002/11/04 00:50:01 marcel Exp $ +# $FreeBSD: src/release/scripts/doFS.sh,v 1.43 2003/02/01 22:12:50 phk Exp $ # -set -e +set -ex export BLOCKSIZE=512 @@ -26,16 +26,16 @@ # so we have to specifically specify -r when we don't have -B. # disklabel fails otherwise. # -if [ -f "${RD}/trees/base/boot/boot1" ]; then +if [ -f "${RD}/trees/base/boot/boot" ]; then + BOOT1="-B -b ${RD}/trees/base/boot/boot" +elif [ -f "${RD}/trees/base/boot/boot1" ]; then BOOT1="-B -b ${RD}/trees/base/boot/boot1" + if [ -f "${RD}/trees/base/boot/boot2" ]; then + BOOT2="-s ${RD}/trees/base/boot/boot2" + fi else BOOT1="-r" fi -if [ -f "${RD}/trees/base/boot/boot2" ]; then - BOOT2="-s ${RD}/trees/base/boot/boot2" -else - BOOT2="" -fi deadlock=20 @@ -107,12 +107,8 @@ MDDEVICE=`mdconfig -a -t vnode -f ${FSIMG}` if [ ! -c /dev/${MDDEVICE} ] ; then - if [ -f /dev/MAKEDEV ] ; then - ( cd /dev && sh MAKEDEV ${MDDEVICE} ) - else - echo "No /dev/$MDDEVICE and no MAKEDEV" 1>&2 - exit 1 - fi + echo "No /dev/$MDDEVICE" 1>&2 + exit 1 fi disklabel -w ${BOOT1} ${BOOT2} ${MDDEVICE} ${FSLABEL} newfs -i ${FSINODE} -o space -m 0 /dev/${MDDEVICE}c ==== //depot/projects/ia64/sbin/dumpfs/dumpfs.c#13 (text+ko) ==== @@ -54,7 +54,7 @@ static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.34 2003/01/24 00:07:40 njl Exp $"; + "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.35 2003/02/01 04:17:09 gordon Exp $"; #endif /* not lint */ #include @@ -237,6 +237,9 @@ if (fsflags != 0) printf("unknown flags (%#x)", fsflags); putchar('\n'); + printf("fsmnt\t%s\n", afs.fs_fsmnt); + printf("volname\t%s\tswuid\t%qu\n", + afs.fs_volname, afs.fs_swuid); printf("\ncs[].cs_(nbfree,ndir,nifree,nffree):\n\t"); afs.fs_csp = calloc(1, afs.fs_cssize); if (bread(&disk, fsbtodb(&afs, afs.fs_csaddr), afs.fs_csp, afs.fs_cssize) == -1) ==== //depot/projects/ia64/sbin/newfs/mkfs.c#23 (text+ko) ==== @@ -48,7 +48,7 @@ static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.69 2003/01/29 22:52:27 jmallett Exp $"; + "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.70 2003/02/01 04:17:09 gordon Exp $"; #endif /* not lint */ #include @@ -140,6 +140,8 @@ sblock.fs_flags = 0; if (Uflag) sblock.fs_flags |= FS_DOSOFTDEP; + if (Lflag) + strlcpy(sblock.fs_volname, volumelabel, MAXVOLLEN); /* * Validate the given file system size. * Verify that its last block can actually be accessed. ==== //depot/projects/ia64/sbin/newfs/newfs.8#13 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)newfs.8 8.6 (Berkeley) 5/3/95 -.\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.56 2002/08/27 00:49:23 trhodes Exp $ +.\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.57 2003/02/01 04:17:09 gordon Exp $ .\" .Dd May 18, 2002 .Dt NEWFS 8 @@ -40,6 +40,7 @@ .Nd construct a new file system .Sh SYNOPSIS .Nm +.Op Fl L Ar volname .Op Fl NU .Op Fl O Ar filesystem-type .Op Fl S Ar sector-size @@ -82,6 +83,8 @@ .Bl -tag -width indent .It Fl T Ar disktype For backward compatibility. +.It Fl L Ar volname +Add a volume label to the new file system. .It Fl N Cause the file system parameters to be printed out without really creating the file system. ==== //depot/projects/ia64/sbin/newfs/newfs.c#19 (text+ko) ==== @@ -54,7 +54,7 @@ static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/newfs/newfs.c,v 1.68 2003/01/29 22:52:27 jmallett Exp $"; + "$FreeBSD: src/sbin/newfs/newfs.c,v 1.69 2003/02/01 04:17:09 gordon Exp $"; #endif /* not lint */ /* @@ -117,6 +117,7 @@ */ #define NFPI 4 +int Lflag; /* add a volume label */ int Nflag; /* run without writing file system */ int Oflag = 1; /* file system format (1 => UFS1, 2 => UFS2) */ int Rflag; /* regression test */ @@ -136,6 +137,7 @@ int avgfilesize = AVFILESIZ;/* expected average file size */ int avgfilesperdir = AFPDIR;/* expected number of files per directory */ int fso; /* filedescriptor to device */ +u_char *volumelabel = NULL; /* volume label for filesystem */ static char device[MAXPATHLEN]; static char *disktype; @@ -153,12 +155,25 @@ struct partition oldpartition; struct stat st; char *cp, *special; - int ch; + int ch, i; off_t mediasize; while ((ch = getopt(argc, argv, - "NO:RS:T:Ua:b:c:d:e:f:g:h:i:m:o:s:")) != -1) + "L:NO:RS:T:Ua:b:c:d:e:f:g:h:i:m:o:s:")) != -1) switch (ch) { + case 'L': + volumelabel = optarg; + i = -1; + while (isalnum(volumelabel[++i])); + if (volumelabel[i] != '\0') { + errx(1, "bad volume label. Valid characters are alphanumerics."); + } + if (strlen(volumelabel) >= MAXVOLLEN) { + errx(1, "bad volume label. Length is longer than %d.", + MAXVOLLEN); + } + Lflag = 1; + break; case 'N': Nflag = 1; break; @@ -390,6 +405,7 @@ getprogname(), " [device-type]"); fprintf(stderr, "where fsoptions are:\n"); + fprintf(stderr, "\t-L volume label to add to superblock\n"); fprintf(stderr, "\t-N do not create file system, just print out parameters\n"); fprintf(stderr, "\t-O file system format: 1 => UFS1, 2 => UFS2\n"); ==== //depot/projects/ia64/sbin/newfs/newfs.h#10 (text+ko) ==== @@ -42,13 +42,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/newfs/newfs.h,v 1.10 2003/01/29 22:52:27 jmallett Exp $ + * $FreeBSD: src/sbin/newfs/newfs.h,v 1.11 2003/02/01 04:17:09 gordon Exp $ */ /* * variables set up by front end. */ +extern int Lflag; /* add a volume label */ extern int Nflag; /* run mkfs without writing file system */ extern int Oflag; /* build UFS1 format file system */ extern int Rflag; /* regression test */ @@ -68,5 +69,6 @@ extern int avgfilesize; /* expected average file size */ extern int avgfilesperdir; /* expected number of files per directory */ extern int fso; /* filedescriptor to device */ +extern u_char *volumelabel; /* volume label for filesystem */ void mkfs (struct partition *, char *); ==== //depot/projects/ia64/sbin/tunefs/tunefs.8#13 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)tunefs.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.29 2002/10/15 15:30:55 rwatson Exp $ +.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.30 2003/02/01 04:17:10 gordon Exp $ .\" .Dd May 18, 2002 .Dt TUNEFS 8 @@ -41,6 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl A +.Op Fl L Ar volname .Op Fl a Cm enable | disable .Op Fl e Ar maxbpg .Op Fl f Ar avgfilesize @@ -71,6 +72,8 @@ this option will cause all backups to be modified as well as the primary super-block. This is potentially dangerous - use with caution. +.It Fl L Ar volname +Add/modify an optional file system volume label. .It Fl a Cm enable | disable Turn on/off the administrative ACL enable flag. .It Fl e Ar maxbpg ==== //depot/projects/ia64/sbin/tunefs/tunefs.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)tunefs.c 8.2 (Berkeley) 4/19/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.36 2003/01/28 02:42:01 jmallett Exp $"; + "$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.37 2003/02/01 04:17:10 gordon Exp $"; #endif /* not lint */ /* @@ -57,6 +57,7 @@ #include #include +#include #include #include #include @@ -81,26 +82,42 @@ { const char *special, *on; const char *name; - int Aflag = 0, active = 0, aflag = 0; + int Aflag = 0, Lflag = 0, active = 0, aflag = 0; int eflag = 0, fflag = 0, lflag = 0, mflag = 0; int nflag = 0, oflag = 0, pflag = 0, sflag = 0; int evalue = 0, fvalue = 0; int mvalue = 0, ovalue = 0, svalue = 0; - char *avalue = NULL, *lvalue = NULL, *nvalue = NULL; + char *Lvalue = NULL, *avalue = NULL, *lvalue = NULL, *nvalue = NULL; const char *chg[2]; struct ufs_args args; struct statfs stfs; - int found_arg, ch; + int found_arg, ch, i; if (argc < 3) usage(); found_arg = 0; /* at least one arg is required */ - while ((ch = getopt(argc, argv, "Aa:e:f:l:m:n:o:ps:")) != -1) + while ((ch = getopt(argc, argv, "AL:a:e:f:l:m:n:o:ps:")) != -1) switch (ch) { case 'A': found_arg = 1; Aflag++; break; + case 'L': + found_arg = 1; + name = "volume label"; + Lvalue = optarg; + i = -1; + while (isalnum(Lvalue[++i])); + if (Lvalue[i] != '\0') { + errx(10, "bad %s. Valid characters are alphanumerics.", + name); + } + if (strlen(Lvalue) >= MAXVOLLEN) { + errx(10, "bad %s. Length is longer than %d.", + name, MAXVOLLEN - 1); + } + Lflag = 1; + break; case 'a': found_arg = 1; name = "ACLs"; @@ -204,6 +221,10 @@ printfs(); exit(0); } + if (Lflag) { + name = "volume label"; + strlcpy(sblock.fs_volname, Lvalue, MAXVOLLEN); + } if (aflag) { name = "ACLs"; if (strcmp(avalue, "enable") == 0) { @@ -354,10 +375,11 @@ void usage(void) { - fprintf(stderr, "%s\n%s\n%s\n", -"usage: tunefs [-A] [-a enable | disable] [-e maxbpg] [-f avgfilesize]", -" [-l enable | disable] [-m minfree] [-n enable | disable]", -" [-o space | time] [-p] [-s avgfpdir] special | filesystem"); + fprintf(stderr, "%s\n%s\n%s\n%s\n", +"usage: tunefs [-A] [-L volname] [-a enable | disable] [-e maxbpg]", +" [-f avgfilesize] [-l enable | disable] [-m minfree]", +" [-n enable | disable] [-o space | time] [-p]", +" [-s avgfpdir] special | filesystem"); exit(2); } @@ -386,4 +408,6 @@ if (sblock.fs_minfree < MINFREE && sblock.fs_optim == FS_OPTTIME) warnx(OPTWARN, "space", "<", MINFREE); + warnx("volume label: (-L) %s", + sblock.fs_volname); } ==== //depot/projects/ia64/share/examples/cvsup/cvs-supfile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.34 2002/07/30 14:08:16 blackend Exp $ +# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.35 2003/02/01 17:16:59 schweikh Exp $ # # This file contains all of the "CVSup collections" that make up the # CVS development tree of the FreeBSD system. @@ -100,11 +100,15 @@ ports-all # These are the individual collections that make up "ports-all". If you -# use these, be sure to comment out "ports-all" above. +# use these, be sure to comment out "ports-all" above and always include +# "ports-base" if you use any of the other individual collections below. +# Your ports may not build correctly without an up-to-date "ports-base". +# +#ports-base +# #ports-archivers #ports-astro #ports-audio -#ports-base #ports-benchmarks #ports-biology #ports-cad @@ -116,12 +120,14 @@ #ports-devel #ports-editors #ports-emulators +#ports-finance #ports-french #ports-ftp #ports-games #ports-german #ports-graphics #ports-hebrew +#ports-hungarian #ports-irc #ports-japanese #ports-java @@ -131,10 +137,12 @@ #ports-math #ports-mbone #ports-misc +#ports-multimedia #ports-net #ports-news #ports-palm #ports-picobsd +#ports-portuguese #ports-print #ports-russian #ports-science ==== //depot/projects/ia64/share/examples/cvsup/refuse#3 (text+ko) ==== @@ -16,8 +16,10 @@ ports/french ports/german ports/hebrew +ports/hungarian ports/japanese ports/korean +ports/portuguese ports/russian ports/ukrainian ports/vietnamese ==== //depot/projects/ia64/share/examples/cvsup/refuse.README#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/share/examples/cvsup/refuse.README,v 1.6 2003/01/06 21:56:10 trhodes Exp $ +$FreeBSD: src/share/examples/cvsup/refuse.README,v 1.7 2003/02/01 17:01:45 schweikh Exp $ This describes the "refuse" file found in this directory. The explanation cannot be put inside the file itself because: @@ -42,8 +42,10 @@ ports/french ports/german ports/hebrew + ports/hungarian ports/japanese ports/korean + ports/portuguese ports/russian ports/ukrainian ports/vietnamese ==== //depot/projects/ia64/share/man/man4/mac.4#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac.4,v 1.3 2003/01/20 21:07:11 chris Exp $ +.\" $FreeBSD: src/share/man/man4/mac.4,v 1.6 2003/02/01 23:11:57 chris Exp $ .Dd JANUARY 8, 2003 .Os .Dt MAC 4 @@ -48,8 +48,8 @@ .Pp Currently, the following MAC policy modules are shipped with .Fx : -.Bl -column ".Xr mac_seeotheruids 4" "low-watermark mac policy" ".Em Labeling" "boot only" -.It Em Name Ta Em Description Ta Em Labeling Ta Em "Load time" +.Bl -column ".Xr mac_seeotheruids 4" "low-watermark mac policy " ".Em Labeling" "boot only" +.It Sy Name Ta Sy Description Ta Sy Labeling Ta Sy "Load time" .It Xr mac_biba 4 Ta "Biba integrity policy" Ta yes Ta boot only .It Xr mac_bsdextended 4 Ta "File system firewall" Ta no Ta any time .It Xr mac_ifoff 4 Ta "Interface silencing" Ta no Ta any time @@ -72,11 +72,64 @@ More information on the format for MAC labels can be found in the .Xr maclabel 7 man page. -.Ss Setting MAC labels +.Ss Policy Enforcement +MAC can be configured to enforce only specific portions of +policies +(see +.Sx "Runtime Configuration" ) . +Policy enforcement is divided into the following areas of the system: +.Bl -ohang +.It Sy File System +File system mounts, modifying directories, modifying files, etc. +.It Sy KLD +Loading, unloading, and retrieving statistics on loaded kernel modules +.It Sy Network +Network interfaces, +.Xr bpf 4 +.It Sy Pipes +Creation of and operation on +.Xr pipe 2 +objects +.It Sy Processes +Debugging +(e.g. +.Xr ktrace 2 ) , +process visibility +.Xr ( ps 1 ) , +process execution +.Xr ( execve 2 ) , +signalling +.Xr ( kill 2 ) +.It Sy Sockets +Creation and operation on +.Xr socket 2 +objects +.It Sy System +Kernel environment +.Xr ( kenv 1 ) , +system accounting +.Xr ( acct 2 ) , +.Xr reboot 2 , +.Xr settimeofday 2 , +.Xr swapon 2 , +.Xr sysctl 3 , +.Sm off +.Xr nfsd 8 - +related +.Sm on +operations +.It Sy VM +.Sm off +.Xr mmap 2 - +ed +.Sm on +files +.El +.Ss Setting MAC Labels From the command line, each type of system object has its own means for setting and modifying its MAC policy label. -.Bl -column "user login process" "Xr login.conf 5" -offset indent -.It Em "Subject/Object" Ta Em "Utility" +.Bl -column "user (by login class)" "Xr login.conf 5" -offset indent +.It Sy "Subject/Object" Ta Sy "Utility" .It "File system object" Ta Xr setfmac 8 .It "Network interface" Ta Xr ifconfig 8 .It "TTY (by login class)" Ta Xr login.conf 5 @@ -98,6 +151,53 @@ is documented in the .Xr mac 3 man page. +.Ss Runtime Configuration +The following +.Xr sysctl 8 +MIBs are available for fine-tuning the enforcement of MAC policies. +Unless specifically noted, all MIBs default to +.Li 1 +(that is, all areas are enforced by default): +.Bl -tag -width "security.mac.mmap_revocation" +.It Va security.mac.enforce_fs +Enforce MAC policies for file system accesses +.It Va security.mac.enforce_kld +Enforce MAC policies on +.Xr kld 4 +.It Va security.mac.enforce_network +Enforce MAC policies on network interfaces +.It Va security.mac.enforce_pipe +Enforce MAC policies on pipes +.It Va security.mac.enforce_process +Enforce MAC policies between system processes +(e.g. +.Xr ps 1 , +.Xr ktrace 2 ) +.It Va security.mac.enforce_socket +Enforce MAC policies on sockets +.It Va security.mac.enforce_system +Enforce MAC policies on system-related items +(e.g. +.Xr kenv 1 , +.Xr acct 2 , +.Xr reboot 2 ) +.It Va security.mac.enforce_vm +Enforce MAC policies on +.Xr mmap 2 +and +.Xr mprotect 2 +.It Va security.mac.mmap_revocation +Revoke +.Xr mmap 2 +access to files on subject relabel +.It Va security.mac.mmap_revocation_via_cow +Revoke +.Xr mmap 2 +access to files via copy-on-write semantics; +mapped regions will still appear writable, but will no longer +effect a change on the underlying vnode +(Default: 0) +.El .Sh SEE ALSO .Xr mac 3 , .Xr mac_biba 4 , ==== //depot/projects/ia64/sys/alpha/alpha/interrupt.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.70 2003/01/27 00:00:06 julian Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.71 2003/02/01 12:17:05 julian Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /* @@ -479,7 +479,7 @@ mtx_lock_spin(&sched_lock); hardclock_process(curthread, TRAPF_USERMODE(framep)); if ((schedclk2 & 0x7) == 0) - statclock_process(curthread, TRAPF_PC(framep), + statclock_process(curkse, TRAPF_PC(framep), TRAPF_USERMODE(framep)); mtx_unlock_spin(&sched_lock); } ==== //depot/projects/ia64/sys/alpha/alpha/trap.c#19 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.103 2003/01/26 11:41:32 davidxu Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.104 2003/02/01 12:17:05 julian Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -296,7 +296,7 @@ CTR5(KTR_TRAP, "%s trap: pid %d, (%lx, %lx, %lx)", user ? "user" : "kernel", p->p_pid, a0, a1, a2); if (user) { - sticks = td->td_sticks; + sticks = td->td_kse->ke_sticks; td->td_frame = framep; if (td->td_ucred != p->p_ucred) cred_update_thread(td); @@ -666,7 +666,7 @@ cnt.v_syscall++; td->td_frame = framep; opc = framep->tf_regs[FRAME_PC] - 4; - sticks = td->td_sticks; + sticks = td->td_kse->ke_sticks; if (td->td_ucred != p->p_ucred) cred_update_thread(td); if (p->p_flag & P_KSES) ==== //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#16 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.80 2003/01/26 11:41:33 davidxu Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.81 2003/02/01 12:17:05 julian Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -309,7 +309,7 @@ } void -cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) +cpu_set_upcall_kse(struct thread *td, struct kse *ke) { /* XXX */ ==== //depot/projects/ia64/sys/boot/ia64/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ia64/Makefile.inc,v 1.1 2002/04/06 04:33:53 peter Exp $ +# $FreeBSD: src/sys/boot/ia64/Makefile.inc,v 1.2 2003/02/01 22:50:08 marcel Exp $ # Options used when building standalone components -CFLAGS+= -ffreestanding +CFLAGS+= -ffreestanding -fshort-wchar -Wformat ==== //depot/projects/ia64/sys/boot/ia64/libski/Makefile#7 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.8 2002/05/13 11:09:06 ru Exp $ +# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.9 2003/02/01 22:50:08 marcel Exp $ LIB= ski INTERNALLIB= true SRCS= skiconsole.c time.c copy.c devicename.c module.c exit.c SRCS+= delay.c skifs.c elf_freebsd.c bootinfo.c ssc.c +SRCS+= acpi_stub.c efi_stub.c pal_stub.s sal_stub.c CFLAGS+= -ffreestanding -fpic -g CFLAGS+= -I${.CURDIR}/../include ==== //depot/projects/ia64/sys/boot/ia64/libski/bootinfo.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.6 2002/06/20 06:29:42 peter Exp $ + * $FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.7 2003/02/01 22:50:08 marcel Exp $ */ #include @@ -34,8 +34,6 @@ #include #include -#include - #include "bootstrap.h" /* @@ -60,6 +58,7 @@ }; extern char *ski_fmtdev(void *vdev); +extern int ski_init_stubs(struct bootinfo *); int bi_getboothowto(char *kargs) @@ -250,7 +249,6 @@ char *kernelname; vm_offset_t ssym, esym; struct file_metadata *md; - EFI_MEMORY_DESCRIPTOR *memp; /* * Version 1 bootinfo. @@ -320,25 +318,5 @@ /* all done copying stuff in, save end of loaded object space */ bi->bi_kernend = addr; - /* Describe the SKI memory map. */ - bi->bi_memmap = (u_int64_t)(bi + 1); - bi->bi_memmap_size = 2 * sizeof(EFI_MEMORY_DESCRIPTOR); - bi->bi_memdesc_size = sizeof(EFI_MEMORY_DESCRIPTOR); - bi->bi_memdesc_version = 1; - - memp = (EFI_MEMORY_DESCRIPTOR *) bi->bi_memmap; - - memp[0].Type = EfiConventionalMemory; - memp[0].PhysicalStart = 2L*1024*1024; - memp[0].VirtualStart = 0; - memp[0].NumberOfPages = (64L*1024*1024)>>12; - memp[0].Attribute = EFI_MEMORY_WB; - - memp[1].Type = EfiMemoryMappedIOPortSpace; - memp[1].PhysicalStart = 0xffffc000000; - memp[1].VirtualStart = 0; - memp[1].NumberOfPages = (64L*1024*1024)>>12; - memp[1].Attribute = EFI_MEMORY_UC; - - return(0); + return (ski_init_stubs(bi)); } ==== //depot/projects/ia64/sys/boot/ia64/libski/elf_freebsd.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/ia64/libski/elf_freebsd.c,v 1.6 2002/05/19 04:42:18 marcel Exp $ */ +/* $FreeBSD: src/sys/boot/ia64/libski/elf_freebsd.c,v 1.7 2003/02/01 22:50:08 marcel Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -130,6 +130,8 @@ u_int64_t pte_ig :11; /* bits 53..63 */ }; +static struct bootinfo bootinfo; + void enter_kernel(const char* filename, u_int64_t start, struct bootinfo *bi) { @@ -167,7 +169,7 @@ * Ugly hack, similar to linux. Dump the bootinfo into a * special page reserved in the link map. */ - bi = (struct bootinfo *) 0x508000; + bi = &bootinfo; bzero(bi, sizeof(struct bootinfo)); bi_load(bi, fp); ==== //depot/projects/ia64/sys/boot/ia64/libski/libski.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ia64/libski/libski.h,v 1.3 2001/09/20 08:22:56 dfr Exp $ + * $FreeBSD: src/sys/boot/ia64/libski/libski.h,v 1.4 2003/02/01 22:50:08 marcel Exp $ */ /* @@ -90,6 +90,7 @@ #define SSC_GET_RTC 65 #define SSC_EXIT 66 #define SSC_LOAD_SYMBOLS 69 +#define SSC_SAL_SET_VECTORS 120 u_int64_t ssc(u_int64_t in0, u_int64_t in1, u_int64_t in2, u_int64_t in3, int which); ==== //depot/projects/ia64/sys/boot/ia64/libski/ssc.c#2 (text+ko) ==== @@ -23,20 +23,30 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ia64/libski/ssc.c,v 1.1 2001/09/12 08:34:27 dfr Exp $ + * $FreeBSD: src/sys/boot/ia64/libski/ssc.c,v 1.3 2003/02/01 22:50:08 marcel Exp $ */ #include #include "libski.h" +/* + * Ugh... Work around a bug in the Linux version of ski for SSC_GET_RTC. The + * PSR.dt register is not preserved properly and causes further memory + * references to be done without translation. All we need to do is preserve + * PSR.dt across the SSC call. We do this by saving and restoring psr.l >>> 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 Sun Feb 2 4:11: 9 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55BBA37B405; Sun, 2 Feb 2003 04:10: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 B2D8F37B401 for ; Sun, 2 Feb 2003 04:10:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4020F43F43 for ; Sun, 2 Feb 2003 04:10:55 -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 h12CAtbv046127 for ; Sun, 2 Feb 2003 04:10:55 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h12CAsqc046111 for perforce@freebsd.org; Sun, 2 Feb 2003 04:10:54 -0800 (PST) Date: Sun, 2 Feb 2003 04:10:54 -0800 (PST) Message-Id: <200302021210.h12CAsqc046111@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 24563 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=24563 Change 24563 by des@des.at.des.thinksec.com on 2003/02/02 04:10:00 More debugging macros: ENTERI() (item type), ENTERN() (int), ENTERS() (string). Rename RETURNI() to RETURNN() for consistency. Affected files ... .. //depot/projects/openpam/lib/openpam_findenv.c#10 edit .. //depot/projects/openpam/lib/openpam_get_option.c#6 edit .. //depot/projects/openpam/lib/openpam_impl.h#20 edit .. //depot/projects/openpam/lib/openpam_set_option.c#7 edit .. //depot/projects/openpam/lib/pam_get_data.c#10 edit .. //depot/projects/openpam/lib/pam_get_item.c#15 edit .. //depot/projects/openpam/lib/pam_set_data.c#12 edit .. //depot/projects/openpam/lib/pam_set_item.c#17 edit Differences ... ==== //depot/projects/openpam/lib/openpam_findenv.c#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/openpam/lib/openpam_findenv.c#9 $ + * $P4: //depot/projects/openpam/lib/openpam_findenv.c#10 $ */ #include @@ -55,12 +55,12 @@ ENTER(); if (pamh == NULL) - RETURNI(-1); + RETURNN(-1); for (i = 0; i < pamh->env_count; ++i) if (strncmp(pamh->env[i], name, len) == 0 && pamh->env[i][len] == '=') - RETURNI(i); - RETURNI(-1); + RETURNN(i); + RETURNN(-1); } /* ==== //depot/projects/openpam/lib/openpam_get_option.c#6 (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/openpam_get_option.c#5 $ + * $P4: //depot/projects/openpam/lib/openpam_get_option.c#6 $ */ #include @@ -57,7 +57,7 @@ size_t len; int i; - ENTER(); + ENTERS(option); if (pamh == NULL || pamh->current == NULL || option == NULL) RETURNS(NULL); cur = pamh->current; ==== //depot/projects/openpam/lib/openpam_impl.h#20 (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/openpam_impl.h#19 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#20 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -42,6 +42,7 @@ extern const char *_pam_func_name[PAM_NUM_PRIMITIVES]; extern const char *_pam_sm_func_name[PAM_NUM_PRIMITIVES]; extern const char *_pam_err_name[PAM_NUM_ERRORS]; +extern const char *_pam_item_name[PAM_NUM_ITEMS]; /* * Control flags @@ -123,6 +124,21 @@ #ifdef DEBUG #define ENTER() openpam_log(PAM_LOG_DEBUG, "entering") +#define ENTERI(i) do { \ + if ((i) > 0 && (i) < PAM_NUM_ITEMS) \ + openpam_log(PAM_LOG_DEBUG, "entering: %s", _pam_item_name[i]); \ + else \ + openpam_log(PAM_LOG_DEBUG, "entering: %d", (i)); \ +} while (0); +#define ENTERN(n) do { \ + openpam_log(PAM_LOG_DEBUG, "entering: %d", (n)); \ +} while (0); +#define ENTERS(s) do { \ + if ((s) == NULL) \ + openpam_log(PAM_LOG_DEBUG, "entering: NULL"); \ + else \ + openpam_log(PAM_LOG_DEBUG, "entering: '%s'", (s)); \ +} while (0); #define RETURNV() openpam_log(PAM_LOG_DEBUG, "returning") #define RETURNC(c) do { \ if ((c) >= 0 && (c) < PAM_NUM_ERRORS) \ @@ -131,9 +147,9 @@ openpam_log(PAM_LOG_DEBUG, "returning %d!", (c)); \ return (c); \ } while (0) -#define RETURNI(i) do { \ - openpam_log(PAM_LOG_DEBUG, "returning %d", (i)); \ - return (i); \ +#define RETURNN(n) do { \ + openpam_log(PAM_LOG_DEBUG, "returning %d", (n)); \ + return (n); \ } while (0) #define RETURNP(p) do { \ if ((p) == NULL) \ @@ -151,9 +167,12 @@ } while (0) #else #define ENTER() +#define ENTERI(i) +#define ENTERN(n) +#define ENTERS(s) #define RETURNV() return #define RETURNC(c) return (c) -#define RETURNI(i) return (i) +#define RETURNN(n) return (n) #define RETURNP(p) return (p) #define RETURNS(s) return (s) #endif ==== //depot/projects/openpam/lib/openpam_set_option.c#7 (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/openpam_set_option.c#6 $ + * $P4: //depot/projects/openpam/lib/openpam_set_option.c#7 $ */ #include @@ -61,7 +61,7 @@ size_t len; int i; - ENTER(); + ENTERS(option); if (pamh == NULL || pamh->current == NULL || option == NULL) RETURNC(PAM_SYSTEM_ERR); cur = pamh->current; ==== //depot/projects/openpam/lib/pam_get_data.c#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/openpam/lib/pam_get_data.c#9 $ + * $P4: //depot/projects/openpam/lib/pam_get_data.c#10 $ */ #include @@ -54,7 +54,7 @@ { pam_data_t *dp; - ENTER(); + ENTERS(module_data_name); if (pamh == NULL) RETURNC(PAM_SYSTEM_ERR); for (dp = pamh->module_data; dp != NULL; dp = dp->next) ==== //depot/projects/openpam/lib/pam_get_item.c#15 (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_get_item.c#14 $ + * $P4: //depot/projects/openpam/lib/pam_get_item.c#15 $ */ #include @@ -40,6 +40,22 @@ #include "openpam_impl.h" +const char *_pam_item_name[PAM_NUM_ITEMS] = { + "(NO ITEM)", + "PAM_SERVICE", + "PAM_USER", + "PAM_TTY", + "PAM_RHOST", + "PAM_CONV", + "PAM_AUTHTOK", + "PAM_OLDAUTHTOK", + "PAM_RUSER", + "PAM_USER_PROMPT", + "PAM_REPOSITORY", + "PAM_AUTHTOK_PROMPT", + "PAM_OLDAUTHTOK_PROMPT" +}; + /* * XSSO 4.2.1 * XSSO 6 page 46 @@ -53,7 +69,7 @@ const void **item) { - ENTER(); + ENTERI(item_type); if (pamh == NULL) RETURNC(PAM_SYSTEM_ERR); switch (item_type) { ==== //depot/projects/openpam/lib/pam_set_data.c#12 (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_set_data.c#11 $ + * $P4: //depot/projects/openpam/lib/pam_set_data.c#12 $ */ #include @@ -58,7 +58,7 @@ { pam_data_t *dp; - ENTER(); + ENTERS(module_data_name); if (pamh == NULL) RETURNC(PAM_SYSTEM_ERR); for (dp = pamh->module_data; dp != NULL; dp = dp->next) { ==== //depot/projects/openpam/lib/pam_set_item.c#17 (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_set_item.c#16 $ + * $P4: //depot/projects/openpam/lib/pam_set_item.c#17 $ */ #include @@ -58,7 +58,7 @@ void **slot, *tmp; size_t nsize, osize; - ENTER(); + ENTERI(item_type); if (pamh == NULL) RETURNC(PAM_SYSTEM_ERR); slot = &pamh->item[item_type]; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Feb 3 8:26:29 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 908C137B405; Mon, 3 Feb 2003 08:26: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 2034337B401 for ; Mon, 3 Feb 2003 08:26:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3C4E43F85 for ; Mon, 3 Feb 2003 08:26:25 -0800 (PST) (envelope-from green@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 h13GQPbv056461 for ; Mon, 3 Feb 2003 08:26:25 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h13GQPJX056458 for perforce@freebsd.org; Mon, 3 Feb 2003 08:26:25 -0800 (PST) Date: Mon, 3 Feb 2003 08:26:25 -0800 (PST) Message-Id: <200302031626.h13GQPJX056458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 24607 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=24607 Change 24607 by green@green_laptop_2 on 2003/02/03 08:26:05 8 spaces -> tabs Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/database.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/database.c#3 (text+ko) ==== @@ -271,19 +271,19 @@ if (mac_prepare(&filelabel, "sebsd") != 0) { log_it(fname, getpid(), "failure getting SEBSD context for tab", tabname); - goto next_crontab; - } + goto next_crontab; + } if (mac_get_fd(crontab_fd, filelabel) != 0) { log_it(fname, getpid(), "failure getting SEBSD context for tab", tabname); mac_free(filelabel); - goto next_crontab; - } + goto next_crontab; + } if (mac_to_text(filelabel, &file_context) != 0) { log_it(fname, getpid(), "failure getting SEBSD context for tab", tabname); mac_free(filelabel); - goto next_crontab; + goto next_crontab; } mac_free(filelabel); if (get_default_context(strcmp(fname, "*system*") == 0 ? @@ -291,20 +291,20 @@ log_it(fname, getpid(), "failure getting default SEBSD context", tabname); free(file_context); - goto next_crontab; - } - q.scontext = context; - q.tcontext = file_context + sizeof("sebsd/") - 1; - q.tclass = SECCLASS_FILE; - q.requested = FILE__ENTRYPOINT; - error = security_compute_av(&q, &r); + goto next_crontab; + } + q.scontext = context; + q.tcontext = file_context + sizeof("sebsd/") - 1; + q.tclass = SECCLASS_FILE; + q.requested = FILE__ENTRYPOINT; + error = security_compute_av(&q, &r); free(file_context); free(context); - if (error || ((q.requested & r.allowed) != q.requested)) { - log_it(fname, getpid(), "SEBSD entrypoint failed", + if (error || ((q.requested & r.allowed) != q.requested)) { + log_it(fname, getpid(), "SEBSD entrypoint failed", tabname); - goto next_crontab; - } + goto next_crontab; + } } u = load_user(crontab_fd, pw, fname); if (u != NULL) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Feb 3 11: 6:51 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5DC837B405; Mon, 3 Feb 2003 11:06:47 -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 9538337B401 for ; Mon, 3 Feb 2003 11:06:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 252B043F3F for ; Mon, 3 Feb 2003 11:06:47 -0800 (PST) (envelope-from green@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 h13J6kbv014920 for ; Mon, 3 Feb 2003 11:06:46 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h13J6kwf014917 for perforce@freebsd.org; Mon, 3 Feb 2003 11:06:46 -0800 (PST) Date: Mon, 3 Feb 2003 11:06:46 -0800 (PST) Message-Id: <200302031906.h13J6kwf014917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 24619 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=24619 Change 24619 by green@green_laptop_2 on 2003/02/03 11:06:39 Add most of the policy for at, atrun, and friends. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/at.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/atrun.te#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/atrun.fc#2 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/files.lst#3 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/at_macros.te#1 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/user_macros.te#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/atrun.te#2 (text+ko) ==== @@ -26,9 +26,9 @@ allow atrun_t var_at_t:dir rw_dir_perms; allow atrun_t var_at_t:file create_file_perms; -# Jobs output to /var/at/jobs, and are read from /var/at/spool +# Jobs output to /var/at/spool, and are read from /var/at/jobs type var_at_jobs_t, file_type, sysadmfile; type var_at_spool_t, file_type, sysadmfile; allow atrun_t { var_at_jobs_t var_at_spool_t }:dir rw_dir_perms; -allow atrun_t var_at_jobs_t:file create; -allow atrun_t var_at_spool_t:file { r_file_perms unlink }; +allow atrun_t var_at_jobs_t:file { r_file_perms unlink }; +allow atrun_t var_at_spool_t:file create_file_perms; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/atrun.fc#2 (text+ko) ==== @@ -1,5 +1,6 @@ -# atd +# atrun and friends /usr/libexec/atrun system_u:object_r:atrun_exec_t +/usr/bin/(at|atq|atrm|batch) system_u:object_r:at_exec_t /var/at(/.*)? system_u:object_r:var_at_t /var/at/jobs(/.*)? system_u:object_r:var_at_jobs_t /var/at/spool(/.*)? system_u:object_r:var_at_spool_t ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/files.lst#3 (text+ko) ==== @@ -8,6 +8,7 @@ types/security.te macros macros/program +macros/program/at_macros.te macros/program/xserver_macros.te macros/program/crontab_macros.te macros/program/gpg_macros.te @@ -139,6 +140,7 @@ domains/program/apache.te domains/program/apmd.te domains/program/atd.te +domains/program/at.te domains/program/atrun.te domains/program/authbind.te domains/program/automount.te ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/user_macros.te#2 (text+ko) ==== @@ -91,6 +91,7 @@ ifdef(`xserver_macros.te', `xserver_domain($1)') ifdef(`lpr.te', `lpr_domain($1)') mail_domain($1) +ifdef(`at.te', `at_domain($1)') ifdef(`crontab.te', `crontab_domain($1)') ifdef(`sshd.te', `ssh_domain($1)') To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Feb 3 14:16:41 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B647237B405; Mon, 3 Feb 2003 14:16:39 -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 4A26737B401 for ; Mon, 3 Feb 2003 14:16:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E82E543E4A for ; Mon, 3 Feb 2003 14:16:38 -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 h13MGcbv082739 for ; Mon, 3 Feb 2003 14:16:38 -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 h13MGcYR082736 for perforce@freebsd.org; Mon, 3 Feb 2003 14:16:38 -0800 (PST) Date: Mon, 3 Feb 2003 14:16:38 -0800 (PST) Message-Id: <200302032216.h13MGcYR082736@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 24624 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=24624 Change 24624 by rwatson@rwatson_tislabs on 2003/02/03 14:16:04 Since login in the MAC branch has been modified to use sebsd calls, make sure to install libsebsd. In the future, we may want to remove libsebsd from the MAC branch and just keep it in the SEBSD branch, but until then, make it compiles. Affected files ... .. //depot/projects/trustedbsd/mac/lib/Makefile#15 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/Makefile#15 (text+ko) ==== @@ -28,7 +28,7 @@ libedit libexpat libfetch libform libftpio ${_libio} libipsec \ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap \ - ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ + libsebsd ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ libstand ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ libwrap libxpg4 liby libz To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Feb 3 14:56:36 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C07C37B405; Mon, 3 Feb 2003 14:56: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 DD3C437B401 for ; Mon, 3 Feb 2003 14:56:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 327DA43FAF for ; Mon, 3 Feb 2003 14:56:01 -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 h13Mu0bv096933 for ; Mon, 3 Feb 2003 14:56:00 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h13Mtd61096926 for perforce@freebsd.org; Mon, 3 Feb 2003 14:55:39 -0800 (PST) Date: Mon, 3 Feb 2003 14:55:39 -0800 (PST) Message-Id: <200302032255.h13Mtd61096926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov Subject: PERFORCE change 24625 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=24625 Change 24625 by tzukanov@tzukanov_antares on 2003/02/03 14:55:23 IFC. Affected files ... .. //depot/projects/s390/MAINTAINERS#6 integrate .. //depot/projects/s390/Makefile#6 integrate .. //depot/projects/s390/UPDATING#6 integrate .. //depot/projects/s390/bin/Makefile#3 integrate .. //depot/projects/s390/bin/chmod/chmod.c#3 integrate .. //depot/projects/s390/bin/dd/dd.c#2 integrate .. //depot/projects/s390/bin/kenv/Makefile#2 integrate .. //depot/projects/s390/bin/kenv/kenv.1#2 integrate .. //depot/projects/s390/bin/kenv/kenv.c#2 integrate .. //depot/projects/s390/bin/ls/ls.1#4 integrate .. //depot/projects/s390/bin/ps/extern.h#4 integrate .. //depot/projects/s390/bin/ps/keyword.c#4 integrate .. //depot/projects/s390/bin/ps/print.c#4 integrate .. //depot/projects/s390/bin/ps/ps.c#4 integrate .. //depot/projects/s390/bin/ps/ps.h#3 integrate .. //depot/projects/s390/bin/realpath/realpath.c#3 integrate .. //depot/projects/s390/bin/sh/eval.c#3 integrate .. //depot/projects/s390/bin/sh/jobs.c#4 integrate .. //depot/projects/s390/bin/sh/show.c#3 integrate .. //depot/projects/s390/contrib/bind/CHANGES#3 integrate .. //depot/projects/s390/contrib/bind/README#2 integrate .. //depot/projects/s390/contrib/bind/Version#2 integrate .. //depot/projects/s390/contrib/bind/bin/named/db_defs.h#3 integrate .. //depot/projects/s390/contrib/bind/bin/named/db_sec.c#3 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_defs.h#3 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_ncache.c#3 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_req.c#3 integrate .. //depot/projects/s390/contrib/bind/bin/named/ns_resp.c#3 integrate .. //depot/projects/s390/contrib/bind/doc/html/logging.html#2 integrate .. //depot/projects/s390/contrib/bind/doc/html/options.html#2 integrate .. //depot/projects/s390/contrib/bind/doc/man/named.conf.5#2 integrate .. //depot/projects/s390/contrib/bind/doc/man/resolver.3#2 integrate .. //depot/projects/s390/contrib/bind/lib/nameser/ns_name.c#3 integrate .. //depot/projects/s390/contrib/bind/lib/nameser/ns_samedomain.c#3 integrate .. //depot/projects/s390/contrib/cvs/ChangeLog#4 integrate .. //depot/projects/s390/contrib/cvs/FAQ#2 integrate .. //depot/projects/s390/contrib/cvs/INSTALL#4 integrate .. //depot/projects/s390/contrib/cvs/NEWS#4 integrate .. //depot/projects/s390/contrib/cvs/config.h.in#4 integrate .. //depot/projects/s390/contrib/cvs/configure#4 integrate .. //depot/projects/s390/contrib/cvs/configure.in#4 integrate .. //depot/projects/s390/contrib/cvs/contrib/ChangeLog#4 integrate .. //depot/projects/s390/contrib/cvs/contrib/Makefile.am#4 integrate .. //depot/projects/s390/contrib/cvs/contrib/Makefile.in#4 integrate .. //depot/projects/s390/contrib/cvs/contrib/cvs_acls.in#4 integrate .. //depot/projects/s390/contrib/cvs/doc/ChangeLog#4 integrate .. //depot/projects/s390/contrib/cvs/doc/HACKING.DOCS#2 delete .. //depot/projects/s390/contrib/cvs/doc/stamp-1#3 integrate .. //depot/projects/s390/contrib/cvs/doc/stamp-vti#3 integrate .. //depot/projects/s390/contrib/cvs/doc/version-client.texi#3 integrate .. //depot/projects/s390/contrib/cvs/doc/version.texi#3 integrate .. //depot/projects/s390/contrib/cvs/lib/ChangeLog#4 integrate .. //depot/projects/s390/contrib/cvs/src/ChangeLog#4 integrate .. //depot/projects/s390/contrib/cvs/src/Makefile.am#4 integrate .. //depot/projects/s390/contrib/cvs/src/Makefile.in#4 integrate .. //depot/projects/s390/contrib/cvs/src/admin.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/annotate.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/buffer.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/client.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/commit.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/cvs.h#4 integrate .. //depot/projects/s390/contrib/cvs/src/diff.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/edit.c#3 integrate .. //depot/projects/s390/contrib/cvs/src/lock.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/log.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/myndbm.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/options.h#2 delete .. //depot/projects/s390/contrib/cvs/src/parseinfo.c#3 integrate .. //depot/projects/s390/contrib/cvs/src/patch.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/rcs.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/recurse.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/remove.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/root.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/sanity.sh#4 integrate .. //depot/projects/s390/contrib/cvs/src/scramble.c#2 integrate .. //depot/projects/s390/contrib/cvs/src/server.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/status.c#3 integrate .. //depot/projects/s390/contrib/cvs/src/tag.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/update.c#4 integrate .. //depot/projects/s390/contrib/cvs/src/watch.c#3 integrate .. //depot/projects/s390/contrib/cvs/src/zlib.c#3 integrate .. //depot/projects/s390/contrib/gcc/gcc.1#3 integrate .. //depot/projects/s390/contrib/gcc/gcc.c#5 integrate .. //depot/projects/s390/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/COPYRIGHT#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/FREEBSD-upgrade#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/Makefile#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/Makefile.conf#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/Makefile.dist#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/README#3 integrate .. //depot/projects/s390/contrib/isc-dhcp/RELNOTES#3 integrate .. //depot/projects/s390/contrib/isc-dhcp/client/Makefile.dist#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/client/clparse.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/client/dhclient-script.8#3 integrate .. //depot/projects/s390/contrib/isc-dhcp/client/dhclient.8#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/client/dhclient.c#3 integrate .. //depot/projects/s390/contrib/isc-dhcp/client/dhclient.conf.5#3 integrate .. //depot/projects/s390/contrib/isc-dhcp/client/dhclient.leases.5#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/client/scripts/freebsd#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/alloc.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/bpf.c#3 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/comapi.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/conflex.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/ctrace.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/dhcp-eval.5#3 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/dhcp-options.5#3 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/discover.c#3 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/dispatch.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/dlpi.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/dns.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/ethernet.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/execute.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/fddi.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/icmp.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/inet.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/lpf.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/memory.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/nit.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/options.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/packet.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/parse.c#3 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/print.c#3 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/raw.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/resolv.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/socket.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/tables.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/tr.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/tree.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/common/upf.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/dhcpctl/Makefile.dist#1 branch .. //depot/projects/s390/contrib/isc-dhcp/dhcpctl/callback.c#1 branch .. //depot/projects/s390/contrib/isc-dhcp/dhcpctl/cltest.c#1 branch .. //depot/projects/s390/contrib/isc-dhcp/dhcpctl/dhcpctl.3#1 branch .. //depot/projects/s390/contrib/isc-dhcp/dhcpctl/dhcpctl.c#1 branch .. //depot/projects/s390/contrib/isc-dhcp/dhcpctl/dhcpctl.h#1 branch .. //depot/projects/s390/contrib/isc-dhcp/dhcpctl/omshell.1#1 branch .. //depot/projects/s390/contrib/isc-dhcp/dhcpctl/omshell.c#1 branch .. //depot/projects/s390/contrib/isc-dhcp/dhcpctl/remote.c#1 branch .. //depot/projects/s390/contrib/isc-dhcp/dst/Makefile.dist#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/dst/dst_api.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/dst/dst_support.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/dst/hmac_link.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/dst/prandom.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/includes/dhcpd.h#3 integrate .. //depot/projects/s390/contrib/isc-dhcp/includes/osdep.h#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/includes/version.h#3 integrate .. //depot/projects/s390/contrib/isc-dhcp/minires/ns_name.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/minires/ns_samedomain.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/minires/ns_sign.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/minires/res_findzonecut.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/minires/res_send.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/omapip/alloc.c#2 integrate .. //depot/projects/s390/contrib/isc-dhcp/omapip/message.c#2 integrate .. //depot/projects/s390/contrib/libpcap/VERSION#2 integrate .. //depot/projects/s390/contrib/libpcap/gencode.c#2 integrate .. //depot/projects/s390/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/s390/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/s390/contrib/libpcap/pcap.3#2 integrate .. //depot/projects/s390/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/s390/contrib/libpcap/pcap.h#2 integrate .. //depot/projects/s390/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/projects/s390/contrib/opie/libopie/newseed.c#2 integrate .. //depot/projects/s390/contrib/tcpdump/VERSION#2 integrate .. //depot/projects/s390/contrib/tcpdump/tcpdump.1#2 integrate .. //depot/projects/s390/contrib/tcpdump/tcpdump.c#2 integrate .. //depot/projects/s390/crypto/heimdal/kuser/kuser_locl.h#2 integrate .. //depot/projects/s390/crypto/kerberosIV/admin/adm_locl.h#2 integrate .. //depot/projects/s390/crypto/kerberosIV/admin/kdb_edit.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/admin/kdb_init.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/appl/afsutil/kstring2key.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/appl/bsd/bsd_locl.h#2 integrate .. //depot/projects/s390/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h#2 integrate .. //depot/projects/s390/crypto/kerberosIV/appl/telnet/libtelnet/enc_des.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/appl/telnet/telnetd/telnetd.h#2 integrate .. //depot/projects/s390/crypto/kerberosIV/kadmin/kadm_locl.h#2 integrate .. //depot/projects/s390/crypto/kerberosIV/kadmin/kadmin.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/kadmin/ksrvutil.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/kadmin/ksrvutil_get.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/kadmin/random_password.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/lib/kadm/kadm_locl.h#2 integrate .. //depot/projects/s390/crypto/kerberosIV/lib/krb/krb-protos.h#2 integrate .. //depot/projects/s390/crypto/kerberosIV/lib/krb/krb.h#2 integrate .. //depot/projects/s390/crypto/kerberosIV/lib/krb/krb_check_auth.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/lib/krb/mk_priv.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/lib/krb/rd_priv.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/lib/krb/recvauth.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/lib/krb/sendauth.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/lib/krb/solaris_compat.c#2 integrate .. //depot/projects/s390/crypto/kerberosIV/server/kerberos.c#2 integrate .. //depot/projects/s390/crypto/openssh/auth-chall.c#2 integrate .. //depot/projects/s390/crypto/openssh/monitor.c#4 integrate .. //depot/projects/s390/crypto/openssh/sshd.c#3 integrate .. //depot/projects/s390/crypto/openssl/CHANGES#3 integrate .. //depot/projects/s390/crypto/openssl/Configure#3 integrate .. //depot/projects/s390/crypto/openssl/FAQ#3 integrate .. //depot/projects/s390/crypto/openssl/INSTALL#3 integrate .. //depot/projects/s390/crypto/openssl/Makefile.org#3 integrate .. //depot/projects/s390/crypto/openssl/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/NEWS#3 integrate .. //depot/projects/s390/crypto/openssl/PROBLEMS#2 integrate .. //depot/projects/s390/crypto/openssl/README#3 integrate .. //depot/projects/s390/crypto/openssl/README.ASN1#1 branch .. //depot/projects/s390/crypto/openssl/README.ENGINE#2 integrate .. //depot/projects/s390/crypto/openssl/apps/CA.pl#3 integrate .. //depot/projects/s390/crypto/openssl/apps/CA.pl.in#2 integrate .. //depot/projects/s390/crypto/openssl/apps/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/apps/app_rand.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/apps.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/apps.h#2 integrate .. //depot/projects/s390/crypto/openssl/apps/asn1pars.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/ca.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/ciphers.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/crl.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/crl2p7.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/dgst.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/dh.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/dhparam.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/dsa.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/dsaparam.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/enc.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/engine.c#1 branch .. //depot/projects/s390/crypto/openssl/apps/errstr.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/gendh.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/gendsa.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/genrsa.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/nseq.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/ocsp.c#1 branch .. //depot/projects/s390/crypto/openssl/apps/openssl.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/openssl.cnf#2 integrate .. //depot/projects/s390/crypto/openssl/apps/passwd.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/pkcs12.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/pkcs7.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/pkcs8.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/progs.h#2 integrate .. //depot/projects/s390/crypto/openssl/apps/progs.pl#2 integrate .. //depot/projects/s390/crypto/openssl/apps/rand.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/req.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/rsa.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/rsautl.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/s_apps.h#2 integrate .. //depot/projects/s390/crypto/openssl/apps/s_cb.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/s_client.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/s_server.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/s_socket.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/s_time.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/sess_id.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/smime.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/speed.c#3 integrate .. //depot/projects/s390/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/testdsa.h#2 integrate .. //depot/projects/s390/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/version.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/winrand.c#2 integrate .. //depot/projects/s390/crypto/openssl/apps/x509.c#3 integrate .. //depot/projects/s390/crypto/openssl/bugs/stream.c#2 integrate .. //depot/projects/s390/crypto/openssl/certs/RegTP-4R.pem#1 branch .. //depot/projects/s390/crypto/openssl/certs/RegTP-5R.pem#1 branch .. //depot/projects/s390/crypto/openssl/certs/RegTP-6R.pem#1 branch .. //depot/projects/s390/crypto/openssl/config#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/aes/Makefile.ssl#1 branch .. //depot/projects/s390/crypto/openssl/crypto/aes/README#1 branch .. //depot/projects/s390/crypto/openssl/crypto/aes/aes.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/aes/aes_cbc.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/aes/aes_cfb.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/aes/aes_core.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/aes/aes_ctr.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/aes/aes_ecb.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/aes/aes_locl.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/aes/aes_misc.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/aes/aes_ofb.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/asn1/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_bitstr.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_bmp.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_bool.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_bytes.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_d2i_fp.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_digest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_dup.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_enum.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_gentm.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_i2d_fp.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_int.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_null.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_object.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_octet.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_print.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_set.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_sign.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_strex.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_strnid.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_time.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_type.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_utctm.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_utf8.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_verify.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/a_vis.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/asn1.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/asn1_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/asn1_lib.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/asn1_mac.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/asn1_par.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/asn1t.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/asn1/asn_moid.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/asn1/asn_pack.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/d2i_dhp.c#3 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/d2i_dsap.c#3 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/d2i_pr.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/d2i_pu.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/d2i_r_pr.c#3 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/d2i_r_pu.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/d2i_s_pr.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/d2i_s_pu.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/f_int.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/i2d_dhp.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/i2d_dsap.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/i2d_pr.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/i2d_pu.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/i2d_r_pr.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/i2d_r_pu.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/i2d_s_pr.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/i2d_s_pu.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/n_pkey.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/nsseq.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/p5_pbe.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/p5_pbev2.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/p7_dgst.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/p7_enc.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/p7_enc_c.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/p7_evp.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/p7_i_s.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/p7_lib.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/p7_recip.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/p7_s_e.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/p7_signd.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/p7_signi.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/asn1/p8_pkey.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/t_crl.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/t_pkey.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/t_req.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/t_spki.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/t_x509.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/t_x509a.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/tasn_dec.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/asn1/tasn_enc.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/asn1/tasn_fre.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/asn1/tasn_new.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/asn1/tasn_prn.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/asn1/tasn_typ.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/asn1/tasn_utl.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_algor.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_attrib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_bignum.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_crl.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_exten.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_info.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_long.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_name.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_pubkey.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_req.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_sig.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_spki.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_val.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_x509.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/asn1/x_x509a.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bf/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bf/bf_opts.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bf/bf_skey.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bf/bfspeed.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bf/bftest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bf/blowfish.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/b_print.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/b_sock.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bf_buff.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bf_nbio.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bf_null.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bio.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bio_cb.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bio_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bio_lib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bss_acpt.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bss_bio.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bss_conn.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bss_fd.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bss_file.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bss_log.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bss_mem.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bio/bss_sock.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/asm/README#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/asm/bn-586.pl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/bn/bn.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_add.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_asm.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_ctx.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_div.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_exp.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_exp2.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_gcd.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_kron.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_lcl.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_lib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_mod.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_mont.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_mpi.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_mul.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_prime.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_print.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_rand.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_recp.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_shift.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_sqr.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_sqrt.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/bn/bn_word.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bnspeed.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/bntest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/divtest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/expspeed.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/exptest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/bn/test.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/buffer/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/buffer/buf_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/buffer/buffer.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/buffer/buffer.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/cast/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/cast/cast.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/cast/cast_lcl.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/cast/cast_spd.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/cast/castopts.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/cast/casttest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/comp/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/comp/c_rle.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/comp/c_zlib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/comp/comp.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/comp/comp_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/conf/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/conf/README#1 branch .. //depot/projects/s390/crypto/openssl/crypto/conf/cnf_save.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/conf/conf.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/conf/conf_api.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/conf/conf_api.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/conf/conf_def.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/conf/conf_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/conf/conf_lib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/conf/conf_mall.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/conf/conf_mod.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/conf/conf_sap.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/cpt_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/cryptlib.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/cryptlib.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/crypto.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/cversion.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/FILES#2 delete .. //depot/projects/s390/crypto/openssl/crypto/des/FILES0#1 branch .. //depot/projects/s390/crypto/openssl/crypto/des/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/asm/crypt586.pl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/asm/des-586.pl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/asm/des686.pl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/asm/desboth.pl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/cbc3_enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/cbc_cksm.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/cfb64ede.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/cfb64enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/cfb_enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/des.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/des.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/des_enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/des_locl.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/des_old.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/des/des_old.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/des/des_old2.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/des/des_opts.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/des_ver.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/destest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/ecb3_enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/ecb_enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/ede_cbcm_enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/enc_read.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/enc_writ.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/fcrypt.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/fcrypt_b.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/ncbc_enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/ofb64ede.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/ofb64enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/ofb_enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/pcbc_enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/qud_cksm.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/rand_key.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/read2pwd.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/read_pwd.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/rnd_keys.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/des/rpc_enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/rpw.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/set_key.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/speed.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/spr.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/str2key.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/des/xcbc_enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dh/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dh/dh.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/dh/dh_asn1.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/dh/dh_check.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dh/dh_err.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/dh/dh_key.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dh/dh_lib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dh/dhtest.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa_asn1.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa_gen.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa_key.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa_lib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa_ossl.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa_sign.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsa_vrf.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dsa/dsatest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dso/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dso/README#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dso/dso.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dso/dso_dl.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dso/dso_dlfcn.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/dso/dso_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/dso/dso_lib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/ebcdic.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/ec/Makefile.ssl#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ec/ec.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ec/ec_cvt.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ec/ec_err.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ec/ec_lcl.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ec/ec_lib.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ec/ec_mult.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ec/ecp_mont.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ec/ecp_nist.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ec/ecp_recp.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ec/ecp_smpl.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ec/ectest.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/Makefile.ssl#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/README#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/eng_all.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/eng_cnf.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/eng_ctrl.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/eng_dyn.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/eng_err.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/eng_fat.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/eng_init.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/eng_int.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/eng_lib.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/eng_list.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/eng_openssl.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/eng_pkey.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/eng_table.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/engine.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/enginetest.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw.ec#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_4758_cca.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_4758_cca_err.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_4758_cca_err.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_aep.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_aep_err.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_aep_err.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_atalla.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_atalla_err.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_atalla_err.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_cryptodev.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_cswift.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_cswift_err.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_cswift_err.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_ncipher.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_ncipher_err.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_ncipher_err.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_nuron.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_nuron_err.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_nuron_err.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_sureware.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_sureware_err.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_sureware_err.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_ubsec.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_ubsec_err.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/hw_ubsec_err.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/tb_cipher.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/tb_dh.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/tb_digest.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/tb_dsa.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/tb_rand.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/tb_rsa.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/vendor_defns/aep.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/vendor_defns/atalla.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/vendor_defns/cswift.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/engine/vendor_defns/sureware.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/err/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/err/err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/err/err.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/err/err_all.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/err/err_prn.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/err/openssl.ec#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/bio_b64.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/bio_enc.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/bio_md.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/bio_ok.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/c_all.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/c_allc.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/c_alld.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/digest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/e_aes.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/evp/e_bf.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/e_cast.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/e_des.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/e_des3.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/e_idea.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/e_null.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/e_rc2.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/e_rc4.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/e_rc5.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/e_xcbc_d.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/encode.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/evp.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/evp_acnf.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/evp/evp_enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/evp_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/evp_key.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/evp_lib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/evp_locl.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/evp_pbe.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/evp_pkey.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/evp_test.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/evp/evptests.txt#1 branch .. //depot/projects/s390/crypto/openssl/crypto/evp/m_dss.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/m_dss1.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/m_md2.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/m_md4.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/m_md5.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/m_mdc2.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/m_null.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/m_ripemd.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/m_sha.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/m_sha1.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/names.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/openbsd_hw.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/evp/p5_crpt.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/p5_crpt2.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/p_dec.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/p_enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/p_lib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/p_open.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/p_seal.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/p_sign.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/evp/p_verify.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/ex_data.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/hmac/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/hmac/hmac.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/hmac/hmac.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/hmac/hmactest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/idea/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/idea/i_cbc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/idea/i_cfb64.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/idea/i_ecb.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/idea/i_ofb64.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/idea/i_skey.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/idea/idea.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/idea/idea_lcl.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/idea/idea_spd.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/idea/ideatest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/idea/version#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/krb5/Makefile.ssl#1 branch .. //depot/projects/s390/crypto/openssl/crypto/krb5/krb5_asn.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/krb5/krb5_asn.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/lhash/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/lhash/lh_stats.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/lhash/lhash.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/lhash/lhash.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md2/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/md2/md2.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md2/md2_dgst.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md2/md2_one.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md2/md2test.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md32_common.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md4/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md4/md4.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md4/md4.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md4/md4_dgst.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md4/md4_one.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md4/md4test.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md5/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md5/asm/md5-sparcv9.S#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md5/md5.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md5/md5_dgst.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md5/md5_locl.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md5/md5_one.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/md5/md5test.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/mdc2/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/mdc2/mdc2.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/mdc2/mdc2_one.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/mdc2/mdc2dgst.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/mdc2/mdc2test.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/mem.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/mem_clr.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/mem_dbg.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/o_time.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/o_time.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/objects/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/objects/o_names.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/objects/obj_dat.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/objects/obj_dat.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/objects/obj_dat.pl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/objects/obj_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/objects/obj_lib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/objects/obj_mac.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/objects/obj_mac.num#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/objects/objects.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/objects/objects.pl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/objects/objects.txt#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/ocsp/Makefile.ssl#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ocsp/ocsp.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ocsp/ocsp_asn.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ocsp/ocsp_cl.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ocsp/ocsp_err.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ocsp/ocsp_ext.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ocsp/ocsp_ht.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ocsp/ocsp_lib.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ocsp/ocsp_prn.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ocsp/ocsp_srv.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ocsp/ocsp_vfy.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/opensslconf.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/opensslconf.h.in#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/opensslv.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/ossl_typ.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/pem/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pem/pem.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pem/pem_all.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pem/pem_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pem/pem_info.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/pem/pem_lib.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/pem/pem_oth.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/pem/pem_pk8.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/pem/pem_pkey.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/pem/pem_seal.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pem/pem_sign.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pem/pem_x509.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/pem/pem_xaux.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/perlasm/cbc.pl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/perlasm/x86asm.pl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/perlasm/x86ms.pl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/perlasm/x86nasm.pl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/perlasm/x86unix.pl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_add.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_asn.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_attr.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_bags.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_crpt.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_crt.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_decr.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_init.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_key.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_kiss.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_lib.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_mac.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_mutl.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_npas.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_p8d.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_p8e.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_sbag.c#2 delete .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/p12_utl.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/pk12err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs12/pkcs12.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs7/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs7/bio_ber.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs7/enc.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs7/example.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs7/pk7_asn1.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/pkcs7/pk7_doit.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs7/pk7_lib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs7/pk7_smime.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs7/pkcs7.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs7/pkcs7err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs7/sign.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/pkcs7/verify.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/rand/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rand/md_rand.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rand/rand.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rand/rand_egd.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/rand/rand_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rand/rand_lcl.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rand/rand_lib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rand/rand_os2.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/rand/rand_unix.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/rand/rand_vms.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/rand/rand_win.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/rand/randfile.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rand/randtest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc2/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc2/rc2.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc2/rc2speed.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc2/rc2test.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc4/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc4/rc4.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc4/rc4.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc4/rc4speed.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc4/rc4test.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc5/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc5/rc5.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc5/rc5_ecb.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc5/rc5_locl.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc5/rc5speed.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rc5/rc5test.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/ripemd/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/ripemd/ripemd.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/ripemd/rmd_dgst.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/ripemd/rmd_one.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/ripemd/rmdtest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa.h#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_asn1.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_chk.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_eay.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_lib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_none.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_null.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_oaep.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_pk1.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_saos.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_sign.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_ssl.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/rsa/rsa_test.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/sha/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/sha/sha.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/sha/sha1_one.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/sha/sha1dgst.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/sha/sha1test.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/sha/sha_dgst.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/sha/sha_locl.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/sha/sha_one.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/sha/shatest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/stack/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/stack/safestack.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/stack/stack.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/symhacks.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/threads/mttest.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/threads/th-lock.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/tmdiff.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/txt_db/Makefile.ssl#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/txt_db/txt_db.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/txt_db/txt_db.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/ui/Makefile.ssl#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ui/ui.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ui/ui_compat.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ui/ui_compat.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ui/ui_err.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ui/ui_lib.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ui/ui_locl.h#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ui/ui_openssl.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/ui/ui_util.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/uid.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/by_file.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509_att.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509_cmp.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509_d2.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509_err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509_ext.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509_lu.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509_obj.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509_req.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509_trs.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509_txt.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509_v3.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509_vfy.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509_vfy.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x509cset.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/x509/x509spki.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509/x_all.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/Makefile.ssl#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/ext_dat.h#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_akey.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_akeya.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_alt.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_bcons.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_bitst.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_conf.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_cpols.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_crld.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_enum.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_extku.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_genn.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_info.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_int.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_lib.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_ocsp.c#1 branch .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_pku.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_prn.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_purp.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_skey.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_sxnet.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3_utl.c#3 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3conf.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3err.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/v3prin.c#2 integrate .. //depot/projects/s390/crypto/openssl/crypto/x509v3/x509v3.h#2 integrate .. //depot/projects/s390/crypto/openssl/demos/asn1/README.ASN1#1 branch .. //depot/projects/s390/crypto/openssl/demos/asn1/ocsp.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/b64.c#3 integrate .. //depot/projects/s390/crypto/openssl/demos/bio/saccept.c#2 integrate .. //depot/projects/s390/crypto/openssl/demos/bio/sconnect.c#2 integrate .. //depot/projects/s390/crypto/openssl/demos/easy_tls/Makefile#1 branch .. //depot/projects/s390/crypto/openssl/demos/easy_tls/README#1 branch .. //depot/projects/s390/crypto/openssl/demos/easy_tls/cacerts.pem#1 branch .. //depot/projects/s390/crypto/openssl/demos/easy_tls/cert.pem#1 branch .. //depot/projects/s390/crypto/openssl/demos/easy_tls/easy-tls.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/easy_tls/easy-tls.h#1 branch .. //depot/projects/s390/crypto/openssl/demos/easy_tls/test.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/easy_tls/test.h#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/cluster_labs/Makefile#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/cluster_labs/cluster_labs.h#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/cluster_labs/hw_cluster_labs.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/cluster_labs/hw_cluster_labs.ec#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/cluster_labs/hw_cluster_labs_err.h#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/ibmca/Makefile#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/ibmca/hw_ibmca.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/ibmca/hw_ibmca.ec#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/ibmca/hw_ibmca_err.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/ibmca/hw_ibmca_err.h#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/ibmca/ica_openssl_api.h#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/rsaref/Makefile#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/rsaref/README#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/rsaref/build.com#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/rsaref/rsaref.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/rsaref/rsaref.ec#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/rsaref/rsaref_err.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/rsaref/rsaref_err.h#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/zencod/Makefile#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/zencod/hw_zencod.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/zencod/hw_zencod.ec#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/zencod/hw_zencod.h#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/zencod/hw_zencod_err.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/engines/zencod/hw_zencod_err.h#1 branch .. //depot/projects/s390/crypto/openssl/demos/maurice/example1.c#3 integrate .. //depot/projects/s390/crypto/openssl/demos/maurice/example3.c#2 integrate .. //depot/projects/s390/crypto/openssl/demos/maurice/loadkeys.c#3 integrate .. //depot/projects/s390/crypto/openssl/demos/sign/sign.c#2 integrate .. //depot/projects/s390/crypto/openssl/demos/spkigen.c#2 integrate .. //depot/projects/s390/crypto/openssl/demos/ssl/cli.cpp#2 integrate .. //depot/projects/s390/crypto/openssl/demos/ssl/inetdsrv.cpp#2 integrate .. //depot/projects/s390/crypto/openssl/demos/ssl/serv.cpp#2 integrate .. //depot/projects/s390/crypto/openssl/demos/state_machine/state_machine.c#2 integrate .. //depot/projects/s390/crypto/openssl/demos/tunala/A-client.pem#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/A-server.pem#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/CA.pem#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/INSTALL#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/Makefile#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/Makefile.am#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/README#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/autogunk.sh#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/autoungunk.sh#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/breakage.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/buffer.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/cb.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/configure.in#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/ip.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/sm.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/tunala.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/tunala/tunala.h#1 branch .. //depot/projects/s390/crypto/openssl/demos/x509/README#1 branch .. //depot/projects/s390/crypto/openssl/demos/x509/mkcert.c#1 branch .. //depot/projects/s390/crypto/openssl/demos/x509/mkreq.c#1 branch .. //depot/projects/s390/crypto/openssl/doc/HOWTO/certificates.txt#1 branch .. //depot/projects/s390/crypto/openssl/doc/apps/CA.pl.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/ca.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/ciphers.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/enc.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/ocsp.pod#1 branch .. //depot/projects/s390/crypto/openssl/doc/apps/openssl.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/passwd.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/pkcs12.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/pkcs7.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/rand.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/req.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/rsa.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/s_client.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/s_server.pod#2 integrate .. //depot/projects/s390/crypto/openssl/doc/apps/smime.pod#3 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 Mon Feb 3 18:53:52 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F376C37B405; Mon, 3 Feb 2003 18:53:50 -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 77A4637B401 for ; Mon, 3 Feb 2003 18:53:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 081F943F93 for ; Mon, 3 Feb 2003 18:53: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 h142rnbv084295 for ; Mon, 3 Feb 2003 18:53: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 h142rnPJ084292 for perforce@freebsd.org; Mon, 3 Feb 2003 18:53:49 -0800 (PST) Date: Mon, 3 Feb 2003 18:53:49 -0800 (PST) Message-Id: <200302040253.h142rnPJ084292@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 24630 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=24630 Change 24630 by rwatson@rwatson_tislabs on 2003/02/03 18:52:52 Merge from SEBSD branch: get sebsd_checkpolicy compiling. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#5 (text+ko) ==== @@ -27,6 +27,8 @@ MALLOC_DECLARE(M_SEBSD_SS); #define sebsd_malloc(a,b,c) malloc(a,b,c) #define sebsd_free(a,b) free(a,b) +#define mtx_lock(a) +#define mtx_unlock(a) #else /* _KERNEL */ #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Feb 3 19:49: 0 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F7E337B405; Mon, 3 Feb 2003 19:48:58 -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 223AA37B401 for ; Mon, 3 Feb 2003 19:48:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BABCF43F43 for ; Mon, 3 Feb 2003 19:48:57 -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 h143mvbv002509 for ; Mon, 3 Feb 2003 19:48:57 -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 h143mvCI002506 for perforce@freebsd.org; Mon, 3 Feb 2003 19:48:57 -0800 (PST) Date: Mon, 3 Feb 2003 19:48:57 -0800 (PST) Message-Id: <200302040348.h143mvCI002506@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 24632 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=24632 Change 24632 by rwatson@rwatson_tislabs on 2003/02/03 19:48:33 Move stub mtx_{un,}lock() macros into !_KERNEL for global.h (oops). Have SIDTAB_TRYLOCK() return 1 indicating always success on locking in userland. Merged from trustedbsd_sebsd branch. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#6 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#6 (text+ko) ==== @@ -27,13 +27,13 @@ MALLOC_DECLARE(M_SEBSD_SS); #define sebsd_malloc(a,b,c) malloc(a,b,c) #define sebsd_free(a,b) free(a,b) -#define mtx_lock(a) -#define mtx_unlock(a) #else /* _KERNEL */ #include #include #define sebsd_malloc(a,b,c) (c&M_ZERO)?calloc(1,a):malloc(a) #define sebsd_free(a,b) free(a) +#define mtx_lock(a) +#define mtx_unlock(a) #endif /* _KERNEL */ extern int ss_initialized; ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ #define SIDTAB_UNLOCK(s) mtx_unlock(&(s)->sidtab_mtx) #else #define INIT_SIDTAB_LOCK(s) -#define SIDTAB_TRYLOCK(s) 0 +#define SIDTAB_TRYLOCK(s) 1 #define SIDTAB_LOCK(s) 0 #define SIDTAB_UNLOCK(s) #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 3 20: 3:18 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CA4837B405; Mon, 3 Feb 2003 20:03:16 -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 12D5F37B401 for ; Mon, 3 Feb 2003 20:03:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF2E343F79 for ; Mon, 3 Feb 2003 20:03:15 -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 h1443Fbv009461 for ; Mon, 3 Feb 2003 20:03:15 -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 h1443FRc009458 for perforce@freebsd.org; Mon, 3 Feb 2003 20:03:15 -0800 (PST) Date: Mon, 3 Feb 2003 20:03:15 -0800 (PST) Message-Id: <200302040403.h1443FRc009458@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 24633 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=24633 Change 24633 by rwatson@rwatson_tislabs on 2003/02/03 20:02:51 Magic no longer required for UFS1/2 in the boot loader. Affected files ... .. //depot/projects/trustedbsd/mac/sys/boot/i386/Makefile#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/boot/i386/Makefile#7 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/sys/boot/i386/Makefile,v 1.19 2002/12/31 02:29:03 obrien Exp $ -SUBDIR= mbr boot0 btx boot2 boot2-ufs1 cdboot kgzldr libi386 loader +SUBDIR= mbr boot0 btx boot2 cdboot kgzldr libi386 loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Feb 4 6:45:23 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F131B37B405; Tue, 4 Feb 2003 06:45: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 B5F8937B401 for ; Tue, 4 Feb 2003 06:45:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEF4C43F9B for ; Tue, 4 Feb 2003 06:45:20 -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 h14EjKbv040126 for ; Tue, 4 Feb 2003 06:45:20 -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 h14EjK0N040123 for perforce@freebsd.org; Tue, 4 Feb 2003 06:45:20 -0800 (PST) Date: Tue, 4 Feb 2003 06:45:20 -0800 (PST) Message-Id: <200302041445.h14EjK0N040123@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 24652 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=24652 Change 24652 by rwatson@rwatson_tislabs on 2003/02/04 06:45:02 Fix copy-and-paste-o on the comments in the relabeling code: we're checking the "new" label, not the "current" label in this check, unlike the prior check. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#195 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#154 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#195 (text+ko) ==== @@ -1449,7 +1449,7 @@ /* * To change the Biba range on a credential, the new - * range label must be in the current range. + * range label must be in the new range. */ if (new->mb_flags & MAC_BIBA_FLAG_RANGE && !mac_biba_range_in_range(new, subj)) ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#154 (text+ko) ==== @@ -1387,7 +1387,7 @@ /* * To change the MLS range label on a credential, the - * new range label must be in the current range. + * new range label must be in the new range. */ if (new->mm_flags & MAC_MLS_FLAG_RANGE && !mac_mls_range_in_range(new, subj)) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Feb 4 6:49:28 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A97D37B405; Tue, 4 Feb 2003 06:49:27 -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 9914537B401 for ; Tue, 4 Feb 2003 06:49:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4588943F43 for ; Tue, 4 Feb 2003 06:49:26 -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 h14EnQbv040211 for ; Tue, 4 Feb 2003 06:49:26 -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 h14EnP2r040208 for perforce@freebsd.org; Tue, 4 Feb 2003 06:49:25 -0800 (PST) Date: Tue, 4 Feb 2003 06:49:25 -0800 (PST) Message-Id: <200302041449.h14EnP2r040208@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 24653 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=24653 Change 24653 by rwatson@rwatson_tislabs on 2003/02/04 06:48:53 Propagate typo fix from mac_biba. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#53 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#53 (text+ko) ==== @@ -1665,7 +1665,7 @@ /* * To change the LOMAC range on a credential, the new - * range label must be in the current range. + * range label must be in the new range. */ if (new->ml_flags & MAC_LOMAC_FLAG_RANGE && !mac_lomac_range_in_range(new, subj)) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Feb 4 11:31:18 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2575F37B405; Tue, 4 Feb 2003 11:31: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 C662237B401 for ; Tue, 4 Feb 2003 11:31:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F00C43F9B for ; Tue, 4 Feb 2003 11:31:14 -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 h14JVEbv043013 for ; Tue, 4 Feb 2003 11:31:14 -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 h14JVD2D043002 for perforce@freebsd.org; Tue, 4 Feb 2003 11:31:13 -0800 (PST) Date: Tue, 4 Feb 2003 11:31:13 -0800 (PST) Message-Id: <200302041931.h14JVD2D043002@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 24664 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=24664 Change 24664 by rwatson@rwatson_tislabs on 2003/02/04 11:31:09 Add additional sanity checks regarding the setting of labels in Biba/MLS: if both single and range elements are set, make sure they are consistent. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#196 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#155 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#196 (text+ko) ==== @@ -1440,6 +1440,16 @@ */ if (new->mb_flags & MAC_BIBA_FLAGS_BOTH) { /* + * If the change request modifies both the Biba label + * single and range, check that the new single will be + * in the new range. + */ + if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) == + MAC_BIBA_FLAGS_BOTH && + !mac_biba_single_in_range(new, new)) + return (EINVAL); + + /* * To change the Biba single label on a credential, the * new single label must be in the current range. */ @@ -1449,7 +1459,7 @@ /* * To change the Biba range on a credential, the new - * range label must be in the new range. + * range label must be in the current range. */ if (new->mb_flags & MAC_BIBA_FLAG_RANGE && !mac_biba_range_in_range(new, subj)) @@ -1465,12 +1475,6 @@ if (error) return (error); } - - /* - * XXXMAC: Additional consistency tests regarding the - * single and range of the new label might be performed - * here. - */ } return (0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#155 (text+ko) ==== @@ -1378,6 +1378,16 @@ */ if (new->mm_flags & MAC_MLS_FLAGS_BOTH) { /* + * If the change request modifies both the MLS label single + * and range, check that the new single will be in the + * new range. + */ + if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) == + MAC_MLS_FLAGS_BOTH && + !mac_mls_single_in_range(new, new)) + return (EINVAL); + + /* * To change the MLS single label on a credential, the * new single label must be in the current range. */ @@ -1387,7 +1397,7 @@ /* * To change the MLS range label on a credential, the - * new range label must be in the new range. + * new range must be in the current range. */ if (new->mm_flags & MAC_MLS_FLAG_RANGE && !mac_mls_range_in_range(new, subj)) @@ -1403,11 +1413,6 @@ if (error) return (error); } - - /* - * XXXMAC: Additional consistency tests regarding the single - * and range of the new label might be performed here. - */ } return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Feb 4 13: 7:15 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0929837B405; Tue, 4 Feb 2003 13:07: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 92EF337B401 for ; Tue, 4 Feb 2003 13:07:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03DBF43F9B for ; Tue, 4 Feb 2003 13:07:11 -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 h14L7Bbv077417 for ; Tue, 4 Feb 2003 13:07:11 -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 h14L7BI8077414 for perforce@freebsd.org; Tue, 4 Feb 2003 13:07:11 -0800 (PST) Date: Tue, 4 Feb 2003 13:07:11 -0800 (PST) Message-Id: <200302042107.h14L7BI8077414@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 24668 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=24668 Change 24668 by rwatson@rwatson_tislabs on 2003/02/04 13:06:34 Mirror a similar fix in mac_biba: use 'type', not 'level' when parsing and generating MLS label types. This is probably left over from a simpler time. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#156 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#156 (text+ko) ==== @@ -1123,17 +1123,17 @@ mac_mls_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel) { struct mac_mls *dest; - int level; + int type; dest = SLOT(ifnetlabel); if (ifnet->if_type == IFT_LOOP) - level = MAC_MLS_TYPE_EQUAL; + type = MAC_MLS_TYPE_EQUAL; else - level = MAC_MLS_TYPE_LOW; + type = MAC_MLS_TYPE_LOW; - mac_mls_set_single(dest, level, 0, NULL); - mac_mls_set_range(dest, level, 0, NULL, level, 0, NULL); + mac_mls_set_single(dest, type, 0, NULL); + mac_mls_set_range(dest, type, 0, NULL, type, 0, NULL); } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Feb 4 18:24: 7 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3873137B408; Tue, 4 Feb 2003 18:24: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 8852537B406 for ; Tue, 4 Feb 2003 18:24:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33B9E43F3F for ; Tue, 4 Feb 2003 18:24:04 -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 h152O4bv095085 for ; Tue, 4 Feb 2003 18:24:04 -0800 (PST) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h152O3ew095081 for perforce@freebsd.org; Tue, 4 Feb 2003 18:24:03 -0800 (PST) Date: Tue, 4 Feb 2003 18:24:03 -0800 (PST) Message-Id: <200302050224.h152O3ew095081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 24677 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=24677 Change 24677 by chris@chris_holly on 2003/02/04 18:23:36 Make the sysctl MIBs for trusted_interfaces and trust_all_interfaces read/write. It can make sense in the case of USB interfaces or in the case of ppp(4) theoretically. In any case, it's consistent. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#197 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#197 (text+ko) ==== @@ -95,13 +95,14 @@ &destroyed_not_inited, 0, "Count of labels destroyed but not inited"); static int trust_all_interfaces = 0; -SYSCTL_INT(_security_mac_biba, OID_AUTO, trust_all_interfaces, CTLFLAG_RD, +SYSCTL_INT(_security_mac_biba, OID_AUTO, trust_all_interfaces, CTLFLAG_RW, &trust_all_interfaces, 0, "Consider all interfaces 'trusted' by MAC/Biba"); TUNABLE_INT("security.mac.biba.trust_all_interfaces", &trust_all_interfaces); static char trusted_interfaces[128]; -SYSCTL_STRING(_security_mac_biba, OID_AUTO, trusted_interfaces, CTLFLAG_RD, - trusted_interfaces, 0, "Interfaces considered 'trusted' by MAC/Biba"); +SYSCTL_STRING(_security_mac_biba, OID_AUTO, trusted_interfaces, CTLFLAG_RW, + trusted_interfaces, sizeof(trusted_interfaces), + "Interfaces considered 'trusted' by MAC/Biba"); TUNABLE_STR("security.mac.biba.trusted_interfaces", trusted_interfaces, sizeof(trusted_interfaces)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Feb 4 22:41:35 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2026D37B746; Tue, 4 Feb 2003 22:41:32 -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 6396F37B4E8 for ; Tue, 4 Feb 2003 22:41:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD49A43F43 for ; Tue, 4 Feb 2003 22:41:23 -0800 (PST) (envelope-from amigus@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 h156fNbv091280 for ; Tue, 4 Feb 2003 22:41:23 -0800 (PST) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h156fN3E091269 for perforce@freebsd.org; Tue, 4 Feb 2003 22:41:23 -0800 (PST) Date: Tue, 4 Feb 2003 22:41:23 -0800 (PST) Message-Id: <200302050641.h156fN3E091269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 24682 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=24682 Change 24682 by amigus@amigus_ludo on 2003/02/04 22:41:00 IFC (one minute too early last time). Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/OUTLINE.TrustedBSD#2 edit .. //depot/user/amigus/amigus_mac/sys/security/mac_biba/mac_biba.c#14 integrate Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/OUTLINE.TrustedBSD#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$P4: //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/OUTLINE.TrustedBSD#1 $ +$P4: //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/OUTLINE.TrustedBSD#2 $ This document outlines the Security Architecture (WIP). As time progresses and more of the document becomes written, each entry in the outline will @@ -21,9 +21,16 @@ 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.3 Security Models (introduce next section). +II. Security Models + 3. MAC + 4. DAC + 5. Implementations in UNIX + - DAC and MAC. + - Lots of references. + 2.3.4 Conflicts/Collisions (very brief) + - Mention further research required to + understand he implications/requirements. II. Kernel Security ("Kernel Security Model?") 3. Kernel Security Policy[footnote 1] 3.1. [UN] Regarding suser, the root user, etc. ==== //depot/user/amigus/amigus_mac/sys/security/mac_biba/mac_biba.c#14 (text+ko) ==== @@ -95,13 +95,14 @@ &destroyed_not_inited, 0, "Count of labels destroyed but not inited"); static int trust_all_interfaces = 0; -SYSCTL_INT(_security_mac_biba, OID_AUTO, trust_all_interfaces, CTLFLAG_RD, +SYSCTL_INT(_security_mac_biba, OID_AUTO, trust_all_interfaces, CTLFLAG_RW, &trust_all_interfaces, 0, "Consider all interfaces 'trusted' by MAC/Biba"); TUNABLE_INT("security.mac.biba.trust_all_interfaces", &trust_all_interfaces); static char trusted_interfaces[128]; -SYSCTL_STRING(_security_mac_biba, OID_AUTO, trusted_interfaces, CTLFLAG_RD, - trusted_interfaces, 0, "Interfaces considered 'trusted' by MAC/Biba"); +SYSCTL_STRING(_security_mac_biba, OID_AUTO, trusted_interfaces, CTLFLAG_RW, + trusted_interfaces, sizeof(trusted_interfaces), + "Interfaces considered 'trusted' by MAC/Biba"); TUNABLE_STR("security.mac.biba.trusted_interfaces", trusted_interfaces, sizeof(trusted_interfaces)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Feb 4 22:43:29 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A0F237B405; Tue, 4 Feb 2003 22:43:27 -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 228E637B401 for ; Tue, 4 Feb 2003 22:43:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C943143F9B for ; Tue, 4 Feb 2003 22:43:26 -0800 (PST) (envelope-from amigus@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 h156hQbv093047 for ; Tue, 4 Feb 2003 22:43:26 -0800 (PST) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h156hQN7093043 for perforce@freebsd.org; Tue, 4 Feb 2003 22:43:26 -0800 (PST) Date: Tue, 4 Feb 2003 22:43:26 -0800 (PST) Message-Id: <200302050643.h156hQN7093043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 24683 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=24683 Change 24683 by amigus@amigus_ludo on 2003/02/04 22:42:56 Undo unintentional change. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/OUTLINE.TrustedBSD#3 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/OUTLINE.TrustedBSD#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$P4: //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/OUTLINE.TrustedBSD#2 $ +$P4: //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/sec-arch/OUTLINE.TrustedBSD#3 $ This document outlines the Security Architecture (WIP). As time progresses and more of the document becomes written, each entry in the outline will @@ -21,16 +21,9 @@ 2. Security-Related Definitions 2.1. Security Policy 2.2. Subjects and Objects - 2.3 Security Models (introduce next section). -II. Security Models - 3. MAC - 4. DAC - 5. Implementations in UNIX - - DAC and MAC. - - Lots of references. - 2.3.4 Conflicts/Collisions (very brief) - - Mention further research required to - understand he implications/requirements. + 2.3. MAC + 2.4. DAC + 2.5. ... (more to come as they "come up") II. Kernel Security ("Kernel Security Model?") 3. Kernel Security Policy[footnote 1] 3.1. [UN] Regarding suser, the root user, etc. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Feb 6 21:45:36 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE6AB37B405; Thu, 6 Feb 2003 21:45: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 5203337B401 for ; Thu, 6 Feb 2003 21:45:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17B4F43F3F for ; Thu, 6 Feb 2003 21:45:10 -0800 (PST) (envelope-from marcel@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 h175jAbv017744 for ; Thu, 6 Feb 2003 21:45:10 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h175j7R0017741 for perforce@freebsd.org; Thu, 6 Feb 2003 21:45:07 -0800 (PST) Date: Thu, 6 Feb 2003 21:45:07 -0800 (PST) Message-Id: <200302070545.h175j7R0017741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 24763 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=24763 Change 24763 by marcel@marcel_nfs on 2003/02/06 21:45:05 IFC @24762 Affected files ... .. //depot/projects/ia64/MAINTAINERS#22 integrate .. //depot/projects/ia64/Makefile.inc1#44 integrate .. //depot/projects/ia64/bin/csh/USD.doc/Makefile#2 delete .. //depot/projects/ia64/bin/date/date.c#5 integrate .. //depot/projects/ia64/bin/date/netdate.c#5 integrate .. //depot/projects/ia64/bin/ps/fmt.c#7 integrate .. //depot/projects/ia64/bin/ps/keyword.c#11 integrate .. //depot/projects/ia64/bin/ps/nlist.c#6 integrate .. //depot/projects/ia64/bin/ps/print.c#11 integrate .. //depot/projects/ia64/bin/ps/ps.c#11 integrate .. //depot/projects/ia64/bin/rm/rm.1#5 integrate .. //depot/projects/ia64/bin/sh/bltin/echo.c#4 integrate .. //depot/projects/ia64/bin/sh/sh.1#19 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/cmds.c#4 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/ftpcmd.y#4 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/ftpd.c#5 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/popen.c#4 integrate .. //depot/projects/ia64/contrib/lukemftpd/src/version.h#4 integrate .. //depot/projects/ia64/crypto/openssh/auth2-pam-freebsd.c#8 integrate .. //depot/projects/ia64/crypto/openssh/sshd.8#8 integrate .. //depot/projects/ia64/crypto/openssh/version.h#9 integrate .. //depot/projects/ia64/etc/defaults/pccard.conf#17 integrate .. //depot/projects/ia64/etc/mtree/BSD.root.dist#4 integrate .. //depot/projects/ia64/etc/pam.d/sshd#9 integrate .. //depot/projects/ia64/etc/pam.d/su#5 integrate .. //depot/projects/ia64/etc/rc.devfs#5 integrate .. //depot/projects/ia64/etc/rc.firewall#3 integrate .. //depot/projects/ia64/etc/rc.firewall6#3 integrate .. //depot/projects/ia64/lib/libc/compat-43/sigvec.2#4 integrate .. //depot/projects/ia64/lib/libc/db/man/mpool.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/glob.3#4 integrate .. //depot/projects/ia64/lib/libc/locale/mbrune.3#6 integrate .. //depot/projects/ia64/lib/libc/locale/multibyte.3#7 integrate .. //depot/projects/ia64/lib/libc/net/gethostbyname.3#5 integrate .. //depot/projects/ia64/lib/libc/net/nsdispatch.3#4 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl.3#5 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_get.3#4 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_set.3#4 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_soc.3#6 integrate .. //depot/projects/ia64/lib/libc/stdio/tmpfile.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/rand.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/random.c#3 integrate .. //depot/projects/ia64/lib/libc/sys/clock_gettime.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/fcntl.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/nfssvc.2#4 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_attr.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_attr_get_np.3#5 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_cancel.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_cleanup_pop.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_cleanup_push.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_cond_broadcast.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_cond_destroy.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_cond_init.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_cond_signal.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_cond_timedwait.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_cond_wait.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_attr_get_np.c#3 integrate .. //depot/projects/ia64/lib/libdisk/create_chunk.c#12 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.h#13 integrate .. //depot/projects/ia64/lib/libdisk/write_alpha_disk.c#5 integrate .. //depot/projects/ia64/lib/libdisk/write_disk.c#7 integrate .. //depot/projects/ia64/lib/libdisk/write_i386_disk.c#4 integrate .. //depot/projects/ia64/lib/libdisk/write_ia64_disk.c#8 integrate .. //depot/projects/ia64/lib/libdisk/write_pc98_disk.c#6 integrate .. //depot/projects/ia64/lib/libedit/editline.3#3 integrate .. //depot/projects/ia64/lib/libipsec/ipsec_set_policy.3#5 integrate .. //depot/projects/ia64/lib/libipsec/ipsec_strerror.3#3 integrate .. //depot/projects/ia64/lib/libpam/modules/modules.inc#12 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_echo/pam_echo.8#2 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_echo/pam_echo.c#2 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_exec/pam_exec.8#2 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_exec/pam_exec.c#2 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_group/Makefile#1 branch .. //depot/projects/ia64/lib/libpam/modules/pam_group/pam_group.8#1 branch .. //depot/projects/ia64/lib/libpam/modules/pam_group/pam_group.c#1 branch .. //depot/projects/ia64/lib/libpam/modules/pam_kerberosIV/Makefile#5 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.8#1 branch .. //depot/projects/ia64/lib/libpam/modules/pam_krb5/pam_krb5.c#10 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_wheel/pam_wheel.c#7 integrate .. //depot/projects/ia64/libexec/bootpd/bootpd.c#4 integrate .. //depot/projects/ia64/libexec/bootpd/bootpgw/bootpgw.c#3 integrate .. //depot/projects/ia64/libexec/bootpd/rtmsg.c#3 integrate .. //depot/projects/ia64/libexec/bootpd/tools/bootptest/bootptest.c#2 integrate .. //depot/projects/ia64/libexec/ftpd/ftpcmd.y#14 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#19 integrate .. //depot/projects/ia64/libexec/lukemftpd/Makefile#10 integrate .. //depot/projects/ia64/libexec/lukemftpd/pamize.h#1 branch .. //depot/projects/ia64/release/Makefile#38 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#9 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#65 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#7 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#16 integrate .. //depot/projects/ia64/release/i386/drivers.conf#13 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#17 integrate .. //depot/projects/ia64/sbin/mount_nullfs/mount_nullfs.8#6 integrate .. //depot/projects/ia64/sbin/natd/natd.c#5 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#25 integrate .. //depot/projects/ia64/share/man/man4/firewire.4#4 integrate .. //depot/projects/ia64/share/man/man4/sbp.4#4 integrate .. //depot/projects/ia64/share/man/man4/vinum.4#10 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#28 integrate .. //depot/projects/ia64/share/man/man7/hier.7#17 integrate .. //depot/projects/ia64/share/man/man9/malloc.9#7 integrate .. //depot/projects/ia64/share/man/man9/namei.9#4 integrate .. //depot/projects/ia64/share/man/man9/sleep.9#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#7 integrate .. //depot/projects/ia64/sys/alpha/alpha/clock.c#7 integrate .. //depot/projects/ia64/sys/alpha/alpha/interrupt.c#11 integrate .. //depot/projects/ia64/sys/alpha/linux/linux.h#2 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#13 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#11 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_targ_bh.c#4 integrate .. //depot/projects/ia64/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_stream.c#12 integrate .. //depot/projects/ia64/sys/conf/NOTES#36 integrate .. //depot/projects/ia64/sys/conf/files#60 integrate .. //depot/projects/ia64/sys/conf/files.pc98#22 integrate .. //depot/projects/ia64/sys/conf/files.powerpc#14 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#20 integrate .. //depot/projects/ia64/sys/conf/options#42 integrate .. //depot/projects/ia64/sys/conf/options.powerpc#5 integrate .. //depot/projects/ia64/sys/contrib/dev/oltr/if_oltr.c#4 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_proxy.c#9 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#15 integrate .. //depot/projects/ia64/sys/dev/aac/aac_cam.c#5 integrate .. //depot/projects/ia64/sys/dev/aac/aac_cam.h#2 delete .. //depot/projects/ia64/sys/dev/aac/aacvar.h#10 integrate .. //depot/projects/ia64/sys/dev/advansys/advlib.c#2 integrate .. //depot/projects/ia64/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/ia64/sys/dev/aha/aha.c#5 integrate .. //depot/projects/ia64/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#17 integrate .. //depot/projects/ia64/sys/dev/an/if_an_pci.c#5 integrate .. //depot/projects/ia64/sys/dev/an/if_anreg.h#6 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#21 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#12 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_audio.c#2 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_card.c#3 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_card.h#3 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt.c#5 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#11 integrate .. //depot/projects/ia64/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/ia64/sys/dev/ciss/cissvar.h#5 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#16 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#9 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#9 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.c#6 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.h#3 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#14 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#8 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#14 integrate .. //depot/projects/ia64/sys/dev/hifn/hifn7751.c#6 integrate .. //depot/projects/ia64/sys/dev/kbd/atkbd.c#4 integrate .. //depot/projects/ia64/sys/dev/mly/mly.c#8 integrate .. //depot/projects/ia64/sys/dev/mly/mlyvar.h#3 integrate .. //depot/projects/ia64/sys/dev/random/harvest.c#4 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#34 integrate .. //depot/projects/ia64/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#10 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/buffer.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/channel.c#8 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder_rate.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/vchan.c#6 integrate .. //depot/projects/ia64/sys/dev/sym/sym_hipd.c#9 integrate .. //depot/projects/ia64/sys/dev/syscons/rain/rain_saver.c#4 integrate .. //depot/projects/ia64/sys/dev/twe/twe_freebsd.c#8 integrate .. //depot/projects/ia64/sys/dev/usb/umass.c#19 integrate .. //depot/projects/ia64/sys/dev/vinum/vinum.c#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumhdr.h#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#10 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_conv.c#4 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_subr.c#4 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_subr.c#3 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#12 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#21 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#15 integrate .. //depot/projects/ia64/sys/geom/geom_vol_ffs.c#1 branch .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#8 integrate .. //depot/projects/ia64/sys/i386/i386/critical.c#5 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#16 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#32 integrate .. //depot/projects/ia64/sys/i386/i386/tsc.c#1 branch .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_xenix.c#6 integrate .. //depot/projects/ia64/sys/i386/include/clock.h#4 integrate .. //depot/projects/ia64/sys/i386/include/cpu.h#4 integrate .. //depot/projects/ia64/sys/i386/include/smp.h#7 integrate .. //depot/projects/ia64/sys/i386/isa/apic_vector.s#6 integrate .. //depot/projects/ia64/sys/i386/isa/clock.c#12 integrate .. //depot/projects/ia64/sys/i386/isa/gpib.c#6 integrate .. //depot/projects/ia64/sys/i386/isa/gsc.c#3 integrate .. //depot/projects/ia64/sys/i386/isa/tw.c#4 integrate .. //depot/projects/ia64/sys/i386/linux/linux.h#4 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_isppp.c#9 integrate .. //depot/projects/ia64/sys/ia64/ia64/busdma_machdep.c#6 integrate .. //depot/projects/ia64/sys/ia64/ia64/clock.c#15 integrate .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#27 integrate .. //depot/projects/ia64/sys/ia64/ia64/sscdisk.c#8 integrate .. //depot/projects/ia64/sys/isa/isareg.h#2 integrate .. //depot/projects/ia64/sys/kern/init_main.c#26 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_conf.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_time.c#16 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#4 integrate .. //depot/projects/ia64/sys/kern/subr_clock.c#3 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#20 integrate .. //depot/projects/ia64/sys/kern/uipc_socket2.c#21 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#25 integrate .. //depot/projects/ia64/sys/kern/uipc_usrreq.c#21 integrate .. //depot/projects/ia64/sys/libkern/random.c#2 integrate .. //depot/projects/ia64/sys/modules/Makefile#37 integrate .. //depot/projects/ia64/sys/modules/canbepm/Makefile#1 branch .. //depot/projects/ia64/sys/modules/canbus/Makefile#1 branch .. //depot/projects/ia64/sys/modules/linux/Makefile#7 integrate .. //depot/projects/ia64/sys/modules/netgraph/mppc/Makefile#3 integrate .. //depot/projects/ia64/sys/net/if_ppp.c#11 integrate .. //depot/projects/ia64/sys/net/zlib.c#7 integrate .. //depot/projects/ia64/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/ia64/sys/netgraph/ng_mppc.c#6 integrate .. //depot/projects/ia64/sys/netinet/if_ether.c#15 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#32 integrate .. //depot/projects/ia64/sys/netinet6/nd6.c#8 integrate .. //depot/projects/ia64/sys/netipsec/key.c#4 integrate .. //depot/projects/ia64/sys/netkey/key.c#10 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#27 integrate .. //depot/projects/ia64/sys/pc98/pc98/canbepm.c#1 branch .. //depot/projects/ia64/sys/pc98/pc98/canbus.c#1 branch .. //depot/projects/ia64/sys/pc98/pc98/canbus.h#1 branch .. //depot/projects/ia64/sys/pc98/pc98/canbus_if.m#1 branch .. //depot/projects/ia64/sys/pc98/pc98/canbusvars.h#1 branch .. //depot/projects/ia64/sys/pc98/pc98/clock.c#11 integrate .. //depot/projects/ia64/sys/pccard/pccard.c#13 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#24 integrate .. //depot/projects/ia64/sys/pci/if_pcn.c#9 integrate .. //depot/projects/ia64/sys/powerpc/conf/GENERIC#16 integrate .. //depot/projects/ia64/sys/powerpc/include/cpufunc.h#9 integrate .. //depot/projects/ia64/sys/powerpc/include/fpu.h#3 integrate .. //depot/projects/ia64/sys/powerpc/include/hid.h#1 branch .. //depot/projects/ia64/sys/powerpc/include/md_var.h#5 integrate .. //depot/projects/ia64/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/ia64/sys/powerpc/powermac/macio.c#5 integrate .. //depot/projects/ia64/sys/powerpc/powermac/pswitch.c#1 branch .. //depot/projects/ia64/sys/powerpc/powerpc/busdma_machdep.c#5 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/clock.c#8 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/cpu.c#1 branch .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#21 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#12 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#11 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/bus_machdep.c#10 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/clock.c#6 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/tick.c#8 integrate .. //depot/projects/ia64/sys/sys/bio.h#13 integrate .. //depot/projects/ia64/sys/sys/buf.h#15 integrate .. //depot/projects/ia64/sys/sys/conf.h#15 integrate .. //depot/projects/ia64/sys/sys/disk.h#9 integrate .. //depot/projects/ia64/sys/sys/event.h#7 integrate .. //depot/projects/ia64/sys/sys/kernel.h#11 integrate .. //depot/projects/ia64/sys/sys/lockmgr.h#9 integrate .. //depot/projects/ia64/sys/sys/param.h#23 integrate .. //depot/projects/ia64/sys/sys/syscallsubr.h#4 integrate .. //depot/projects/ia64/sys/sys/systm.h#24 integrate .. //depot/projects/ia64/sys/sys/unpcb.h#4 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#13 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#33 integrate .. //depot/projects/ia64/tools/regression/lib/libc/gen/Makefile#2 integrate .. //depot/projects/ia64/tools/regression/lib/libc/gen/test-fpclassify.c#1 branch .. //depot/projects/ia64/usr.bin/elfdump/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/elfdump/elfdump.1#1 branch .. //depot/projects/ia64/usr.bin/elfdump/elfdump.c#3 integrate .. //depot/projects/ia64/usr.bin/gprof/PSD.doc/Makefile#2 delete .. //depot/projects/ia64/usr.bin/ipcrm/ipcrm.1#3 integrate .. //depot/projects/ia64/usr.bin/killall/killall.c#6 integrate .. //depot/projects/ia64/usr.bin/ktrace/ktrace.c#6 integrate .. //depot/projects/ia64/usr.bin/ktrace/subr.c#5 integrate .. //depot/projects/ia64/usr.bin/mail/USD.doc/Makefile#2 delete .. //depot/projects/ia64/usr.bin/make/PSD.doc/Makefile#2 delete .. //depot/projects/ia64/usr.bin/msgs/msgs.c#7 integrate .. //depot/projects/ia64/usr.bin/su/su.c#9 integrate .. //depot/projects/ia64/usr.bin/yacc/skeleton.c#5 integrate .. //depot/projects/ia64/usr.sbin/Makefile#31 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.8#9 integrate .. //depot/projects/ia64/usr.sbin/btxld/a.out.h#1 branch .. //depot/projects/ia64/usr.sbin/btxld/btxld.c#3 integrate .. //depot/projects/ia64/usr.sbin/daemon/daemon.8#2 integrate .. //depot/projects/ia64/usr.sbin/kgzip/elfhdr.h#2 integrate .. //depot/projects/ia64/usr.sbin/kgzip/kgzcmp.c#2 integrate .. //depot/projects/ia64/usr.sbin/mergemaster/mergemaster.8#7 integrate .. //depot/projects/ia64/usr.sbin/mergemaster/mergemaster.sh#12 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/sign/x509.c#3 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/config.c#10 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#25 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#22 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.56 2003/01/30 17:39:26 gordon Exp $ +$FreeBSD: src/MAINTAINERS,v 1.57 2003/02/04 06:29:03 phk Exp $ subsystem login notes ----------------------------- @@ -26,13 +26,6 @@ cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. -geom phk Pre-commit review requested. -specinfo/dev_t phk Pre-commit review requested. -struct disk phk Pre-commit review requested. -specfs phk Pre-commit review requested. -devfs phk Pre-commit review requested. -timekeeping phk Pre-commit review requested. -md(4) phk Pre-commit review requested. aac scottl Pre-commit review requested udf scottl Pre-commit review with myself or asmodai requested. powerpc benno Pre-commit review preferred. ==== //depot/projects/ia64/Makefile.inc1#44 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.314 2002/12/30 10:01:25 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.315 2003/02/04 08:15:30 phk Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -253,6 +253,14 @@ # success, regardless of how old your existing system is. # _worldtmp: +.if ${.CURDIR:C/[^,]//g} != "" +# The m4 build of sendmail files doesn't like it if ',' is used +# anywhere in the path of it's files. + @echo + @echo "*** Error: path to source tree contains a comma ','" + @echo + @false +.endif @echo @echo "--------------------------------------------------------------" @echo ">>> Rebuilding the temporary build tree" ==== //depot/projects/ia64/bin/date/date.c#5 (text+ko) ==== @@ -37,13 +37,14 @@ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ +#if 0 #ifndef lint -#if 0 static char sccsid[] = "@(#)date.c 8.2 (Berkeley) 4/28/95"; +#endif /* not lint */ #endif -#endif /* not lint */ + #include -__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.42 2002/10/18 14:48:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.43 2003/02/05 12:56:40 charnier Exp $"); #include #include ==== //depot/projects/ia64/bin/date/netdate.c#5 (text+ko) ==== @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static char sccsid[] = "@(#)netdate.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ + #include -__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.16 2002/06/30 05:13:52 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.17 2003/02/05 12:56:40 charnier Exp $"); #include #include @@ -81,7 +82,7 @@ char hostname[MAXHOSTNAMELEN]; if ((sp = getservbyname("timed", "udp")) == NULL) { - warnx("udp/timed: unknown service"); + warnx("timed/udp: unknown service"); return (retval = 2); } ==== //depot/projects/ia64/bin/ps/fmt.c#7 (text+ko) ==== @@ -36,8 +36,9 @@ static char sccsid[] = "@(#)fmt.c 8.4 (Berkeley) 4/15/94"; #endif #endif + #include -__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.26 2002/07/05 15:58:26 mike Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.27 2003/02/05 13:18:17 charnier Exp $"); #include #include ==== //depot/projects/ia64/bin/ps/keyword.c#11 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.60 2003/01/19 00:31:15 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.62 2003/02/05 19:22:39 sobomax Exp $"); #include #include @@ -67,6 +67,7 @@ #define PIDLEN 5 #define USERLEN (MAXLOGNAME - 1) +/* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */ static VAR var[] = { {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4, 0, CHAR, NULL, 0}, {"%mem", "%MEM", NULL, 0, pmem, NULL, 4, 0, CHAR, NULL, 0}, @@ -84,7 +85,7 @@ {"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d", 0}, {"cputime", "", "time", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, - {"etime", "ELAPSED", NULL, USER, elapsed, NULL, 9, 0, CHAR, NULL, 0}, + {"etime", "ELAPSED", NULL, USER, elapsed, NULL, 12, 0, CHAR, NULL, 0}, {"f", "F", NULL, 0, kvar, NULL, 7, KOFF(ki_flag), INT, "x", 0}, {"flags", "", "f", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"ignored", "", "sigignore", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, @@ -98,6 +99,8 @@ {"label", "LABEL", NULL, LJUST|DSIZ, label, s_label, SHRT_MAX, 0, CHAR, NULL, 0}, {"lim", "LIM", NULL, 0, maxrss, NULL, 5, 0, CHAR, NULL, 0}, + {"lockname", "LOCK", NULL, LJUST, lockname, NULL, 6, 0, CHAR, NULL, + 0}, {"login", "LOGIN", NULL, LJUST, logname, NULL, MAXLOGNAME-1, 0, CHAR, NULL, 0}, {"logname", "", "login", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, @@ -111,8 +114,6 @@ LONG, "ld", 0}, {"msgsnd", "MSGSND", NULL, USER, rvar, NULL, 4, ROFF(ru_msgsnd), LONG, "ld", 0}, - {"lockname", "LOCK", NULL, LJUST, lockname, NULL, 6, 0, CHAR, NULL, - 0}, {"mwchan", "MWCHAN", NULL, LJUST, mwchan, NULL, 6, 0, CHAR, NULL, 0}, {"ni", "", "nice", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"nice", "NI", NULL, 0, kvar, NULL, 2, KOFF(ki_nice), CHAR, "d", ==== //depot/projects/ia64/bin/ps/nlist.c#6 (text+ko) ==== @@ -36,8 +36,9 @@ static char sccsid[] = "@(#)nlist.c 8.4 (Berkeley) 4/2/94"; #endif /* not lint */ #endif + #include -__FBSDID("$FreeBSD: src/bin/ps/nlist.c,v 1.19 2002/11/01 23:26:20 tmm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/nlist.c,v 1.20 2003/02/05 13:18:17 charnier Exp $"); #include #include ==== //depot/projects/ia64/bin/ps/print.c#11 (text+ko) ==== @@ -36,8 +36,9 @@ static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #endif /* not lint */ #endif + #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.78 2003/01/19 00:31:16 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.79 2003/02/05 13:18:17 charnier Exp $"); #include #include @@ -539,14 +540,30 @@ elapsed(KINFO *k, VARENT *ve) { VAR *v; - time_t secs; + time_t days, hours, mins, secs; char obuff[128]; v = ve->var; secs = now - k->ki_p->ki_start.tv_sec; - (void)snprintf(obuff, sizeof(obuff), "%3ld:%02ld", (long)secs/60, - (long)secs%60); + days = secs/(24*60*60); + secs %= (24*60*60); + hours = secs/(60*60); + secs %= (60*60); + mins = secs/60; + secs %= 60; + if (days != 0) { + (void)snprintf(obuff, sizeof(obuff), "%3ld-%02ld:%02ld:%02ld", + (long)days, (long)hours, (long)mins, (long)secs); + } + else if (hours != 0) { + (void)snprintf(obuff, sizeof(obuff), "%02ld:%02ld:%02ld", + (long)hours, (long)mins, (long)secs); + } + else { + (void)snprintf(obuff, sizeof(obuff), "%02ld:%02ld", + (long)mins, (long)secs); + } (void)printf("%*s", v->width, obuff); } ==== //depot/projects/ia64/bin/ps/ps.c#11 (text+ko) ==== @@ -42,8 +42,9 @@ static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94"; #endif /* not lint */ #endif + #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.61 2003/01/19 00:31:16 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.62 2003/02/05 13:18:17 charnier Exp $"); #include #include ==== //depot/projects/ia64/bin/rm/rm.1#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.26 2002/08/21 17:32:42 trhodes Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.27 2003/02/04 20:38:51 trhodes Exp $ .\" .Dd January 28, 1999 .Dt RM 1 @@ -158,6 +158,7 @@ .Dl rm /home/user/-filename .Dl rm ./-filename .Sh SEE ALSO +.Xr chflags 1 , .Xr rmdir 1 , .Xr undelete 2 , .Xr unlink 2 , ==== //depot/projects/ia64/bin/sh/bltin/echo.c#4 (text+ko) ==== @@ -34,9 +34,11 @@ * SUCH DAMAGE. * * @(#)echo.c 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/bltin/echo.c,v 1.12 2002/12/22 21:35:14 dwmalone Exp $ */ +#include +__FBSDID("$FreeBSD: src/bin/sh/bltin/echo.c,v 1.13 2003/02/05 13:23:46 charnier Exp $"); + /* * Echo command. */ ==== //depot/projects/ia64/bin/sh/sh.1#19 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.83 2002/12/24 13:41:45 ru Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.84 2003/02/03 23:03:05 fanf Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -1076,10 +1076,12 @@ or null, null is substituted; otherwise, the expansion of word is substituted. +.El .Pp In the parameter expansions shown previously, use of the colon in the format results in a test for a parameter that is unset or null; omission of the colon results in a test for a parameter that is only unset. +.Bl -tag -width indent .It Li ${#parameter} String Length. The length in characters of the value of parameter. ==== //depot/projects/ia64/contrib/lukemftpd/src/cmds.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: cmds.c,v 1.18 2002/10/12 08:35:16 darrenr Exp $ */ +/* $NetBSD: cmds.c,v 1.20 2003/01/08 18:07:31 manu Exp $ */ /* * Copyright (c) 1999-2001 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ #include #ifndef lint -__RCSID("$NetBSD: cmds.c,v 1.18 2002/10/12 08:35:16 darrenr Exp $"); +__RCSID("$NetBSD: cmds.c,v 1.20 2003/01/08 18:07:31 manu Exp $"); #endif /* not lint */ #include @@ -171,6 +171,8 @@ #define FACTTABSIZE (sizeof(facttab) / sizeof(struct ftpfact)) +static char cached_path[MAXPATHLEN + 1] = "/"; +static void discover_path(char *, const char *); void cwd(const char *path) @@ -181,6 +183,9 @@ else { show_chdir_messages(250); ack("CWD"); + if (getcwd(cached_path, MAXPATHLEN) == NULL) { + discover_path(cached_path, path); + } } } @@ -404,11 +409,15 @@ { char path[MAXPATHLEN]; - if (getcwd(path, sizeof(path) - 1) == NULL) - reply(550, "Can't get the current directory: %s.", - strerror(errno)); - else - replydirname(path, "is the current directory."); + if (getcwd(path, sizeof(path) - 1) == NULL) { + if (chdir(cached_path) < 0) { + reply(550, "Can't get the current directory: %s.", + strerror(errno)); + return; + } + (void)strlcpy(path, cached_path, MAXPATHLEN); + } + replydirname(path, "is the current directory."); } void @@ -844,3 +853,126 @@ *p = '\0'; reply(257, "\"%s\" %s", npath, message); } + +static void +discover_path(last_path, new_path) + char *last_path; + const char *new_path; +{ + char tp[MAXPATHLEN + 1] = ""; + char tq[MAXPATHLEN + 1] = ""; + char *cp; + char *cq; + int sz1, sz2; + int nomorelink; + struct stat st1, st2; + + if (new_path[0] != '/') { + (void)strlcpy(tp, last_path, MAXPATHLEN); + (void)strlcat(tp, "/", MAXPATHLEN); + } + (void)strlcat(tp, new_path, MAXPATHLEN); + (void)strlcat(tp, "/", MAXPATHLEN); + + /* + * resolve symlinks. A symlink may introduce another symlink, so we + * loop trying to resolve symlinks until we don't find any of them. + */ + do { + /* Collapse any // into / */ + while ((cp = strstr(tp, "//")) != NULL) + (void)memmove(cp, cp + 1, strlen(cp) - 1 + 1); + + /* Collapse any /./ into / */ + while ((cp = strstr(tp, "/./")) != NULL) + (void)memmove(cp, cp + 2, strlen(cp) - 2 + 1); + + cp = tp; + nomorelink = 1; + + while ((cp = strstr(++cp, "/")) != NULL) { + sz1 = (u_long)cp - (u_long)tp; + if (sz1 > MAXPATHLEN) + goto bad; + *cp = 0; + sz2 = readlink(tp, tq, MAXPATHLEN); + *cp = '/'; + + /* If this is not a symlink, move to next / */ + if (sz2 <= 0) + continue; + + /* + * We found a symlink, so we will have to + * do one more pass to check there is no + * more symlink in the path + */ + nomorelink = 0; + + /* + * Null terminate the string and remove trailing / + */ + tq[sz2] = 0; + sz2 = strlen(tq); + if (tq[sz2 - 1] == '/') + tq[--sz2] = 0; + + /* + * Is this an absolute link or a relative link? + */ + if (tq[0] == '/') { + /* absolute link */ + if (strlen(cp) + sz2 > MAXPATHLEN) + goto bad; + memmove(tp + sz2, cp, strlen(cp) + 1); + memcpy(tp, tq, sz2); + } else { + /* relative link */ + for (cq = cp - 1; *cq != '/'; cq--); + if (strlen(tp) - ((u_long)cq - (u_long)cp) + + 1 + sz2 > MAXPATHLEN) + goto bad; + (void)memmove(cq + 1 + sz2, + cp, strlen(cp) + 1); + (void)memcpy(cq + 1, tq, sz2); + } + + /* + * start over, looking for new symlinks + */ + break; + } + } while (nomorelink == 0); + + /* Collapse any /foo/../ into /foo/ */ + while ((cp = strstr(tp, "/../")) != NULL) { + /* ^/../foo/ becomes ^/foo/ */ + if (cp == tp) { + (void)memmove(cp, cp + 3, + strlen(cp) - 3 + 1); + } else { + for (cq = cp - 1; *cq != '/'; cq--); + (void)memmove(cq, cp + 3, + strlen(cp) - 3 + 1); + } + } + + /* strip strailing / */ + if (strlen(tp) != 1) + tp[strlen(tp) - 1] = '\0'; + + /* check that the path is correct */ + stat(tp, &st1); + stat(".", &st2); + if ((st1.st_dev != st2.st_dev) || (st1.st_ino != st2.st_ino)) + goto bad; + + (void)strlcpy(last_path, tp, MAXPATHLEN); + return; + +bad: + (void)strlcat(last_path, "/", MAXPATHLEN); + (void)strlcat(last_path, new_path, MAXPATHLEN); + return; +} + ==== //depot/projects/ia64/contrib/lukemftpd/src/ftpcmd.y#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: ftpcmd.y,v 1.71 2002/10/12 08:35:17 darrenr Exp $ */ +/* $NetBSD: ftpcmd.y,v 1.73 2003/01/22 04:33:35 lukem Exp $ */ /*- * Copyright (c) 1997-2002 The NetBSD Foundation, Inc. @@ -83,7 +83,7 @@ #if 0 static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #else -__RCSID("$NetBSD: ftpcmd.y,v 1.71 2002/10/12 08:35:17 darrenr Exp $"); +__RCSID("$NetBSD: ftpcmd.y,v 1.73 2003/01/22 04:33:35 lukem Exp $"); #endif #endif /* not lint */ @@ -1222,7 +1222,7 @@ { "SMNT", SMNT, ARGS, 0, "(structure mount)" }, { "QUIT", QUIT, NOARGS, 1, "(terminate service)" }, { "REIN", REIN, NOARGS, 0, "(reinitialize server state)" }, - { "PORT", PORT, ARGS, 1, " b0, b1, b2, b3, b4" }, + { "PORT", PORT, ARGS, 1, " b0, b1, b2, b3, b4, b5" }, { "LPRT", LPRT, ARGS, 1, " af, hal, h1, h2, h3,..., pal, p1, p2..." }, { "EPRT", EPRT, STR1, 1, " |af|addr|port|" }, { "PASV", PASV, NOARGS, 1, "(set server in passive mode)" }, ==== //depot/projects/ia64/contrib/lukemftpd/src/ftpd.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: ftpd.c,v 1.147 2002/11/29 14:40:00 lukem Exp $ */ +/* $NetBSD: ftpd.c,v 1.150 2003/01/22 04:46:08 lukem Exp $ */ /* * Copyright (c) 1997-2001 The NetBSD Foundation, Inc. @@ -109,10 +109,10 @@ #if 0 static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: ftpd.c,v 1.147 2002/11/29 14:40:00 lukem Exp $"); +__RCSID("$NetBSD: ftpd.c,v 1.150 2003/01/22 04:46:08 lukem Exp $"); #endif #endif /* not lint */ -__FBSDID("$FreeBSD: src/contrib/lukemftpd/src/ftpd.c,v 1.2 2003/01/07 17:31:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/contrib/lukemftpd/src/ftpd.c,v 1.3 2003/02/02 21:03:28 obrien Exp $"); /* * FTP server. @@ -686,8 +686,7 @@ } else pw = sgetpwnam(name); - if (logging) - strlcpy(curname, name, sizeof(curname)); + strlcpy(curname, name, sizeof(curname)); /* check user in /etc/ftpusers, and setup class */ permitted = checkuser(_PATH_FTPUSERS, curname, 1, 0, &class); @@ -1650,7 +1649,7 @@ { char sizebuf[32]; FILE *file; - int retry = 0, tos, keepalive; + int retry, tos, keepalive, conerrno; file_size = size; byte_count = 0; @@ -1704,30 +1703,38 @@ if (usedefault) data_dest = his_addr; usedefault = 1; - file = getdatasock(fmode); - if (file == NULL) { - char hbuf[NI_MAXHOST]; - char pbuf[NI_MAXSERV]; + retry = conerrno = 0; + do { + file = getdatasock(fmode); + if (file == NULL) { + char hbuf[NI_MAXHOST]; + char pbuf[NI_MAXSERV]; - if (getnameinfo((struct sockaddr *)&data_source.si_su, - data_source.su_len, hbuf, sizeof(hbuf), pbuf, sizeof(pbuf), - NI_NUMERICHOST | NI_NUMERICSERV)) - strlcpy(hbuf, "?", sizeof(hbuf)); - reply(425, "Can't create data socket (%s,%s): %s.", - hbuf, pbuf, strerror(errno)); - return (NULL); - } - data = fileno(file); - while (connect(data, (struct sockaddr *)&data_dest.si_su, - data_dest.su_len) < 0) { - if (errno == EADDRINUSE && retry < swaitmax) { + if (getnameinfo((struct sockaddr *)&data_source.si_su, + data_source.su_len, hbuf, sizeof(hbuf), pbuf, + sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV)) + strlcpy(hbuf, "?", sizeof(hbuf)); + reply(425, "Can't create data socket (%s,%s): %s.", + hbuf, pbuf, strerror(errno)); + return (NULL); + } + data = fileno(file); + conerrno = 0; + if (connect(data, (struct sockaddr *)&data_dest.si_su, + data_dest.su_len) == 0) + break; + conerrno = errno; + (void) fclose(file); + data = -1; + if (conerrno == EADDRINUSE) { sleep((unsigned) swaitint); retry += swaitint; - continue; + } else { + break; } + } while (retry <= swaitmax); + if (conerrno != 0) { perror_reply(425, "Can't build data connection"); - (void) fclose(file); - data = -1; return (NULL); } reply(150, "Opening %s mode data connection for '%s'%s.", ==== //depot/projects/ia64/contrib/lukemftpd/src/popen.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: popen.c,v 1.26 2001/04/25 01:46:26 lukem Exp $ */ +/* $NetBSD: popen.c,v 1.28 2003/01/16 09:41:38 kleink Exp $ */ /*- * Copyright (c) 1999-2001 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ #if 0 static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94"; #else -__RCSID("$NetBSD: popen.c,v 1.26 2001/04/25 01:46:26 lukem Exp $"); +__RCSID("$NetBSD: popen.c,v 1.28 2003/01/16 09:41:38 kleink Exp $"); #endif #endif /* not lint */ @@ -229,7 +229,7 @@ { int fdes, status; pid_t pid; - sigset_t sigset, osigset; + sigset_t nsigset, osigset; /* * pclose returns -1 if stream is not associated with a @@ -238,11 +238,11 @@ if (pids == 0 || pids[fdes = fileno(iop)] == 0) return (-1); (void)fclose(iop); - sigemptyset(&sigset); - sigaddset(&sigset, SIGINT); - sigaddset(&sigset, SIGQUIT); - sigaddset(&sigset, SIGHUP); - sigprocmask(SIG_BLOCK, &sigset, &osigset); + sigemptyset(&nsigset); + sigaddset(&nsigset, SIGINT); + sigaddset(&nsigset, SIGQUIT); + sigaddset(&nsigset, SIGHUP); + sigprocmask(SIG_BLOCK, &nsigset, &osigset); while ((pid = waitpid(pids[fdes], &status, 0)) < 0 && errno == EINTR) continue; sigprocmask(SIG_SETMASK, &osigset, NULL); ==== //depot/projects/ia64/contrib/lukemftpd/src/version.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.48 2002/10/26 04:19:56 lukem Exp $ */ +/* $NetBSD: version.h,v 1.50 2003/01/22 04:46:08 lukem Exp $ */ /*- * Copyright (c) 1999-2002 The NetBSD Foundation, Inc. * All rights reserved. @@ -36,5 +36,5 @@ */ #ifndef FTPD_VERSION -#define FTPD_VERSION "NetBSD-ftpd 20021130" +#define FTPD_VERSION "NetBSD-ftpd 20030122" #endif ==== //depot/projects/ia64/crypto/openssh/auth2-pam-freebsd.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include "includes.h" -RCSID("$FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.8 2002/12/21 15:09:58 des Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.9 2003/02/03 14:10:28 des Exp $"); #ifdef USE_PAM #include @@ -242,6 +242,7 @@ 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; @@ -257,7 +258,7 @@ pam_handle = NULL; } debug("PAM: initializing for \"%s\"", user); - pam_err = pam_start("sshd", user, NULL, &pam_handle); + pam_err = pam_start("sshd", user, &no_conv, &pam_handle); if (pam_err != PAM_SUCCESS) return (-1); pam_rhost = get_remote_name_or_ip(utmp_len, >>> 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 7 7: 4:49 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A111037B405; Fri, 7 Feb 2003 07:04:46 -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 4AF3137B401 for ; Fri, 7 Feb 2003 07:04:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC28A43FBF for ; Fri, 7 Feb 2003 07:04:45 -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 h17F4jbv019308 for ; Fri, 7 Feb 2003 07:04:45 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h17F4jsr019305 for perforce@freebsd.org; Fri, 7 Feb 2003 07:04:45 -0800 (PST) Date: Fri, 7 Feb 2003 07:04:45 -0800 (PST) Message-Id: <200302071504.h17F4jsr019305@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 24779 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=24779 Change 24779 by des@des.at.des.thinksec.com on 2003/02/07 07:04:39 If a set of saved credentials already exists when we are called, log a debugging message and fail. If the effective uid is non-zero but identical to the target uid, save the current credentials and return without doing anything else. Affected files ... .. //depot/projects/openpam/lib/openpam_borrow_cred.c#4 edit Differences ... ==== //depot/projects/openpam/lib/openpam_borrow_cred.c#4 (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/openpam_borrow_cred.c#3 $ + * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#4 $ */ #include @@ -57,9 +57,18 @@ struct pam_saved_cred *scred; int r; - ENTER(); - if (geteuid() != 0) + ENTERI(pwd->pw_uid); + r = pam_get_data(pamh, PAM_SAVED_CRED, (const void **)&scred); + if (r == PAM_SUCCESS && scred != NULL) { + openpam_log(PAM_LOG_DEBUG, + "already operating under borrowed credentials"); + RETURNC(PAM_SYSTEM_ERR); + } + if (geteuid() != 0 && geteuid() != pwd->pw_uid) { + openpam_log(PAM_LOG_DEBUG, "called with non-zero euid: %d", + (int)geteuid()); RETURNC(PAM_PERM_DENIED); + } scred = calloc(1, sizeof *scred); if (scred == NULL) RETURNC(PAM_BUF_ERR); @@ -76,6 +85,8 @@ free(scred); RETURNC(r); } + if (geteuid() == pwd->pw_uid) + RETURNC(PAM_SUCCESS); if (initgroups(pwd->pw_name, pwd->pw_gid) == -1 || setegid(pwd->pw_gid) == -1 || seteuid(pwd->pw_uid) == -1) { openpam_restore_cred(pamh); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 7 7: 7:52 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04BAD37B405; Fri, 7 Feb 2003 07:07: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 908D337B401 for ; Fri, 7 Feb 2003 07:07:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4121B43F93 for ; Fri, 7 Feb 2003 07:07:50 -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 h17F7nbv019487 for ; Fri, 7 Feb 2003 07:07:49 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h17F7n3k019484 for perforce@freebsd.org; Fri, 7 Feb 2003 07:07:49 -0800 (PST) Date: Fri, 7 Feb 2003 07:07:49 -0800 (PST) Message-Id: <200302071507.h17F7n3k019484@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 24780 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=24780 Change 24780 by des@des.at.des.thinksec.com on 2003/02/07 07:07:07 If the saved effective uid is the same as the current effective uid, just destroy the saved credentials and return. Affected files ... .. //depot/projects/openpam/lib/openpam_restore_cred.c#4 edit Differences ... ==== //depot/projects/openpam/lib/openpam_restore_cred.c#4 (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/openpam_restore_cred.c#3 $ + * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#4 $ */ #include @@ -62,10 +62,12 @@ RETURNC(r); if (scred == NULL) RETURNC(PAM_SYSTEM_ERR); - if (seteuid(scred->euid) == -1 || - setgroups(scred->ngroups, scred->groups) == -1 || - setegid(scred->egid) == -1) - RETURNC(PAM_SYSTEM_ERR); + if (scred->euid != geteuid()) { + if (seteuid(scred->euid) == -1 || + setgroups(scred->ngroups, scred->groups) == -1 || + setegid(scred->egid) == -1) + RETURNC(PAM_SYSTEM_ERR); + } pam_set_data(pamh, PAM_SAVED_CRED, NULL, NULL); RETURNC(PAM_SUCCESS); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Feb 7 10:24:57 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D31737B405; Fri, 7 Feb 2003 10:24:54 -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 B4D4737B401 for ; Fri, 7 Feb 2003 10:24:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5254A43FB1 for ; Fri, 7 Feb 2003 10:24:53 -0800 (PST) (envelope-from green@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 h17IOrbv092066 for ; Fri, 7 Feb 2003 10:24:53 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h17IOqqG092063 for perforce@freebsd.org; Fri, 7 Feb 2003 10:24:52 -0800 (PST) Date: Fri, 7 Feb 2003 10:24:52 -0800 (PST) Message-Id: <200302071824.h17IOqqG092063@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 24789 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=24789 Change 24789 by green@green_laptop_2 on 2003/02/07 10:24:04 Install the sample default_contexts fil. Affected files ... .. //depot/projects/trustedbsd/sebsd/share/security/Makefile#2 edit .. //depot/projects/trustedbsd/sebsd/share/security/default_contexts#1 add Differences ... ==== //depot/projects/trustedbsd/sebsd/share/security/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD$ -FILES= lomac-policy.contexts +FILES= default_contexts lomac-policy.contexts NOOBJ= noobj FILESDIR= ${BINDIR}/security To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 7:28: 4 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A18837B401; Sat, 8 Feb 2003 07:27:39 -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 17CE237B401 for ; Sat, 8 Feb 2003 07:27:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B951D43FBF for ; Sat, 8 Feb 2003 07:27:37 -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 h18FRbbv054267 for ; Sat, 8 Feb 2003 07:27:37 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18FRZPA054264 for perforce@freebsd.org; Sat, 8 Feb 2003 07:27:35 -0800 (PST) Date: Sat, 8 Feb 2003 07:27:35 -0800 (PST) Message-Id: <200302081527.h18FRZPA054264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov Subject: PERFORCE change 24821 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=24821 Change 24821 by tzukanov@tzukanov_antares on 2003/02/08 07:26:43 IFC. Affected files ... .. //depot/projects/s390/MAINTAINERS#7 integrate .. //depot/projects/s390/Makefile.inc1#8 integrate .. //depot/projects/s390/UPDATING#7 integrate .. //depot/projects/s390/bin/csh/USD.doc/Makefile#2 delete .. //depot/projects/s390/bin/date/date.c#3 integrate .. //depot/projects/s390/bin/date/netdate.c#2 integrate .. //depot/projects/s390/bin/ps/fmt.c#2 integrate .. //depot/projects/s390/bin/ps/keyword.c#5 integrate .. //depot/projects/s390/bin/ps/nlist.c#3 integrate .. //depot/projects/s390/bin/ps/print.c#5 integrate .. //depot/projects/s390/bin/ps/ps.c#5 integrate .. //depot/projects/s390/bin/rm/rm.1#3 integrate .. //depot/projects/s390/bin/sh/bltin/echo.c#3 integrate .. //depot/projects/s390/bin/sh/sh.1#5 integrate .. //depot/projects/s390/contrib/lukemftpd/src/cmds.c#3 integrate .. //depot/projects/s390/contrib/lukemftpd/src/ftpcmd.y#3 integrate .. //depot/projects/s390/contrib/lukemftpd/src/ftpd.c#3 integrate .. //depot/projects/s390/contrib/lukemftpd/src/popen.c#3 integrate .. //depot/projects/s390/contrib/lukemftpd/src/version.h#3 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_borrow_cred.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_findenv.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_get_option.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_impl.h#4 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_restore_cred.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_set_option.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_get_data.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_get_item.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_set_data.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_set_item.c#3 integrate .. //depot/projects/s390/crypto/openssh/auth2-pam-freebsd.c#6 integrate .. //depot/projects/s390/crypto/openssh/ssh-agent.c#3 integrate .. //depot/projects/s390/crypto/openssh/sshd.8#4 integrate .. //depot/projects/s390/crypto/openssh/version.h#3 integrate .. //depot/projects/s390/etc/defaults/pccard.conf#5 integrate .. //depot/projects/s390/etc/mtree/BSD.include.dist#6 integrate .. //depot/projects/s390/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/s390/etc/namedb/named.conf#3 integrate .. //depot/projects/s390/etc/pam.d/sshd#3 integrate .. //depot/projects/s390/etc/pam.d/su#3 integrate .. //depot/projects/s390/etc/rc.devfs#2 integrate .. //depot/projects/s390/etc/rc.firewall#2 integrate .. //depot/projects/s390/etc/rc.firewall6#2 integrate .. //depot/projects/s390/include/Makefile#6 integrate .. //depot/projects/s390/lib/libc/compat-43/sigvec.2#3 integrate .. //depot/projects/s390/lib/libc/db/man/mpool.3#3 integrate .. //depot/projects/s390/lib/libc/gen/glob.3#4 integrate .. //depot/projects/s390/lib/libc/locale/mbrune.3#5 integrate .. //depot/projects/s390/lib/libc/locale/multibyte.3#3 integrate .. //depot/projects/s390/lib/libc/net/gethostbyname.3#3 integrate .. //depot/projects/s390/lib/libc/net/nsdispatch.3#4 integrate .. //depot/projects/s390/lib/libc/posix1e/acl.3#4 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_get.3#4 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_set.3#3 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_soc.3#3 integrate .. //depot/projects/s390/lib/libc/stdio/tmpfile.c#3 integrate .. //depot/projects/s390/lib/libc/stdlib/rand.c#3 integrate .. //depot/projects/s390/lib/libc/stdlib/random.c#2 integrate .. //depot/projects/s390/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/s390/lib/libc/sys/fcntl.2#5 integrate .. //depot/projects/s390/lib/libc/sys/nfssvc.2#4 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_attr.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_attr_get_np.3#4 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cancel.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cleanup_pop.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cleanup_push.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cond_broadcast.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cond_destroy.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cond_init.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cond_signal.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cond_timedwait.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_cond_wait.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_rwlockattr_init.3#2 integrate .. //depot/projects/s390/lib/libc_r/uthread/uthread_attr_get_np.c#3 integrate .. //depot/projects/s390/lib/libdisk/create_chunk.c#5 integrate .. //depot/projects/s390/lib/libdisk/libdisk.h#5 integrate .. //depot/projects/s390/lib/libdisk/write_alpha_disk.c#2 integrate .. //depot/projects/s390/lib/libdisk/write_disk.c#4 integrate .. //depot/projects/s390/lib/libdisk/write_i386_disk.c#2 integrate .. //depot/projects/s390/lib/libdisk/write_ia64_disk.c#2 integrate .. //depot/projects/s390/lib/libdisk/write_pc98_disk.c#3 integrate .. //depot/projects/s390/lib/libedit/editline.3#3 integrate .. //depot/projects/s390/lib/libipsec/ipsec_set_policy.3#3 integrate .. //depot/projects/s390/lib/libipsec/ipsec_strerror.3#2 integrate .. //depot/projects/s390/lib/libpam/modules/modules.inc#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_echo/pam_echo.8#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_echo/pam_echo.c#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_exec/pam_exec.8#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_exec/pam_exec.c#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_group/Makefile#1 branch .. //depot/projects/s390/lib/libpam/modules/pam_group/pam_group.8#1 branch .. //depot/projects/s390/lib/libpam/modules/pam_group/pam_group.c#1 branch .. //depot/projects/s390/lib/libpam/modules/pam_kerberosIV/Makefile#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.8#1 branch .. //depot/projects/s390/lib/libpam/modules/pam_krb5/pam_krb5.c#5 integrate .. //depot/projects/s390/lib/libpam/modules/pam_wheel/pam_wheel.c#3 integrate .. //depot/projects/s390/libexec/bootpd/bootpd.c#2 integrate .. //depot/projects/s390/libexec/bootpd/bootpgw/bootpgw.c#2 integrate .. //depot/projects/s390/libexec/bootpd/rtmsg.c#3 integrate .. //depot/projects/s390/libexec/bootpd/tools/bootptest/bootptest.c#2 integrate .. //depot/projects/s390/libexec/ftpd/ftpcmd.y#4 integrate .. //depot/projects/s390/libexec/ftpd/ftpd.c#5 integrate .. //depot/projects/s390/libexec/lukemftpd/Makefile#5 integrate .. //depot/projects/s390/libexec/lukemftpd/pamize.h#1 branch .. //depot/projects/s390/release/Makefile#9 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/errata/article.sgml#5 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#7 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/errata/article.sgml#4 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/errata/article.sgml#4 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#6 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml#3 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#5 integrate .. //depot/projects/s390/release/i386/drivers.conf#8 integrate .. //depot/projects/s390/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/s390/sbin/mount_nullfs/mount_nullfs.8#4 integrate .. //depot/projects/s390/sbin/natd/natd.c#3 integrate .. //depot/projects/s390/sbin/vinum/vext.h#2 integrate .. //depot/projects/s390/share/examples/etc/make.conf#5 integrate .. //depot/projects/s390/share/man/man4/firewire.4#4 integrate .. //depot/projects/s390/share/man/man4/sbp.4#4 integrate .. //depot/projects/s390/share/man/man4/vinum.4#3 integrate .. //depot/projects/s390/share/man/man5/make.conf.5#7 integrate .. //depot/projects/s390/share/man/man7/hier.7#6 integrate .. //depot/projects/s390/share/man/man9/malloc.9#4 integrate .. //depot/projects/s390/share/man/man9/namei.9#3 integrate .. //depot/projects/s390/share/man/man9/sleep.9#3 integrate .. //depot/projects/s390/sys/alpha/alpha/busdma_machdep.c#4 integrate .. //depot/projects/s390/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/s390/sys/alpha/alpha/interrupt.c#4 integrate .. //depot/projects/s390/sys/alpha/linux/linux.h#2 integrate .. //depot/projects/s390/sys/alpha/osf1/osf1_misc.c#5 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_cd.c#7 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_sa.c#6 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_targ_bh.c#4 integrate .. //depot/projects/s390/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_stream.c#5 integrate .. //depot/projects/s390/sys/conf/NOTES#8 integrate .. //depot/projects/s390/sys/conf/files#9 integrate .. //depot/projects/s390/sys/conf/files.pc98#5 integrate .. //depot/projects/s390/sys/conf/files.powerpc#5 integrate .. //depot/projects/s390/sys/conf/kmod.mk#6 integrate .. //depot/projects/s390/sys/conf/options#6 integrate .. //depot/projects/s390/sys/conf/options.powerpc#4 integrate .. //depot/projects/s390/sys/contrib/dev/oltr/if_oltr.c#4 integrate .. //depot/projects/s390/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate .. //depot/projects/s390/sys/dev/aac/aac.c#6 integrate .. //depot/projects/s390/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/s390/sys/dev/aac/aac_cam.h#2 delete .. //depot/projects/s390/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/s390/sys/dev/advansys/advlib.c#2 integrate .. //depot/projects/s390/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/s390/sys/dev/aha/aha.c#4 integrate .. //depot/projects/s390/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/s390/sys/dev/an/if_an.c#6 integrate .. //depot/projects/s390/sys/dev/an/if_an_pci.c#4 integrate .. //depot/projects/s390/sys/dev/an/if_anreg.h#4 integrate .. //depot/projects/s390/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/s390/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/s390/sys/dev/bktr/bktr_audio.c#2 integrate .. //depot/projects/s390/sys/dev/bktr/bktr_card.c#3 integrate .. //depot/projects/s390/sys/dev/bktr/bktr_card.h#2 integrate .. //depot/projects/s390/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/s390/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/s390/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/s390/sys/dev/ciss/cissvar.h#3 integrate .. //depot/projects/s390/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/s390/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/s390/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/s390/sys/dev/firewire/fwmem.c#5 integrate .. //depot/projects/s390/sys/dev/firewire/fwmem.h#3 integrate .. //depot/projects/s390/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/s390/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/s390/sys/dev/firewire/sbp.c#5 integrate .. //depot/projects/s390/sys/dev/hifn/hifn7751.c#6 integrate .. //depot/projects/s390/sys/dev/ida/ida_disk.c#3 integrate .. //depot/projects/s390/sys/dev/kbd/atkbd.c#3 integrate .. //depot/projects/s390/sys/dev/mly/mly.c#7 integrate .. //depot/projects/s390/sys/dev/mly/mlyvar.h#2 integrate .. //depot/projects/s390/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/s390/sys/dev/random/harvest.c#2 integrate .. //depot/projects/s390/sys/dev/sio/sio.c#4 integrate .. //depot/projects/s390/sys/dev/sound/isa/ad1816.c#4 integrate .. //depot/projects/s390/sys/dev/sound/isa/es1888.c#2 integrate .. //depot/projects/s390/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/s390/sys/dev/sound/isa/mss.c#6 integrate .. //depot/projects/s390/sys/dev/sound/isa/sb16.c#4 integrate .. //depot/projects/s390/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/s390/sys/dev/sound/isa/sbc.c#4 integrate .. //depot/projects/s390/sys/dev/sound/isa/sndbuf_dma.c#1 branch .. //depot/projects/s390/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/s390/sys/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/s390/sys/dev/sound/pcm/buffer.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/s390/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pcm/feeder.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pcm/feeder_rate.c#4 integrate .. //depot/projects/s390/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/s390/sys/dev/sound/pcm/vchan.c#5 integrate .. //depot/projects/s390/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/s390/sys/dev/syscons/rain/rain_saver.c#2 integrate .. //depot/projects/s390/sys/dev/twe/twe_freebsd.c#4 integrate .. //depot/projects/s390/sys/dev/ubsec/ubsec.c#7 integrate .. //depot/projects/s390/sys/dev/ubsec/ubsecreg.h#2 integrate .. //depot/projects/s390/sys/dev/ubsec/ubsecvar.h#3 integrate .. //depot/projects/s390/sys/dev/usb/umass.c#7 integrate .. //depot/projects/s390/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/s390/sys/dev/usb/usbdevs.h#5 integrate .. //depot/projects/s390/sys/dev/usb/usbdevs_data.h#5 integrate .. //depot/projects/s390/sys/dev/vinum/vinum.c#2 integrate .. //depot/projects/s390/sys/dev/vinum/vinumhdr.h#2 integrate .. //depot/projects/s390/sys/dev/vinum/vinumio.c#5 integrate .. //depot/projects/s390/sys/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/s390/sys/fs/nwfs/nwfs_subr.c#3 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs.h#4 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_subr.c#3 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_vnops.c#6 integrate .. //depot/projects/s390/sys/geom/bde/g_bde_lock.c#3 integrate .. //depot/projects/s390/sys/geom/bde/g_bde_work.c#4 integrate .. //depot/projects/s390/sys/geom/geom.h#7 integrate .. //depot/projects/s390/sys/geom/geom_dev.c#8 integrate .. //depot/projects/s390/sys/geom/geom_disk.c#8 integrate .. //depot/projects/s390/sys/geom/geom_dump.c#6 integrate .. //depot/projects/s390/sys/geom/geom_enc.c#5 integrate .. //depot/projects/s390/sys/geom/geom_int.h#4 integrate .. //depot/projects/s390/sys/geom/geom_io.c#8 integrate .. //depot/projects/s390/sys/geom/geom_kern.c#6 integrate .. //depot/projects/s390/sys/geom/geom_stats.c#1 branch .. //depot/projects/s390/sys/geom/geom_stats.h#1 branch .. //depot/projects/s390/sys/geom/geom_subr.c#8 integrate .. //depot/projects/s390/sys/geom/geom_vol_ffs.c#1 branch .. //depot/projects/s390/sys/geom/notes#1 branch .. //depot/projects/s390/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/s390/sys/i386/i386/critical.c#3 integrate .. //depot/projects/s390/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/s390/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/s390/sys/i386/i386/tsc.c#1 branch .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_xenix.c#4 integrate .. //depot/projects/s390/sys/i386/include/clock.h#3 integrate .. //depot/projects/s390/sys/i386/include/cpu.h#2 integrate .. //depot/projects/s390/sys/i386/include/smp.h#4 integrate .. //depot/projects/s390/sys/i386/isa/apic_vector.s#3 integrate .. //depot/projects/s390/sys/i386/isa/clock.c#6 integrate .. //depot/projects/s390/sys/i386/isa/gpib.c#4 integrate .. //depot/projects/s390/sys/i386/isa/gsc.c#2 integrate .. //depot/projects/s390/sys/i386/isa/tw.c#3 integrate .. //depot/projects/s390/sys/i386/linux/linux.h#2 integrate .. //depot/projects/s390/sys/i4b/driver/i4b_isppp.c#5 integrate .. //depot/projects/s390/sys/ia64/ia64/busdma_machdep.c#4 integrate .. //depot/projects/s390/sys/ia64/ia64/clock.c#5 integrate .. //depot/projects/s390/sys/ia64/ia64/genassym.c#4 integrate .. //depot/projects/s390/sys/ia64/ia64/interrupt.c#6 integrate .. //depot/projects/s390/sys/ia64/ia64/sscdisk.c#5 integrate .. //depot/projects/s390/sys/ia64/ia64/swtch.s#4 integrate .. //depot/projects/s390/sys/isa/isareg.h#2 integrate .. //depot/projects/s390/sys/kern/init_main.c#7 integrate .. //depot/projects/s390/sys/kern/kern_clock.c#6 integrate .. //depot/projects/s390/sys/kern/kern_conf.c#5 integrate .. //depot/projects/s390/sys/kern/kern_exit.c#8 integrate .. //depot/projects/s390/sys/kern/kern_lock.c#6 integrate .. //depot/projects/s390/sys/kern/kern_time.c#7 integrate .. //depot/projects/s390/sys/kern/sched_ule.c#2 integrate .. //depot/projects/s390/sys/kern/subr_clock.c#3 integrate .. //depot/projects/s390/sys/kern/subr_prf.c#7 integrate .. //depot/projects/s390/sys/kern/subr_prof.c#5 integrate .. //depot/projects/s390/sys/kern/uipc_socket2.c#6 integrate .. //depot/projects/s390/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/s390/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/s390/sys/libkern/random.c#2 integrate .. //depot/projects/s390/sys/modules/Makefile#8 integrate .. //depot/projects/s390/sys/modules/canbepm/Makefile#1 branch .. //depot/projects/s390/sys/modules/canbus/Makefile#1 branch .. //depot/projects/s390/sys/modules/linux/Makefile#3 integrate .. //depot/projects/s390/sys/modules/netgraph/mppc/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/als4000/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/cmi/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/cs4281/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/csa/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/driver/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/ds1/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/emu10k1/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/es137x/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/fm801/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/ich/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/maestro/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/maestro3/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/neomagic/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/solo/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/t4dwave/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/uaudio/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/via8233/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/via82c686/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/driver/vibes/Makefile#2 integrate .. //depot/projects/s390/sys/modules/sound/pcm/Makefile#3 integrate .. //depot/projects/s390/sys/net/if_ppp.c#5 integrate .. //depot/projects/s390/sys/net/radix.c#5 integrate .. //depot/projects/s390/sys/net/radix.h#5 integrate .. //depot/projects/s390/sys/net/zlib.c#3 integrate .. //depot/projects/s390/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/s390/sys/netgraph/ng_mppc.c#4 integrate .. //depot/projects/s390/sys/netinet/if_ether.c#5 integrate .. //depot/projects/s390/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/s390/sys/netinet6/nd6.c#4 integrate .. //depot/projects/s390/sys/netipsec/key.c#4 integrate .. //depot/projects/s390/sys/netkey/key.c#4 integrate .. //depot/projects/s390/sys/netsmb/smb_dev.c#4 integrate .. //depot/projects/s390/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/s390/sys/pc98/pc98/canbepm.c#1 branch .. //depot/projects/s390/sys/pc98/pc98/canbus.c#1 branch .. //depot/projects/s390/sys/pc98/pc98/canbus.h#1 branch .. //depot/projects/s390/sys/pc98/pc98/canbus_if.m#1 branch .. //depot/projects/s390/sys/pc98/pc98/canbusvars.h#1 branch .. //depot/projects/s390/sys/pc98/pc98/clock.c#5 integrate .. //depot/projects/s390/sys/pc98/pc98/sio.c#5 integrate .. //depot/projects/s390/sys/pccard/pccard.c#4 integrate .. //depot/projects/s390/sys/pci/if_dc.c#7 integrate .. //depot/projects/s390/sys/pci/if_pcn.c#5 integrate .. //depot/projects/s390/sys/powerpc/conf/GENERIC#7 integrate .. //depot/projects/s390/sys/powerpc/include/cpufunc.h#3 integrate .. //depot/projects/s390/sys/powerpc/include/fpu.h#2 integrate .. //depot/projects/s390/sys/powerpc/include/hid.h#1 branch .. //depot/projects/s390/sys/powerpc/include/md_var.h#3 integrate .. //depot/projects/s390/sys/powerpc/include/spr.h#2 integrate .. //depot/projects/s390/sys/powerpc/powermac/macio.c#4 integrate .. //depot/projects/s390/sys/powerpc/powermac/pswitch.c#1 branch .. //depot/projects/s390/sys/powerpc/powerpc/busdma_machdep.c#4 integrate .. //depot/projects/s390/sys/powerpc/powerpc/clock.c#3 integrate .. //depot/projects/s390/sys/powerpc/powerpc/cpu.c#1 branch .. //depot/projects/s390/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/s390/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/s390/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/s390/sys/sparc64/sparc64/bus_machdep.c#5 integrate .. //depot/projects/s390/sys/sparc64/sparc64/clock.c#4 integrate .. //depot/projects/s390/sys/sparc64/sparc64/tick.c#4 integrate .. //depot/projects/s390/sys/sys/bio.h#4 integrate .. //depot/projects/s390/sys/sys/buf.h#5 integrate .. //depot/projects/s390/sys/sys/conf.h#7 integrate .. //depot/projects/s390/sys/sys/disk.h#4 integrate .. //depot/projects/s390/sys/sys/event.h#2 integrate .. //depot/projects/s390/sys/sys/kernel.h#3 integrate .. //depot/projects/s390/sys/sys/lockmgr.h#5 integrate .. //depot/projects/s390/sys/sys/param.h#7 integrate .. //depot/projects/s390/sys/sys/proc.h#9 integrate .. //depot/projects/s390/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/s390/sys/sys/systm.h#5 integrate .. //depot/projects/s390/sys/sys/unpcb.h#3 integrate .. //depot/projects/s390/sys/sys/vmmeter.h#2 integrate .. //depot/projects/s390/sys/ufs/ufs/ufs_extattr.c#5 integrate .. //depot/projects/s390/sys/vm/uma_core.c#6 integrate .. //depot/projects/s390/sys/vm/vm_pageout.c#8 integrate .. //depot/projects/s390/tools/KSE/ksetest/simplelock.h#3 integrate .. //depot/projects/s390/tools/regression/lib/libc/gen/Makefile#2 integrate .. //depot/projects/s390/tools/regression/lib/libc/gen/test-fpclassify.c#1 branch .. //depot/projects/s390/usr.bin/calendar/calendars/calendar.freebsd#7 integrate .. //depot/projects/s390/usr.bin/elfdump/Makefile#2 integrate .. //depot/projects/s390/usr.bin/elfdump/elfdump.1#1 branch .. //depot/projects/s390/usr.bin/elfdump/elfdump.c#2 integrate .. //depot/projects/s390/usr.bin/gprof/PSD.doc/Makefile#2 delete .. //depot/projects/s390/usr.bin/ipcrm/ipcrm.1#2 integrate .. //depot/projects/s390/usr.bin/killall/killall.c#2 integrate .. //depot/projects/s390/usr.bin/ktrace/ktrace.c#2 integrate .. //depot/projects/s390/usr.bin/ktrace/subr.c#2 integrate .. //depot/projects/s390/usr.bin/mail/USD.doc/Makefile#2 delete .. //depot/projects/s390/usr.bin/make/PSD.doc/Makefile#2 delete .. //depot/projects/s390/usr.bin/msgs/msgs.c#3 integrate .. //depot/projects/s390/usr.bin/su/su.c#5 integrate .. //depot/projects/s390/usr.bin/yacc/skeleton.c#2 integrate .. //depot/projects/s390/usr.sbin/Makefile#7 integrate .. //depot/projects/s390/usr.sbin/adduser/adduser.8#5 integrate .. //depot/projects/s390/usr.sbin/adduser/adduser.sh#3 integrate .. //depot/projects/s390/usr.sbin/btxld/a.out.h#1 branch .. //depot/projects/s390/usr.sbin/btxld/btxld.c#3 integrate .. //depot/projects/s390/usr.sbin/daemon/daemon.8#2 integrate .. //depot/projects/s390/usr.sbin/kgzip/elfhdr.h#2 integrate .. //depot/projects/s390/usr.sbin/kgzip/kgzcmp.c#2 integrate .. //depot/projects/s390/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/s390/usr.sbin/mergemaster/mergemaster.sh#5 integrate .. //depot/projects/s390/usr.sbin/pkg_install/sign/x509.c#2 integrate .. //depot/projects/s390/usr.sbin/sysinstall/config.c#5 integrate .. //depot/projects/s390/usr.sbin/sysinstall/menus.c#8 integrate Differences ... ==== //depot/projects/s390/MAINTAINERS#7 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.56 2003/01/30 17:39:26 gordon Exp $ +$FreeBSD: src/MAINTAINERS,v 1.57 2003/02/04 06:29:03 phk Exp $ subsystem login notes ----------------------------- @@ -26,13 +26,6 @@ cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. -geom phk Pre-commit review requested. -specinfo/dev_t phk Pre-commit review requested. -struct disk phk Pre-commit review requested. -specfs phk Pre-commit review requested. -devfs phk Pre-commit review requested. -timekeeping phk Pre-commit review requested. -md(4) phk Pre-commit review requested. aac scottl Pre-commit review requested udf scottl Pre-commit review with myself or asmodai requested. powerpc benno Pre-commit review preferred. ==== //depot/projects/s390/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.314 2002/12/30 10:01:25 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.316 2003/02/07 07:29:57 jkoshy Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -253,6 +253,14 @@ # success, regardless of how old your existing system is. # _worldtmp: +.if ${.CURDIR:C/[^,]//g} != "" +# The m4 build of sendmail files doesn't like it if ',' is used +# anywhere in the path of it's files. + @echo + @echo "*** Error: path to source tree contains a comma ','" + @echo + @false +.endif @echo @echo "--------------------------------------------------------------" @echo ">>> Rebuilding the temporary build tree" @@ -461,7 +469,7 @@ # buildkernel: .if empty(BUILDKERNELS) - @echo ">>> ERROR: Missing kernel configuration file(s) (${KERNCONF})." + @echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; @false .endif .if defined(KERNWARN) @@ -520,6 +528,10 @@ # Install the kernel defined by INSTALLKERNEL # installkernel reinstallkernel: +.if empty(INSTALLKERNEL) + @echo "ERROR: No kernel \"${KERNCONF}\" to install." + @false +.endif cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel$//} ==== //depot/projects/s390/UPDATING#7 (text+ko) ==== @@ -1071,8 +1071,34 @@ - To upgrade from 4.x-stable to current - ------------------------------------- + To cross-install current onto a separate partition + -------------------------------------------------- + # In this approach we use a separate partition to hold + # current's root, 'usr', and 'var' directories. A partition + # holding "/", "/usr" and "/var" should be about 2GB in + # size. + + + + make buildworld + + + make installworld DESTDIR=${CURRENT_ROOT} + make buildkernel KERNCONF=YOUR_KERNEL_HERE + cp /usr/src/sys/${ARCH}/conf/GENERIC.hints \ + ${CURRENT_ROOT}/boot/device.hints # as needed + make installkernel KERNCONF=YOUR_KERNEL_HERE DESTDIR=${CURRENT_ROOT} + cd /usr/src/etc; make distribution DESTDIR=${CURRENT_ROOT} # if newfs'd + cp /etc/fstab ${CURRENT_ROOT}/etc/fstab # if newfs'd + + + + + + + + To upgrade in-place from 4.x-stable to current + ---------------------------------------------- # 5.x uses more space than 4.x. Also, the location of kernel # modules has changed. If you are installing 5.0 onto a 4.x # system, you'll need about 30MB of free disk space on your / @@ -1198,4 +1224,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.239 2003/01/29 07:14:16 phk Exp $ +$FreeBSD: src/UPDATING,v 1.240 2003/02/07 08:26:23 jkoshy Exp $ ==== //depot/projects/s390/bin/date/date.c#3 (text+ko) ==== @@ -37,13 +37,14 @@ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ +#if 0 #ifndef lint -#if 0 static char sccsid[] = "@(#)date.c 8.2 (Berkeley) 4/28/95"; +#endif /* not lint */ #endif -#endif /* not lint */ + #include -__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.42 2002/10/18 14:48:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.43 2003/02/05 12:56:40 charnier Exp $"); #include #include ==== //depot/projects/s390/bin/date/netdate.c#2 (text+ko) ==== @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static char sccsid[] = "@(#)netdate.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ + #include -__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.16 2002/06/30 05:13:52 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/date/netdate.c,v 1.17 2003/02/05 12:56:40 charnier Exp $"); #include #include @@ -81,7 +82,7 @@ char hostname[MAXHOSTNAMELEN]; if ((sp = getservbyname("timed", "udp")) == NULL) { - warnx("udp/timed: unknown service"); + warnx("timed/udp: unknown service"); return (retval = 2); } ==== //depot/projects/s390/bin/ps/fmt.c#2 (text+ko) ==== @@ -36,8 +36,9 @@ static char sccsid[] = "@(#)fmt.c 8.4 (Berkeley) 4/15/94"; #endif #endif + #include -__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.26 2002/07/05 15:58:26 mike Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.27 2003/02/05 13:18:17 charnier Exp $"); #include #include ==== //depot/projects/s390/bin/ps/keyword.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.60 2003/01/19 00:31:15 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.62 2003/02/05 19:22:39 sobomax Exp $"); #include #include @@ -67,6 +67,7 @@ #define PIDLEN 5 #define USERLEN (MAXLOGNAME - 1) +/* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */ static VAR var[] = { {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4, 0, CHAR, NULL, 0}, {"%mem", "%MEM", NULL, 0, pmem, NULL, 4, 0, CHAR, NULL, 0}, @@ -84,7 +85,7 @@ {"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d", 0}, {"cputime", "", "time", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, - {"etime", "ELAPSED", NULL, USER, elapsed, NULL, 9, 0, CHAR, NULL, 0}, + {"etime", "ELAPSED", NULL, USER, elapsed, NULL, 12, 0, CHAR, NULL, 0}, {"f", "F", NULL, 0, kvar, NULL, 7, KOFF(ki_flag), INT, "x", 0}, {"flags", "", "f", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"ignored", "", "sigignore", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, @@ -98,6 +99,8 @@ {"label", "LABEL", NULL, LJUST|DSIZ, label, s_label, SHRT_MAX, 0, CHAR, NULL, 0}, {"lim", "LIM", NULL, 0, maxrss, NULL, 5, 0, CHAR, NULL, 0}, + {"lockname", "LOCK", NULL, LJUST, lockname, NULL, 6, 0, CHAR, NULL, + 0}, {"login", "LOGIN", NULL, LJUST, logname, NULL, MAXLOGNAME-1, 0, CHAR, NULL, 0}, {"logname", "", "login", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, @@ -111,8 +114,6 @@ LONG, "ld", 0}, {"msgsnd", "MSGSND", NULL, USER, rvar, NULL, 4, ROFF(ru_msgsnd), LONG, "ld", 0}, - {"lockname", "LOCK", NULL, LJUST, lockname, NULL, 6, 0, CHAR, NULL, - 0}, {"mwchan", "MWCHAN", NULL, LJUST, mwchan, NULL, 6, 0, CHAR, NULL, 0}, {"ni", "", "nice", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"nice", "NI", NULL, 0, kvar, NULL, 2, KOFF(ki_nice), CHAR, "d", ==== //depot/projects/s390/bin/ps/nlist.c#3 (text+ko) ==== @@ -36,8 +36,9 @@ static char sccsid[] = "@(#)nlist.c 8.4 (Berkeley) 4/2/94"; #endif /* not lint */ #endif + #include -__FBSDID("$FreeBSD: src/bin/ps/nlist.c,v 1.19 2002/11/01 23:26:20 tmm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/nlist.c,v 1.20 2003/02/05 13:18:17 charnier Exp $"); #include #include ==== //depot/projects/s390/bin/ps/print.c#5 (text+ko) ==== @@ -36,8 +36,9 @@ static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #endif /* not lint */ #endif + #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.78 2003/01/19 00:31:16 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.79 2003/02/05 13:18:17 charnier Exp $"); #include #include @@ -539,14 +540,30 @@ elapsed(KINFO *k, VARENT *ve) { VAR *v; - time_t secs; + time_t days, hours, mins, secs; char obuff[128]; v = ve->var; secs = now - k->ki_p->ki_start.tv_sec; - (void)snprintf(obuff, sizeof(obuff), "%3ld:%02ld", (long)secs/60, - (long)secs%60); + days = secs/(24*60*60); + secs %= (24*60*60); + hours = secs/(60*60); + secs %= (60*60); + mins = secs/60; + secs %= 60; + if (days != 0) { + (void)snprintf(obuff, sizeof(obuff), "%3ld-%02ld:%02ld:%02ld", + (long)days, (long)hours, (long)mins, (long)secs); + } + else if (hours != 0) { + (void)snprintf(obuff, sizeof(obuff), "%02ld:%02ld:%02ld", + (long)hours, (long)mins, (long)secs); + } + else { + (void)snprintf(obuff, sizeof(obuff), "%02ld:%02ld", + (long)mins, (long)secs); + } (void)printf("%*s", v->width, obuff); } ==== //depot/projects/s390/bin/ps/ps.c#5 (text+ko) ==== @@ -42,8 +42,9 @@ static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94"; #endif /* not lint */ #endif + #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.61 2003/01/19 00:31:16 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.62 2003/02/05 13:18:17 charnier Exp $"); #include #include ==== //depot/projects/s390/bin/rm/rm.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.26 2002/08/21 17:32:42 trhodes Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.27 2003/02/04 20:38:51 trhodes Exp $ .\" .Dd January 28, 1999 .Dt RM 1 @@ -158,6 +158,7 @@ .Dl rm /home/user/-filename .Dl rm ./-filename .Sh SEE ALSO +.Xr chflags 1 , .Xr rmdir 1 , .Xr undelete 2 , .Xr unlink 2 , ==== //depot/projects/s390/bin/sh/bltin/echo.c#3 (text+ko) ==== @@ -34,9 +34,11 @@ * SUCH DAMAGE. * * @(#)echo.c 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/bltin/echo.c,v 1.12 2002/12/22 21:35:14 dwmalone Exp $ */ +#include +__FBSDID("$FreeBSD: src/bin/sh/bltin/echo.c,v 1.13 2003/02/05 13:23:46 charnier Exp $"); + /* * Echo command. */ ==== //depot/projects/s390/bin/sh/sh.1#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.83 2002/12/24 13:41:45 ru Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.84 2003/02/03 23:03:05 fanf Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -1076,10 +1076,12 @@ or null, null is substituted; otherwise, the expansion of word is substituted. +.El .Pp In the parameter expansions shown previously, use of the colon in the format results in a test for a parameter that is unset or null; omission of the colon results in a test for a parameter that is only unset. +.Bl -tag -width indent .It Li ${#parameter} String Length. The length in characters of the value of parameter. ==== //depot/projects/s390/contrib/lukemftpd/src/cmds.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: cmds.c,v 1.18 2002/10/12 08:35:16 darrenr Exp $ */ +/* $NetBSD: cmds.c,v 1.20 2003/01/08 18:07:31 manu Exp $ */ /* * Copyright (c) 1999-2001 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ #include #ifndef lint -__RCSID("$NetBSD: cmds.c,v 1.18 2002/10/12 08:35:16 darrenr Exp $"); +__RCSID("$NetBSD: cmds.c,v 1.20 2003/01/08 18:07:31 manu Exp $"); #endif /* not lint */ #include @@ -171,6 +171,8 @@ #define FACTTABSIZE (sizeof(facttab) / sizeof(struct ftpfact)) +static char cached_path[MAXPATHLEN + 1] = "/"; +static void discover_path(char *, const char *); void cwd(const char *path) @@ -181,6 +183,9 @@ else { show_chdir_messages(250); ack("CWD"); + if (getcwd(cached_path, MAXPATHLEN) == NULL) { + discover_path(cached_path, path); + } } } @@ -404,11 +409,15 @@ { char path[MAXPATHLEN]; - if (getcwd(path, sizeof(path) - 1) == NULL) - reply(550, "Can't get the current directory: %s.", - strerror(errno)); - else - replydirname(path, "is the current directory."); + if (getcwd(path, sizeof(path) - 1) == NULL) { + if (chdir(cached_path) < 0) { + reply(550, "Can't get the current directory: %s.", + strerror(errno)); + return; + } + (void)strlcpy(path, cached_path, MAXPATHLEN); + } + replydirname(path, "is the current directory."); } void @@ -844,3 +853,126 @@ *p = '\0'; reply(257, "\"%s\" %s", npath, message); } + +static void +discover_path(last_path, new_path) + char *last_path; + const char *new_path; +{ + char tp[MAXPATHLEN + 1] = ""; + char tq[MAXPATHLEN + 1] = ""; + char *cp; + char *cq; + int sz1, sz2; + int nomorelink; + struct stat st1, st2; + + if (new_path[0] != '/') { + (void)strlcpy(tp, last_path, MAXPATHLEN); + (void)strlcat(tp, "/", MAXPATHLEN); + } + (void)strlcat(tp, new_path, MAXPATHLEN); + (void)strlcat(tp, "/", MAXPATHLEN); + + /* + * resolve symlinks. A symlink may introduce another symlink, so we + * loop trying to resolve symlinks until we don't find any of them. + */ + do { + /* Collapse any // into / */ + while ((cp = strstr(tp, "//")) != NULL) + (void)memmove(cp, cp + 1, strlen(cp) - 1 + 1); + + /* Collapse any /./ into / */ + while ((cp = strstr(tp, "/./")) != NULL) + (void)memmove(cp, cp + 2, strlen(cp) - 2 + 1); + + cp = tp; + nomorelink = 1; + + while ((cp = strstr(++cp, "/")) != NULL) { + sz1 = (u_long)cp - (u_long)tp; + if (sz1 > MAXPATHLEN) + goto bad; + *cp = 0; + sz2 = readlink(tp, tq, MAXPATHLEN); + *cp = '/'; + + /* If this is not a symlink, move to next / */ + if (sz2 <= 0) + continue; + + /* + * We found a symlink, so we will have to + * do one more pass to check there is no + * more symlink in the path + */ + nomorelink = 0; + + /* + * Null terminate the string and remove trailing / + */ + tq[sz2] = 0; + sz2 = strlen(tq); + if (tq[sz2 - 1] == '/') + tq[--sz2] = 0; + + /* + * Is this an absolute link or a relative link? + */ + if (tq[0] == '/') { + /* absolute link */ + if (strlen(cp) + sz2 > MAXPATHLEN) + goto bad; + memmove(tp + sz2, cp, strlen(cp) + 1); + memcpy(tp, tq, sz2); + } else { + /* relative link */ + for (cq = cp - 1; *cq != '/'; cq--); + if (strlen(tp) - ((u_long)cq - (u_long)cp) + + 1 + sz2 > MAXPATHLEN) + goto bad; + (void)memmove(cq + 1 + sz2, + cp, strlen(cp) + 1); + (void)memcpy(cq + 1, tq, sz2); + } + + /* + * start over, looking for new symlinks + */ + break; + } + } while (nomorelink == 0); + + /* Collapse any /foo/../ into /foo/ */ + while ((cp = strstr(tp, "/../")) != NULL) { + /* ^/../foo/ becomes ^/foo/ */ + if (cp == tp) { + (void)memmove(cp, cp + 3, + strlen(cp) - 3 + 1); + } else { + for (cq = cp - 1; *cq != '/'; cq--); + (void)memmove(cq, cp + 3, + strlen(cp) - 3 + 1); + } + } + + /* strip strailing / */ + if (strlen(tp) != 1) + tp[strlen(tp) - 1] = '\0'; + + /* check that the path is correct */ + stat(tp, &st1); + stat(".", &st2); + if ((st1.st_dev != st2.st_dev) || (st1.st_ino != st2.st_ino)) + goto bad; + + (void)strlcpy(last_path, tp, MAXPATHLEN); + return; + +bad: + (void)strlcat(last_path, "/", MAXPATHLEN); + (void)strlcat(last_path, new_path, MAXPATHLEN); + return; +} + ==== //depot/projects/s390/contrib/lukemftpd/src/ftpcmd.y#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: ftpcmd.y,v 1.71 2002/10/12 08:35:17 darrenr Exp $ */ +/* $NetBSD: ftpcmd.y,v 1.73 2003/01/22 04:33:35 lukem Exp $ */ /*- * Copyright (c) 1997-2002 The NetBSD Foundation, Inc. @@ -83,7 +83,7 @@ #if 0 static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #else -__RCSID("$NetBSD: ftpcmd.y,v 1.71 2002/10/12 08:35:17 darrenr Exp $"); +__RCSID("$NetBSD: ftpcmd.y,v 1.73 2003/01/22 04:33:35 lukem Exp $"); #endif #endif /* not lint */ @@ -1222,7 +1222,7 @@ { "SMNT", SMNT, ARGS, 0, "(structure mount)" }, { "QUIT", QUIT, NOARGS, 1, "(terminate service)" }, { "REIN", REIN, NOARGS, 0, "(reinitialize server state)" }, - { "PORT", PORT, ARGS, 1, " b0, b1, b2, b3, b4" }, + { "PORT", PORT, ARGS, 1, " b0, b1, b2, b3, b4, b5" }, { "LPRT", LPRT, ARGS, 1, " af, hal, h1, h2, h3,..., pal, p1, p2..." }, { "EPRT", EPRT, STR1, 1, " |af|addr|port|" }, { "PASV", PASV, NOARGS, 1, "(set server in passive mode)" }, ==== //depot/projects/s390/contrib/lukemftpd/src/ftpd.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: ftpd.c,v 1.147 2002/11/29 14:40:00 lukem Exp $ */ +/* $NetBSD: ftpd.c,v 1.150 2003/01/22 04:46:08 lukem Exp $ */ /* * Copyright (c) 1997-2001 The NetBSD Foundation, Inc. @@ -109,10 +109,10 @@ #if 0 static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: ftpd.c,v 1.147 2002/11/29 14:40:00 lukem Exp $"); +__RCSID("$NetBSD: ftpd.c,v 1.150 2003/01/22 04:46:08 lukem Exp $"); #endif #endif /* not lint */ -__FBSDID("$FreeBSD: src/contrib/lukemftpd/src/ftpd.c,v 1.2 2003/01/07 17:31:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/contrib/lukemftpd/src/ftpd.c,v 1.3 2003/02/02 21:03:28 obrien Exp $"); /* * FTP server. @@ -686,8 +686,7 @@ } else pw = sgetpwnam(name); - if (logging) - strlcpy(curname, name, sizeof(curname)); + strlcpy(curname, name, sizeof(curname)); /* check user in /etc/ftpusers, and setup class */ permitted = checkuser(_PATH_FTPUSERS, curname, 1, 0, &class); @@ -1650,7 +1649,7 @@ { char sizebuf[32]; FILE *file; >>> 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 Sat Feb 8 7:42:18 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDBDD37B4F3; Sat, 8 Feb 2003 07:42:00 -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 BF84737B42F for ; Sat, 8 Feb 2003 07:41:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AF5043F93 for ; Sat, 8 Feb 2003 07:41:56 -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 h18Ffubv060755 for ; Sat, 8 Feb 2003 07:41:56 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18FftK8060746 for perforce@freebsd.org; Sat, 8 Feb 2003 07:41:55 -0800 (PST) Date: Sat, 8 Feb 2003 07:41:55 -0800 (PST) Message-Id: <200302081541.h18FftK8060746@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 24823 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=24823 Change 24823 by des@des.at.des.thinksec.com on 2003/02/08 07:41:53 Nothing beats being an idiot! Avoid passing expressions with side effects as arguments to macros. Also impose some sort of consistency in the naming of variables that hold error codes. Affected files ... .. //depot/projects/openpam/lib/pam_acct_mgmt.c#11 edit .. //depot/projects/openpam/lib/pam_authenticate.c#13 edit .. //depot/projects/openpam/lib/pam_chauthtok.c#14 edit .. //depot/projects/openpam/lib/pam_close_session.c#11 edit .. //depot/projects/openpam/lib/pam_get_authtok.c#21 edit .. //depot/projects/openpam/lib/pam_get_user.c#14 edit .. //depot/projects/openpam/lib/pam_getenv.c#11 edit .. //depot/projects/openpam/lib/pam_open_session.c#11 edit .. //depot/projects/openpam/lib/pam_setcred.c#12 edit Differences ... ==== //depot/projects/openpam/lib/pam_acct_mgmt.c#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/openpam/lib/pam_acct_mgmt.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#11 $ */ #include @@ -51,11 +51,11 @@ pam_acct_mgmt(pam_handle_t *pamh, int flags) { - int pam_err; + int r; ENTER(); - pam_err = openpam_dispatch(pamh, PAM_SM_ACCT_MGMT, flags); - RETURNC(pam_err); + r = openpam_dispatch(pamh, PAM_SM_ACCT_MGMT, flags); + RETURNC(r); } /* ==== //depot/projects/openpam/lib/pam_authenticate.c#13 (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_authenticate.c#12 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate.c#13 $ */ #include @@ -51,14 +51,14 @@ pam_authenticate(pam_handle_t *pamh, int flags) { - int pam_err; + int r; ENTER(); if (flags & ~(PAM_SILENT|PAM_DISALLOW_NULL_AUTHTOK)) RETURNC(PAM_SYMBOL_ERR); - pam_err = openpam_dispatch(pamh, PAM_SM_AUTHENTICATE, flags); + r = openpam_dispatch(pamh, PAM_SM_AUTHENTICATE, flags); pam_set_item(pamh, PAM_AUTHTOK, NULL); - RETURNC(pam_err); + RETURNC(r); } /* ==== //depot/projects/openpam/lib/pam_chauthtok.c#14 (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_chauthtok.c#13 $ + * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#14 $ */ #include @@ -51,19 +51,19 @@ pam_chauthtok(pam_handle_t *pamh, int flags) { - int pam_err; + int r; ENTER(); if (flags & ~(PAM_SILENT|PAM_CHANGE_EXPIRED_AUTHTOK)) RETURNC(PAM_SYMBOL_ERR); - pam_err = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, + r = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, flags | PAM_PRELIM_CHECK); - if (pam_err == PAM_SUCCESS) - pam_err = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, + if (r == PAM_SUCCESS) + r = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, flags | PAM_UPDATE_AUTHTOK); pam_set_item(pamh, PAM_OLDAUTHTOK, NULL); pam_set_item(pamh, PAM_AUTHTOK, NULL); - RETURNC(pam_err); + RETURNC(r); } /* ==== //depot/projects/openpam/lib/pam_close_session.c#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/openpam/lib/pam_close_session.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_close_session.c#11 $ */ #include @@ -51,11 +51,13 @@ pam_close_session(pam_handle_t *pamh, int flags) { + int r; ENTER(); if (flags & ~(PAM_SILENT)) RETURNC(PAM_SYMBOL_ERR); - RETURNC(openpam_dispatch(pamh, PAM_SM_CLOSE_SESSION, flags)); + r = openpam_dispatch(pamh, PAM_SM_CLOSE_SESSION, flags); + RETURNC(r); } /* ==== //depot/projects/openpam/lib/pam_get_authtok.c#21 (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_get_authtok.c#20 $ + * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#21 $ */ #include @@ -124,7 +124,8 @@ free(resp); if (r != PAM_SUCCESS) RETURNC(r); - RETURNC(pam_get_item(pamh, item, (const void **)authtok)); + r = pam_get_item(pamh, item, (const void **)authtok); + RETURNC(r); } /* ==== //depot/projects/openpam/lib/pam_get_user.c#14 (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_get_user.c#13 $ + * $P4: //depot/projects/openpam/lib/pam_get_user.c#14 $ */ #include @@ -78,7 +78,8 @@ free(resp); if (r != PAM_SUCCESS) RETURNC(r); - RETURNC(pam_get_item(pamh, PAM_USER, (const void **)user)); + r = pam_get_item(pamh, PAM_USER, (const void **)user); + RETURNC(r); } /* ==== //depot/projects/openpam/lib/pam_getenv.c#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/openpam/lib/pam_getenv.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_getenv.c#11 $ */ #include @@ -52,16 +52,18 @@ pam_getenv(pam_handle_t *pamh, const char *name) { + char *str; int i; - ENTER(); + ENTERS(name); if (pamh == NULL) RETURNS(NULL); if (name == NULL || strchr(name, '=') != NULL) RETURNS(NULL); if ((i = openpam_findenv(pamh, name, strlen(name))) == -1) RETURNS(NULL); - RETURNS(strdup(pamh->env[i])); + str = strdup(pamh->env[i]); + RETURNS(str); } /** ==== //depot/projects/openpam/lib/pam_open_session.c#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/openpam/lib/pam_open_session.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_open_session.c#11 $ */ #include @@ -51,11 +51,13 @@ pam_open_session(pam_handle_t *pamh, int flags) { + int r; ENTER(); if (flags & ~(PAM_SILENT)) RETURNC(PAM_SYMBOL_ERR); - RETURNC(openpam_dispatch(pamh, PAM_SM_OPEN_SESSION, flags)); + r = openpam_dispatch(pamh, PAM_SM_OPEN_SESSION, flags); + RETURNC(r); } /* ==== //depot/projects/openpam/lib/pam_setcred.c#12 (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_setcred.c#11 $ + * $P4: //depot/projects/openpam/lib/pam_setcred.c#12 $ */ #include @@ -51,13 +51,15 @@ pam_setcred(pam_handle_t *pamh, int flags) { + int r; ENTER(); if (flags & ~(PAM_SILENT|PAM_ESTABLISH_CRED|PAM_DELETE_CRED| PAM_REINITIALIZE_CRED|PAM_REFRESH_CRED)) RETURNC(PAM_SYMBOL_ERR); /* XXX enforce exclusivity */ - RETURNC(openpam_dispatch(pamh, PAM_SM_SETCRED, flags)); + r = openpam_dispatch(pamh, PAM_SM_SETCRED, flags); + RETURNC(r); } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 8:42:18 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88ED037B405; Sat, 8 Feb 2003 08: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 1FD2D37B401 for ; Sat, 8 Feb 2003 08:42:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9BA443FAF for ; Sat, 8 Feb 2003 08:42: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 h18GgAbv082382 for ; Sat, 8 Feb 2003 08: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 h18GgAfI082376 for perforce@freebsd.org; Sat, 8 Feb 2003 08:42:10 -0800 (PST) Date: Sat, 8 Feb 2003 08:42:10 -0800 (PST) Message-Id: <200302081642.h18GgAfI082376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov Subject: PERFORCE change 24826 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=24826 Change 24826 by tzukanov@tzukanov_antares on 2003/02/08 08:41:32 Compilation fixes. Affected files ... .. //depot/projects/s390/lib/csu/s390/crt1.c#2 edit .. //depot/projects/s390/secure/lib/libcrypto/opensslconf-s390.h#2 edit .. //depot/projects/s390/secure/lib/libcrypto/opensslconf-s390x.h#2 edit .. //depot/projects/s390/sys/conf/files.s390#2 edit .. //depot/projects/s390/sys/s390/conf/GENERIC#6 edit .. //depot/projects/s390/sys/s390/s390/clock.c#2 edit .. //depot/projects/s390/sys/s390/s390/elf_machdep.c#4 edit .. //depot/projects/s390/sys/s390/s390/identcpu.c#3 edit .. //depot/projects/s390/sys/s390/s390/vm_machdep.c#6 edit Differences ... ==== //depot/projects/s390/lib/csu/s390/crt1.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ +/* LINTLIBRARY */ /*- * Copyright 1996-1998 John D. Polstra. * All rights reserved. ==== //depot/projects/s390/secure/lib/libcrypto/opensslconf-s390.h#2 (text+ko) ==== @@ -64,7 +64,7 @@ #endif #endif -#if defined(HEADER_DES_H) && !defined(DES_LONG) +#if (defined(HEADER_DES_H) || defined(HEADER_NEW_DES_H)) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #ifndef DES_LONG @@ -173,3 +173,6 @@ #endif /* DES_DEFAULT_OPTIONS */ #endif /* HEADER_DES_LOCL_H */ +/* The Kerberos 5 support is MIT-specific. */ +#define OPENSSL_NO_KRB5 + ==== //depot/projects/s390/secure/lib/libcrypto/opensslconf-s390x.h#2 (text+ko) ==== @@ -64,7 +64,7 @@ #endif #endif -#if defined(HEADER_DES_H) && !defined(DES_LONG) +#if (defined(HEADER_DES_H) || defined(HEADER_NEW_DES_H)) && !defined(DES_LONG) /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #ifndef DES_LONG @@ -173,3 +173,6 @@ #endif /* DES_DEFAULT_OPTIONS */ #endif /* HEADER_DES_LOCL_H */ +/* The Kerberos 5 support is MIT-specific. */ +#define OPENSSL_NO_KRB5 + ==== //depot/projects/s390/sys/conf/files.s390#2 (text+ko) ==== @@ -34,8 +34,6 @@ dev/dasd/dasd_if.m optional dasd dev/dasd/dasd.c optional dasd -kern/subr_diskmbr.c standard - libkern/ashldi3.c standard libkern/ashrdi3.c standard libkern/divdi3.c standard ==== //depot/projects/s390/sys/s390/conf/GENERIC#6 (text+ko) ==== @@ -49,8 +49,7 @@ #options SMP -options NO_GEOM - +options SCHED_4BSD # 4BSD scheduler options FFS # Berkeley Fast Filesystem options SOFTUPDATES options PROCFS # Process filesystem (requires PSEUDOFS) ==== //depot/projects/s390/sys/s390/s390/clock.c#2 (text+ko) ==== @@ -213,7 +213,12 @@ } void -setstatclockrate(int hzrate) +cpu_startprofclock(void) +{ +} + +void +cpu_stopprofclock(void) { - printf("setstatclockrate(%d) called.\n", hzrate); } + ==== //depot/projects/s390/sys/s390/s390/elf_machdep.c#4 (text+ko) ==== @@ -131,8 +131,8 @@ (sysinit_cfunc_t)elf32_insert_brand_entry, &freebsd_brand_info); -int -elf_reloc(linker_file_t lf, const void *data, int type) +static int +elf_reloc_internal(linker_file_t lf, const void *data, int type, int local) { Elf_Addr A, *where = NULL; /* XXX */ const Elf_Rela *rela; @@ -206,6 +206,18 @@ } int +elf_reloc(linker_file_t lf, const void *data, int type) +{ + return elf_reloc_internal(lf, data, type, 0); +} + +int +elf_reloc_local(linker_file_t lf, const void *data, int type) +{ + return elf_reloc_internal(lf, data, type, 1); +} + +int elf_cpu_load_file(linker_file_t lf __unused) { return 0; ==== //depot/projects/s390/sys/s390/s390/identcpu.c#3 (text+ko) ==== @@ -130,7 +130,9 @@ __asm volatile (" efpc %%r0, 0" ::: "r0"); #endif esa_features |= ESA_FEATURE_AFP_FLAG; +#if 0 post_AFP: +#endif cr_clear(CR0, CR0_AFP_REGISTER); esa_features |= ESA_FEATURE_MVPG_FLAG; ==== //depot/projects/s390/sys/s390/s390/vm_machdep.c#6 (text+ko) ==== @@ -185,75 +185,6 @@ { } -int -vm_fault_quick(caddr_t v, int prot) -{ - if (prot & VM_PROT_WRITE) - return subyte(v, fubyte(v)); - else - return fubyte(v); -} - -void -vmapbuf(struct buf *bp) -{ - caddr_t va, kva, va_end; - vm_offset_t pa; - vm_page_t m; - int pindex; - - GIANT_REQUIRED; - - CTR1(KTR_PMAP, "vmapbuf: bp = %p", bp); - - KASSERT(bp->b_flags & B_PHYS, ("vmapbuf: not user I/O")); - - va_end = bp->b_data + bp->b_bufsize; - for (va = (caddr_t)trunc_page(bp->b_data), pindex = 0; - va < va_end; - va += PAGE_SIZE, pindex++) { - vm_fault_quick((va >= bp->b_data) ? va : bp->b_data, - (bp->b_iocmd == BIO_READ) - ? (VM_PROT_READ | VM_PROT_WRITE) - : VM_PROT_READ); - pa = trunc_page(vtophys(va)); - m = PHYS_TO_VM_PAGE(pa); - vm_page_hold(m); - bp->b_pages[pindex] = m; - } - KASSERT(pindex <= btoc(MAXPHYS), - ("vmapbuf: mapped more than MAXPHYS")); - pmap_qenter((vm_offset_t)bp->b_saveaddr, bp->b_pages, pindex); - - kva = bp->b_saveaddr; - bp->b_npages = pindex; - bp->b_saveaddr = bp->b_data; - bp->b_data = kva + ((vm_offset_t)bp->b_data & PAGE_MASK); -} - -void -vunmapbuf(struct buf *bp) -{ - vm_page_t *m; - int npages; - - GIANT_REQUIRED; - - CTR1(KTR_PMAP, "vunmapbuf: bp = %p", bp); - - KASSERT(bp->b_flags & B_PHYS, ("vunmapbuf: not user I/O")); - - npages = bp->b_npages; - pmap_qremove(trunc_page(bp->b_data), npages); - m = bp->b_pages; - vm_page_lock_queues(); - while (npages--) - vm_page_unhold(*m++); - vm_page_unlock_queues(); - - bp->b_data = bp->b_saveaddr; -} - void cpu_reset(void) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 10:43:40 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CA2337B405; Sat, 8 Feb 2003 10:43:39 -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 9558337B401 for ; Sat, 8 Feb 2003 10:43:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5CF843FBF for ; Sat, 8 Feb 2003 10:43:37 -0800 (PST) (envelope-from sam@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 h18Ihbbv026316 for ; Sat, 8 Feb 2003 10:43:37 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18Ihb2b026313 for perforce@freebsd.org; Sat, 8 Feb 2003 10:43:37 -0800 (PST) Date: Sat, 8 Feb 2003 10:43:37 -0800 (PST) Message-Id: <200302081843.h18Ihb2b026313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24829 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=24829 Change 24829 by sam@sam_ebb on 2003/02/08 10:42:53 bus_dma'd em driver with rx jumbo buffers Affected files ... .. //depot/projects/em/if_em.c#1 add .. //depot/projects/em/if_em.h#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 10:46:44 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B77437B405; Sat, 8 Feb 2003 10:46: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 AC88E37B401 for ; Sat, 8 Feb 2003 10:46:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49BB743F93 for ; Sat, 8 Feb 2003 10:46:42 -0800 (PST) (envelope-from sam@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 h18Ikgbv026401 for ; Sat, 8 Feb 2003 10:46:42 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18IkfcX026398 for perforce@freebsd.org; Sat, 8 Feb 2003 10:46:41 -0800 (PST) Date: Sat, 8 Feb 2003 10:46:41 -0800 (PST) Message-Id: <200302081846.h18IkfcX026398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24830 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=24830 Change 24830 by sam@sam_ebb on 2003/02/08 10:46:16 try to cleanup improper branch Affected files ... .. //depot/projects/em/if_em.c#2 delete .. //depot/projects/em/if_em.h#2 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 11:20:26 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5543837B405; Sat, 8 Feb 2003 11:20: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 E297937B401 for ; Sat, 8 Feb 2003 11:20:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 72D6643FE3 for ; Sat, 8 Feb 2003 11:20:23 -0800 (PST) (envelope-from sam@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 h18JKNbv037585 for ; Sat, 8 Feb 2003 11:20:23 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18JKM3q037577 for perforce@freebsd.org; Sat, 8 Feb 2003 11:20:22 -0800 (PST) Date: Sat, 8 Feb 2003 11:20:22 -0800 (PST) Message-Id: <200302081920.h18JKM3q037577@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24831 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=24831 Change 24831 by sam@sam_ebb on 2003/02/08 11:19:50 integrate vendor branch with local mods Affected files ... .. //depot/projects/crypto/dev/hifn/hifn7751.c#1 branch .. //depot/projects/crypto/dev/hifn/hifn7751reg.h#1 branch .. //depot/projects/crypto/dev/hifn/hifn7751var.h#1 branch .. //depot/projects/crypto/dev/rndtest/rndtest.c#1 add .. //depot/projects/crypto/dev/rndtest/rndtest.h#1 add .. //depot/projects/crypto/dev/ubsec/ubsec.c#1 branch .. //depot/projects/crypto/dev/ubsec/ubsecreg.h#1 branch .. //depot/projects/crypto/dev/ubsec/ubsecvar.h#1 branch .. //depot/projects/crypto/hifn/hifn7751.c#1 branch .. //depot/projects/crypto/hifn/hifn7751reg.h#1 branch .. //depot/projects/crypto/hifn/hifn7751var.h#1 branch .. //depot/projects/crypto/modules/Makefile#1 add .. //depot/projects/crypto/modules/rndtest/Makefile#1 add .. //depot/projects/crypto/opencrypto/cast.c#1 branch .. //depot/projects/crypto/opencrypto/cast.h#1 branch .. //depot/projects/crypto/opencrypto/castsb.h#1 branch .. //depot/projects/crypto/opencrypto/criov.c#1 branch .. //depot/projects/crypto/opencrypto/crmbuf.c#1 branch .. //depot/projects/crypto/opencrypto/crypto.c#1 branch .. //depot/projects/crypto/opencrypto/crypto_if.m#1 branch .. //depot/projects/crypto/opencrypto/cryptodev.c#1 branch .. //depot/projects/crypto/opencrypto/cryptodev.h#1 branch .. //depot/projects/crypto/opencrypto/cryptosoft.c#1 branch .. //depot/projects/crypto/opencrypto/cryptosoft.h#1 branch .. //depot/projects/crypto/opencrypto/deflate.c#1 branch .. //depot/projects/crypto/opencrypto/deflate.h#1 branch .. //depot/projects/crypto/opencrypto/rijndael.c#1 branch .. //depot/projects/crypto/opencrypto/rijndael.h#1 branch .. //depot/projects/crypto/opencrypto/rmd160.c#1 branch .. //depot/projects/crypto/opencrypto/rmd160.h#1 branch .. //depot/projects/crypto/opencrypto/skipjack.c#1 branch .. //depot/projects/crypto/opencrypto/skipjack.h#1 branch .. //depot/projects/crypto/opencrypto/xform.c#1 branch .. //depot/projects/crypto/opencrypto/xform.h#1 branch .. //depot/projects/crypto/ubsec/ubsec.c#1 branch .. //depot/projects/crypto/ubsec/ubsecreg.h#1 branch .. //depot/projects/crypto/ubsec/ubsecvar.h#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 11:23:36 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7BFE37B405; Sat, 8 Feb 2003 11:23:28 -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 5E55A37B401 for ; Sat, 8 Feb 2003 11:23:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC01643FDF for ; Sat, 8 Feb 2003 11:23:27 -0800 (PST) (envelope-from sam@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 h18JNRbv040799 for ; Sat, 8 Feb 2003 11:23:27 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18JNRga040796 for perforce@freebsd.org; Sat, 8 Feb 2003 11:23:27 -0800 (PST) Date: Sat, 8 Feb 2003 11:23:27 -0800 (PST) Message-Id: <200302081923.h18JNRga040796@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24832 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=24832 Change 24832 by sam@sam_ebb on 2003/02/08 11:23:10 hook crypto drivers to FIPS 140-2 RNG data validater Affected files ... .. //depot/projects/crypto/dev/hifn/hifn7751.c#2 edit .. //depot/projects/crypto/dev/hifn/hifn7751var.h#2 edit .. //depot/projects/crypto/dev/ubsec/ubsec.c#2 edit .. //depot/projects/crypto/dev/ubsec/ubsecvar.h#2 edit Differences ... ==== //depot/projects/crypto/dev/hifn/hifn7751.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.9 2003/02/02 13:29:59 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.8 2003/01/21 08:55:32 alfred Exp $ */ /* $OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $ */ /* @@ -42,6 +42,7 @@ */ #define HIFN_DEBUG +#define HIFN_RNDTEST /* * Driver for the Hifn 7751 encryption processor. @@ -72,6 +73,10 @@ #include #include + +#ifdef HIFN_RNDTEST +#include +#endif #include #include @@ -109,6 +114,9 @@ DRIVER_MODULE(hifn, pci, hifn_driver, hifn_devclass, 0, 0); MODULE_DEPEND(hifn, crypto, 1, 1, 1); +#ifdef HIFN_RNDTEST +MODULE_DEPEND(hifn, rndtest, 1, 1, 1); +#endif static void hifn_reset_board(struct hifn_softc *, int); static void hifn_reset_puc(struct hifn_softc *); @@ -230,6 +238,12 @@ return "Unknown-vendor unknown-part"; } +static void +default_harvest(struct rndtest_state *rsp, void *buf, u_int count) +{ + random_harvest(buf, count, count*NBBY, 0, RANDOM_PURE); +} + /* * Attach an interface that successfully probed. */ @@ -621,6 +635,16 @@ u_int32_t r; int i; +#ifdef HIFN_RNDTEST + sc->sc_rndtest = rndtest_attach(sc->sc_dev); + if (sc->sc_rndtest) + sc->sc_harvest = rndtest_harvest; + else + sc->sc_harvest = default_harvest; +#else + sc->sc_harvest = default_harvest; +#endif + if ((sc->sc_flags & HIFN_IS_7811) == 0) { /* Reset 7951 public key/rng engine */ WRITE_REG_1(sc, HIFN_1_PUB_RESET, @@ -705,7 +729,8 @@ if (sc->sc_rngfirst) sc->sc_rngfirst = 0; else - random_harvest(num, RANDOM_BITS(2), RANDOM_PURE); + (*sc->sc_harvest)(sc->sc_rndtest, + num, sizeof (num)); } } else { num[0] = READ_REG_1(sc, HIFN_1_RNG_DATA); @@ -714,7 +739,8 @@ if (sc->sc_rngfirst) sc->sc_rngfirst = 0; else - random_harvest(num, RANDOM_BITS(1), RANDOM_PURE); + (*sc->sc_harvest)(sc->sc_rndtest, + num, sizeof (num[0])); } callout_reset(&sc->sc_rngto, sc->sc_rnghz, hifn_rng, sc); @@ -1362,6 +1388,7 @@ static u_int hifn_write_command(struct hifn_command *cmd, u_int8_t *buf) { +#define MIN(a,b) ((a)<(b)?(a):(b)) u_int8_t *buf_pos; hifn_base_command_t *base_cmd; hifn_mac_command_t *mac_cmd; @@ -1455,6 +1482,7 @@ } return (buf_pos - buf); +#undef MIN } static int ==== //depot/projects/crypto/dev/hifn/hifn7751var.h#2 (text+ko) ==== @@ -133,6 +133,8 @@ #define HS_STATE_USED 1 /* allocated, but key not on card */ #define HS_STATE_KEY 2 /* allocated and key is on card */ +struct rndstate_test; + /* * Holds data specific to a single HIFN board. */ @@ -180,6 +182,9 @@ int sc_curbatch; /* # ops submitted w/o int */ int sc_suspended; struct hifn_session sc_sessions[2048]; + struct rndtest_state *sc_rndtest; /* RNG test state */ + void (*sc_harvest)(struct rndtest_state *, + void *, u_int); }; #define HIFN_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) ==== //depot/projects/crypto/dev/ubsec/ubsec.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.14 2003/02/07 23:02:02 sam Exp $ */ +/* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.13 2003/01/21 08:55:43 alfred Exp $ */ /* $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $ */ /* @@ -41,6 +41,7 @@ */ #define UBSEC_DEBUG +#define UBSEC_RNDTEST /* * uBsec 5[56]01, 58xx hardware crypto accelerator @@ -89,6 +90,9 @@ #define letoh16(x) le16toh(x) #define letoh32(x) le32toh(x) +#ifdef UBSEC_RNDTEST +#include +#endif #include #include @@ -126,6 +130,9 @@ DRIVER_MODULE(ubsec, pci, ubsec_driver, ubsec_devclass, 0, 0); MODULE_DEPEND(ubsec, crypto, 1, 1, 1); +#ifdef UBSEC_RNDTEST +MODULE_DEPEND(ubsec, rndtest, 1, 1, 1); +#endif static void ubsec_intr(void *); static int ubsec_newsession(void *, u_int32_t *, struct cryptoini *); @@ -246,6 +253,12 @@ return "Unknown-vendor unknown-part"; } +static void +default_harvest(struct rndtest_state *rsp, void *buf, u_int count) +{ + random_harvest(buf, count, count*NBBY, 0, RANDOM_PURE); +} + static int ubsec_attach(device_t dev) { @@ -419,6 +432,15 @@ #ifndef UBSEC_NO_RNG if (sc->sc_flags & UBS_FLAGS_RNG) { sc->sc_statmask |= BS_STAT_MCR2_DONE; +#ifdef UBSEC_RNDTEST + sc->sc_rndtest = rndtest_attach(dev); + if (sc->sc_rndtest) + sc->sc_harvest = rndtest_harvest; + else + sc->sc_harvest = default_harvest; +#else + sc->sc_harvest = default_harvest; +#endif if (ubsec_dma_malloc(sc, sizeof(struct ubsec_mcr), &sc->sc_rng.rng_q.q_mcr, 0)) @@ -491,6 +513,11 @@ crypto_unregister_all(sc->sc_cid); +#ifdef UBSEC_RNDTEST + if (sc->sc_rndtest) + rndtest_detach(sc->sc_rndtest); +#endif + while (!SIMPLEQ_EMPTY(&sc->sc_freequeue)) { struct ubsec_q *q; @@ -1669,14 +1696,14 @@ switch (q->q_type) { #ifndef UBSEC_NO_RNG + case UBS_CTXOP_RNGSHA1: case UBS_CTXOP_RNGBYPASS: { struct ubsec_q2_rng *rng = (struct ubsec_q2_rng *)q; ubsec_dma_sync(&rng->rng_buf, BUS_DMASYNC_POSTREAD); - random_harvest(rng->rng_buf.dma_vaddr, - UBSEC_RNG_BUFSIZ*sizeof (u_int32_t), - UBSEC_RNG_BUFSIZ*sizeof (u_int32_t)*NBBY, 0, - RANDOM_PURE); + (*sc->sc_harvest)(sc->sc_rndtest, + rng->rng_buf.dma_vaddr, + UBSEC_RNG_BUFSIZ*sizeof (u_int32_t)); rng->rng_used = 0; callout_reset(&sc->sc_rngto, sc->sc_rnghz, ubsec_rng, sc); break; @@ -1786,8 +1813,13 @@ mcr->mcr_opktbuf.pb_next = 0; ctx->rbp_len = htole16(sizeof(struct ubsec_ctx_rngbypass)); +#ifdef notdef + ctx->rbp_op = htole16(UBS_CTXOP_RNGSHA1); + rng->rng_q.q_type = UBS_CTXOP_RNGSHA1; +#else ctx->rbp_op = htole16(UBS_CTXOP_RNGBYPASS); rng->rng_q.q_type = UBS_CTXOP_RNGBYPASS; +#endif ubsec_dma_sync(&rng->rng_buf, BUS_DMASYNC_PREREAD); ==== //depot/projects/crypto/dev/ubsec/ubsecvar.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ubsec/ubsecvar.h,v 1.5 2003/02/07 21:44:52 sam Exp $ */ +/* $FreeBSD: src/sys/dev/ubsec/ubsecvar.h,v 1.4 2003/01/06 21:23:06 sam Exp $ */ /* $OpenBSD: ubsecvar.h,v 1.35 2002/09/24 18:33:26 jason Exp $ */ /* @@ -53,8 +53,6 @@ #define UBS_DEF_TOUT 0xff /* PCI TRDY Timeout */ #define UBS_DEF_CACHELINE 0x01 /* Cache Line setting */ -#ifdef _KERNEL - struct ubsec_dma_alloc { u_int32_t dma_paddr; caddr_t dma_vaddr; @@ -174,6 +172,8 @@ #define q_dst_segs q_dst.segs #define q_dst_mapsize q_dst.mapsize +struct rndstate_test; + struct ubsec_softc { device_t sc_dev; /* device backpointer */ struct mtx sc_mtx; /* per-driver lock */ @@ -204,6 +204,9 @@ struct ubsec_dma sc_dmaa[UBS_MAX_NQUEUE]; struct ubsec_q *sc_queuea[UBS_MAX_NQUEUE]; SIMPLEQ_HEAD(,ubsec_q2) sc_q2free; /* free list */ + struct rndtest_state *sc_rndtest; /* RNG test state */ + void (*sc_harvest)(struct rndtest_state *, + void *, u_int); }; #define UBSEC_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) @@ -218,7 +221,6 @@ u_int32_t ses_hmouter[5]; /* hmac outer state */ u_int32_t ses_iv[2]; /* [3]DES iv */ }; -#endif /* _KERNEL */ struct ubsec_stats { u_int64_t hst_ibytes; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 11:40:52 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44D1537B405; Sat, 8 Feb 2003 11:40: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 E982C37B401 for ; Sat, 8 Feb 2003 11:40:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CD8243FDD for ; Sat, 8 Feb 2003 11:40:50 -0800 (PST) (envelope-from sam@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 h18Jenbv045457 for ; Sat, 8 Feb 2003 11:40:49 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18JenYG045449 for perforce@freebsd.org; Sat, 8 Feb 2003 11:40:49 -0800 (PST) Date: Sat, 8 Feb 2003 11:40:49 -0800 (PST) Message-Id: <200302081940.h18JenYG045449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24834 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=24834 Change 24834 by sam@sam_ebb on 2003/02/08 11:40:12 delete misplaced files Affected files ... .. //depot/projects/crypto/hifn/hifn7751.c#2 delete .. //depot/projects/crypto/hifn/hifn7751reg.h#2 delete .. //depot/projects/crypto/hifn/hifn7751var.h#2 delete .. //depot/projects/crypto/ubsec/ubsec.c#2 delete .. //depot/projects/crypto/ubsec/ubsecreg.h#2 delete .. //depot/projects/crypto/ubsec/ubsecvar.h#2 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 11:49: 3 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7B3237B405; Sat, 8 Feb 2003 11:49:01 -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 6071337B401 for ; Sat, 8 Feb 2003 11:49:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1168D43F85 for ; Sat, 8 Feb 2003 11:49:01 -0800 (PST) (envelope-from sam@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 h18Jn0bv048257 for ; Sat, 8 Feb 2003 11:49:00 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18Jn0U0048254 for perforce@freebsd.org; Sat, 8 Feb 2003 11:49:00 -0800 (PST) Date: Sat, 8 Feb 2003 11:49:00 -0800 (PST) Message-Id: <200302081949.h18Jn0U0048254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24836 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=24836 Change 24836 by sam@sam_ebb on 2003/02/08 11:48:09 populate wlan development branch Affected files ... .. //depot/projects/wlan/sys/dev/wi/if_wavelan_ieee.h#1 branch .. //depot/projects/wlan/sys/dev/wi/if_wi.c#1 branch .. //depot/projects/wlan/sys/dev/wi/if_wi_pccard.c#1 branch .. //depot/projects/wlan/sys/dev/wi/if_wi_pci.c#1 branch .. //depot/projects/wlan/sys/dev/wi/if_wireg.h#1 branch .. //depot/projects/wlan/sys/dev/wi/if_wivar.h#1 branch .. //depot/projects/wlan/sys/dev/wi/spectrum24t_cf.h#1 branch .. //depot/projects/wlan/sys/net/if_ieee80211.h#1 branch .. //depot/projects/wlan/sys/net/if_ieee80211subr.c#1 branch .. //depot/projects/wlan/usr.sbin/wicontrol/Makefile#1 branch .. //depot/projects/wlan/usr.sbin/wicontrol/wicontrol.8#1 branch .. //depot/projects/wlan/usr.sbin/wicontrol/wicontrol.c#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 12: 6:25 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB2AD37B405; Sat, 8 Feb 2003 12:06:23 -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 63C8537B401 for ; Sat, 8 Feb 2003 12:06:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 003E843FA3 for ; Sat, 8 Feb 2003 12:06:23 -0800 (PST) (envelope-from sam@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 h18K6Mbv055509 for ; Sat, 8 Feb 2003 12:06:22 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18K6Me5055506 for perforce@freebsd.org; Sat, 8 Feb 2003 12:06:22 -0800 (PST) Date: Sat, 8 Feb 2003 12:06:22 -0800 (PST) Message-Id: <200302082006.h18K6Me5055506@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24838 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=24838 Change 24838 by sam@sam_ebb on 2003/02/08 12:06:10 remove extraneous return Affected files ... .. //depot/projects/wlan/sys/net/if_ieee80211subr.c#2 edit Differences ... ==== //depot/projects/wlan/sys/net/if_ieee80211subr.c#2 (text+ko) ==== @@ -3188,7 +3188,6 @@ break; case WI_RID_CUR_TX_RATE: return EPERM; - break; case WI_RID_RTS_THRESH: if (wreq.wi_len != 1) return EINVAL; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 12: 7:35 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C290C37B405; Sat, 8 Feb 2003 12:07:25 -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 70A0E37B401 for ; Sat, 8 Feb 2003 12:07:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD07A43F3F for ; Sat, 8 Feb 2003 12:07:24 -0800 (PST) (envelope-from sam@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 h18K7Obv055531 for ; Sat, 8 Feb 2003 12:07:24 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18K7OLg055527 for perforce@freebsd.org; Sat, 8 Feb 2003 12:07:24 -0800 (PST) Date: Sat, 8 Feb 2003 12:07:24 -0800 (PST) Message-Id: <200302082007.h18K7OLg055527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24839 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=24839 Change 24839 by sam@sam_ebb on 2003/02/08 12:07:17 partial fix to dstumbler problem: return previous AP scanning interface revert wicontrol to use previous AP scanning interface Affected files ... .. //depot/projects/wlan/sys/dev/wi/if_wi.c#2 edit .. //depot/projects/wlan/usr.sbin/wicontrol/wicontrol.c#2 edit Differences ... ==== //depot/projects/wlan/sys/dev/wi/if_wi.c#2 (text+ko) ==== @@ -113,7 +113,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.128 2003/02/02 06:35:46 imp Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.127 2003/01/21 08:55:45 alfred Exp $"; #endif static void wi_start(struct ifnet *); @@ -147,7 +147,7 @@ static int wi_newstate(void *, enum ieee80211_state); -static int wi_scan_ap(struct wi_softc *); +static int wi_scan_ap(struct wi_softc *, u_int16_t, u_int16_t); static void wi_scan_result(struct wi_softc *, int, int); static void wi_dump_pkt(struct wi_frame *, struct ieee80211_node *, int rssi); @@ -782,8 +782,8 @@ if_printf(ifp, "interface not running\n"); wi_stop(ifp, 0); } + DPRINTF(("wi_init: return %d\n", error)); WI_UNLOCK(sc); - DPRINTF(("wi_init: return %d\n", error)); return; } @@ -1345,6 +1345,14 @@ len = le16toh(frmhdr.wi_dat_len); off = ALIGN(sizeof(struct ieee80211_frame)); + if (off + len > MCLBYTES) { + CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); + ifp->if_ierrors++; + DPRINTF(("wi_rx_intr: oversized packet (off %u len %u)\n", + off, len)); + return; + } + MGETHDR(m, M_NOWAIT, MT_DATA); if (m == NULL) { CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); @@ -1496,6 +1504,7 @@ fid = CSR_READ_2(sc, WI_INFO_FID); wi_read_bap(sc, fid, 0, ltbuf, sizeof(ltbuf)); + DPRINTF(("wi_info_intr: type 0x%x\n", le16toh(ltbuf[1]))); switch (le16toh(ltbuf[1])) { case WI_INFO_LINK_STAT: @@ -1695,7 +1704,8 @@ struct ieee80211com *ic = &sc->sc_ic; struct ifreq *ifr = (struct ifreq *)data; struct wi_req wreq; - int len, n, error, mif, val; + struct wi_scan_res *res; + int len, n, error, mif, val, off, i; error = copyin(ifr->ifr_data, &wreq, sizeof(wreq)); if (error) @@ -1773,7 +1783,6 @@ break; case WI_RID_READ_APS: - case WI_RID_SCAN_RES: /* XXX */ if (ic->ic_opmode == IEEE80211_M_HOSTAP) return ieee80211_cfgget(ifp, cmd, data); if (sc->sc_scan_timer > 0) { @@ -1814,6 +1823,57 @@ case WI_RID_READ_CACHE: return ieee80211_cfgget(ifp, cmd, data); + case WI_RID_SCAN_RES: /* compatibility interface */ + if (ic->ic_opmode == IEEE80211_M_HOSTAP) + return ieee80211_cfgget(ifp, cmd, data); + if (sc->sc_scan_timer > 0) { + error = EINPROGRESS; + break; + } + n = sc->sc_naps; + off = sc->sc_firmware_type != WI_LUCENT ? + sizeof(struct wi_scan_p2_hdr) : 0; + if (len < off + sizeof(struct wi_scan_res) * n) + n = (len - off) / sizeof(struct wi_scan_res); + len = off + sizeof(struct wi_scan_res) * n; + if (off != 0) { + struct wi_scan_p2_hdr *p2 = (struct wi_scan_p2_hdr *)wreq.wi_val; + /* + * Prepend Prism-specific header. + */ + if (len < sizeof(struct wi_scan_p2_hdr)) { + error = ENOSPC; + break; + } + p2 = (struct wi_scan_p2_hdr *)wreq.wi_val; + p2->wi_rsvd = 0; + p2->wi_reason = n; /* XXX */ + } + for (i = 0; i < n; i++) { + const struct wi_apinfo *ap = &sc->sc_aps[i]; + + res = (struct wi_scan_res *)((char *)wreq.wi_val + off); + res->wi_chan = ap->channel; + res->wi_noise = ap->noise; + res->wi_signal = ap->signal; + IEEE80211_ADDR_COPY(res->wi_bssid, ap->bssid); + res->wi_interval = ap->interval; + res->wi_capinfo = ap->capinfo; + res->wi_ssid_len = ap->namelen; + memcpy(res->wi_ssid, ap->name, + IEEE80211_NWID_LEN); + if (sc->sc_firmware_type != WI_LUCENT) { + /* XXX not saved from Prism cards */ + memset(res->wi_srates, 0, + sizeof(res->wi_srates)); + res->wi_rate = ap->rate; + res->wi_rsvd = 0; + off += WI_PRISM2_RES_SIZE; + } else + off += WI_WAVELAN_RES_SIZE; + } + break; + default: if (sc->sc_enabled) { error = wi_read_rid(sc, wreq.wi_type, wreq.wi_val, @@ -1867,7 +1927,7 @@ error = copyin(ifr->ifr_data, &wreq, sizeof(wreq)); if (error) return error; - len = (wreq.wi_len - 1) * 2; + len = wreq.wi_len ? (wreq.wi_len - 1) * 2 : 0; switch (wreq.wi_type) { case WI_RID_DBM_ADJUST: return ENODEV; @@ -1960,7 +2020,12 @@ case WI_RID_SCAN_APS: if (sc->sc_enabled && ic->ic_opmode != IEEE80211_M_HOSTAP) - error = wi_scan_ap(sc); + error = wi_scan_ap(sc, 0x3fff, 0x000f); + break; + + case WI_RID_SCAN_REQ: /* compatibility interface */ + if (sc->sc_enabled && ic->ic_opmode != IEEE80211_M_HOSTAP) + error = wi_scan_ap(sc, wreq.wi_val[0], wreq.wi_val[1]); break; case WI_RID_MGMT_XMIT: @@ -1990,6 +2055,18 @@ case WI_RID_PROCFRAME: /* ignore for compatibility */ break; + case WI_RID_OWN_SSID: + if (le16toh(wreq.wi_val[0]) * 2 > len || + le16toh(wreq.wi_val[0]) > IEEE80211_NWID_LEN) { + error = ENOSPC; + break; + } + memset(ic->ic_des_essid, 0, IEEE80211_NWID_LEN); + ic->ic_des_esslen = le16toh(wreq.wi_val[0]) * 2; + memcpy(ic->ic_des_essid, &wreq.wi_val[1], ic->ic_des_esslen); + error = ENETRESET; + break; + default: if (sc->sc_enabled) { error = wi_write_rid(sc, wreq.wi_type, wreq.wi_val, @@ -2478,7 +2555,7 @@ } static int -wi_scan_ap(struct wi_softc *sc) +wi_scan_ap(struct wi_softc *sc, u_int16_t chanmask, u_int16_t txrate) { int error = 0; u_int16_t val[2]; @@ -2490,8 +2567,8 @@ (void)wi_cmd(sc, WI_CMD_INQUIRE, WI_INFO_SCAN_RESULTS, 0, 0); break; case WI_INTERSIL: - val[0] = 0x3fff; /* channel */ - val[1] = 0x000f; /* tx rate */ + val[0] = chanmask; /* channel */ + val[1] = txrate; /* tx rate */ error = wi_write_rid(sc, WI_RID_SCAN_REQ, val, sizeof(val)); break; case WI_SYMBOL: @@ -2506,7 +2583,8 @@ if (error == 0) { sc->sc_scan_timer = WI_SCAN_WAIT; sc->sc_ic.ic_if.if_timer = 1; - DPRINTF(("wi_scan_ap: start scanning\n")); + DPRINTF(("wi_scan_ap: start scanning, " + "chamask 0x%x txrate 0x%x\n, chanmask, txrate")); } return error; } ==== //depot/projects/wlan/usr.sbin/wicontrol/wicontrol.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\ Bill Paul. All rights reserved."; static const char rcsid[] = - "$FreeBSD: src/usr.sbin/wicontrol/wicontrol.c,v 1.32 2003/01/21 07:28:57 mdodd Exp $"; + "$FreeBSD: src/usr.sbin/wicontrol/wicontrol.c,v 1.29 2002/10/08 19:41:12 jhb Exp $"; #endif /* not lint */ #include @@ -67,10 +67,10 @@ static void wi_setbytes(const char *, int, char *, int); static void wi_setword(const char *, int, int); static void wi_sethex(const char *, int, char *); +static void wi_printaps(struct wi_req *); static void wi_printwords(struct wi_req *); static void wi_printbool(struct wi_req *); static void wi_printhex(struct wi_req *); -static void wi_printaps(struct wi_req *); static void wi_dumpinfo(const char *); static void wi_dumpstats(const char *); static void wi_setkeys(const char *, char *, int); @@ -495,10 +495,10 @@ return; } -static int +static float get_wiaprate(int inrate) { - int rate; + float rate; switch (inrate) { case WI_APRATE_1: @@ -527,11 +527,11 @@ void wi_printaplist(const char *iface) { - int prism2; + int prism2, len, i = 0, j; struct wi_req wreq; - struct wi_apinfo *w; - int i, nstations; - float rate; + struct wi_scan_p2_hdr *wi_p2_h; + struct wi_scan_res *res; + float rate; if (!quiet) printf("Available APs:\n"); @@ -544,8 +544,13 @@ prism2 = wreq.wi_val[0]; /* send out a scan request */ - wreq.wi_len = 1; - wreq.wi_type = WI_RID_SCAN_APS; + wreq.wi_len = prism2 ? 3 : 1; + wreq.wi_type = WI_RID_SCAN_REQ; + + if (prism2) { + wreq.wi_val[0] = 0x3FFF; + wreq.wi_val[1] = 0x000F; + } wi_setval(iface, &wreq); @@ -561,34 +566,58 @@ wreq.wi_type = WI_RID_SCAN_RES; } while (wi_getval(iface, &wreq) == -1 && errno == EINPROGRESS); - nstations = *(int *)wreq.wi_val; + if (prism2) { + wi_p2_h = (struct wi_scan_p2_hdr *)wreq.wi_val; + + /* if the reason is 0, this info is invalid */ + if (wi_p2_h->wi_reason == 0) + return; + + i = 4; + } + + len = prism2 ? WI_PRISM2_RES_SIZE : WI_WAVELAN_RES_SIZE; + if (!quiet) { + int nstations = ((wreq.wi_len * 2) - i) / len; printf("%d station%s:\n", nstations, nstations == 1 ? "" : "s"); printf("SSID BSSID Chan SN S N Intrvl Capinfo\n"); } - w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); - for ( i = 0; i < nstations; i++, w++) { - printf("%-20.*s %02x:%02x:%02x:%02x:%02x:%02x %-2d " - "[ %3d %3d %3d ] %-3d " - , w->namelen, w->name - , w->bssid[0]&0xff, w->bssid[1]&0xff - , w->bssid[2]&0xff, w->bssid[3]&0xff - , w->bssid[4]&0xff, w->bssid[5]&0xff - , w->channel - , w->quality, w->signal, w->noise - , w->interval - ); + for (; i < (wreq.wi_len * 2) - len; i += len) { + res = (struct wi_scan_res *)((char *)wreq.wi_val + i); + + res->wi_ssid[res->wi_ssid_len] = '\0'; + + printf(" %-8s [ %02x:%02x:%02x:%02x:%02x:%02x ] [ %-2d ] " + "[ %d %d %d ] %-3d ", res->wi_ssid, + res->wi_bssid[0], res->wi_bssid[1], res->wi_bssid[2], + res->wi_bssid[3], res->wi_bssid[4], res->wi_bssid[5], + res->wi_chan, res->wi_signal - res->wi_noise, + res->wi_signal, res->wi_noise, res->wi_interval); - if (!quiet) { + if (!quiet && res->wi_capinfo) { printf("[ "); - if (w->capinfo & IEEE80211_CAPINFO_ESS) - printf("ESS "); - if (w->capinfo & IEEE80211_CAPINFO_PRIVACY) - printf("WEP "); - printf("]\n "); + if (res->wi_capinfo & WI_CAPINFO_ESS) + printf("ess "); + if (res->wi_capinfo & WI_CAPINFO_IBSS) + printf("ibss "); + if (res->wi_capinfo & WI_CAPINFO_PRIV) + printf("priv "); + printf("] "); + } - rate = get_wiaprate(w->rate); - if (rate) printf("* %2.1f *\n", rate); + if (prism2 && res->wi_srates[0] != 0) { + printf("\n [ "); + for (j = 0; res->wi_srates[j] != 0; j++) { + res->wi_srates[j] = res->wi_srates[j] & + WI_VAR_SRATES_MASK; + printf("%d.%d ", res->wi_srates[j] / 2, + (res->wi_srates[j] % 2) * 5); + } + printf("] "); + rate = get_wiaprate(res->wi_rate); + if (rate) + printf("* %2.1f *\n", rate); } putchar('\n'); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 12:13:35 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A235637B401; Sat, 8 Feb 2003 12:13: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 4D2C537B401 for ; Sat, 8 Feb 2003 12:13:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F07F143FAF for ; Sat, 8 Feb 2003 12:13:32 -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 h18KDWbv059022 for ; Sat, 8 Feb 2003 12:13:32 -0800 (PST) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18KDWOk059019 for perforce@freebsd.org; Sat, 8 Feb 2003 12:13:32 -0800 (PST) Date: Sat, 8 Feb 2003 12:13:32 -0800 (PST) Message-Id: <200302082013.h18KDWOk059019@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 24840 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=24840 Change 24840 by des@des.at.des.thinksec.com on 2003/02/08 12:13:00 Apparently, nobody ever uses pam_getenv(3), because nobody has ever complained that it didn't work. Make it return a pointer to the actual value of the requested environment variable. Affected files ... .. //depot/projects/openpam/lib/pam_getenv.c#12 edit Differences ... ==== //depot/projects/openpam/lib/pam_getenv.c#12 (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_getenv.c#11 $ + * $P4: //depot/projects/openpam/lib/pam_getenv.c#12 $ */ #include @@ -62,7 +62,12 @@ RETURNS(NULL); if ((i = openpam_findenv(pamh, name, strlen(name))) == -1) RETURNS(NULL); - str = strdup(pamh->env[i]); + for (str = pamh->env[i]; *str != '\0'; ++str) { + if (*str == '=') { + ++str; + break; + } + } RETURNS(str); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 12:22:51 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD35D37B405; Sat, 8 Feb 2003 12:22:45 -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 527BC37B401 for ; Sat, 8 Feb 2003 12:22:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C618043FA3 for ; Sat, 8 Feb 2003 12:22:44 -0800 (PST) (envelope-from sam@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 h18KMibv062463 for ; Sat, 8 Feb 2003 12:22:44 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18KMiaQ062457 for perforce@freebsd.org; Sat, 8 Feb 2003 12:22:44 -0800 (PST) Date: Sat, 8 Feb 2003 12:22:44 -0800 (PST) Message-Id: <200302082022.h18KMiaQ062457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24841 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=24841 Change 24841 by sam@sam_ebb on 2003/02/08 12:22:04 populate branch Affected files ... .. //depot/projects/pfil/contrib/ipfilter/netinet/IPFILTER.LICENCE#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/QNX_OCL.txt#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/fil.c#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_auth.c#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_auth.h#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_compat.h#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_fil.c#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_fil.h#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_frag.c#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_frag.h#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_ftp_pxy.c#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_ipsec_pxy.c#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_log.c#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_nat.c#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_nat.h#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_netbios_pxy.c#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_proxy.c#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_proxy.h#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_raudio_pxy.c#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_rcmd_pxy.c#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_state.c#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ip_state.h#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/ipl.h#1 branch .. //depot/projects/pfil/contrib/ipfilter/netinet/mlfk_ipl.c#1 branch .. //depot/projects/pfil/net/bpf.c#1 branch .. //depot/projects/pfil/net/bpf.h#1 branch .. //depot/projects/pfil/net/bpf_compat.h#1 branch .. //depot/projects/pfil/net/bpf_filter.c#1 branch .. //depot/projects/pfil/net/bpfdesc.h#1 branch .. //depot/projects/pfil/net/bridge.c#1 branch .. //depot/projects/pfil/net/bridge.h#1 branch .. //depot/projects/pfil/net/bsd_comp.c#1 branch .. //depot/projects/pfil/net/ethernet.h#1 branch .. //depot/projects/pfil/net/fddi.h#1 branch .. //depot/projects/pfil/net/if.c#1 branch .. //depot/projects/pfil/net/if.h#1 branch .. //depot/projects/pfil/net/if_arc.h#1 branch .. //depot/projects/pfil/net/if_arcsubr.c#1 branch .. //depot/projects/pfil/net/if_arp.h#1 branch .. //depot/projects/pfil/net/if_atm.h#1 branch .. //depot/projects/pfil/net/if_atmsubr.c#1 branch .. //depot/projects/pfil/net/if_disc.c#1 branch .. //depot/projects/pfil/net/if_dl.h#1 branch .. //depot/projects/pfil/net/if_ef.c#1 branch .. //depot/projects/pfil/net/if_ethersubr.c#1 branch .. //depot/projects/pfil/net/if_faith.c#1 branch .. //depot/projects/pfil/net/if_fddisubr.c#1 branch .. //depot/projects/pfil/net/if_gif.c#1 branch .. //depot/projects/pfil/net/if_gif.h#1 branch .. //depot/projects/pfil/net/if_gre.c#1 branch .. //depot/projects/pfil/net/if_gre.h#1 branch .. //depot/projects/pfil/net/if_ieee80211.h#1 branch .. //depot/projects/pfil/net/if_ieee80211subr.c#1 branch .. //depot/projects/pfil/net/if_iso88025subr.c#1 branch .. //depot/projects/pfil/net/if_llc.h#1 branch .. //depot/projects/pfil/net/if_loop.c#1 branch .. //depot/projects/pfil/net/if_media.c#1 branch .. //depot/projects/pfil/net/if_media.h#1 branch .. //depot/projects/pfil/net/if_mib.c#1 branch .. //depot/projects/pfil/net/if_mib.h#1 branch .. //depot/projects/pfil/net/if_ppp.c#1 branch .. //depot/projects/pfil/net/if_ppp.h#1 branch .. //depot/projects/pfil/net/if_pppvar.h#1 branch .. //depot/projects/pfil/net/if_sl.c#1 branch .. //depot/projects/pfil/net/if_slvar.h#1 branch .. //depot/projects/pfil/net/if_sppp.h#1 branch .. //depot/projects/pfil/net/if_spppsubr.c#1 branch .. //depot/projects/pfil/net/if_stf.c#1 branch .. //depot/projects/pfil/net/if_stf.h#1 branch .. //depot/projects/pfil/net/if_tap.c#1 branch .. //depot/projects/pfil/net/if_tap.h#1 branch .. //depot/projects/pfil/net/if_tapvar.h#1 branch .. //depot/projects/pfil/net/if_tun.c#1 branch .. //depot/projects/pfil/net/if_tun.h#1 branch .. //depot/projects/pfil/net/if_tunvar.h#1 branch .. //depot/projects/pfil/net/if_types.h#1 branch .. //depot/projects/pfil/net/if_var.h#1 branch .. //depot/projects/pfil/net/if_vlan.c#1 branch .. //depot/projects/pfil/net/if_vlan_var.h#1 branch .. //depot/projects/pfil/net/intrq.c#1 branch .. //depot/projects/pfil/net/intrq.h#1 branch .. //depot/projects/pfil/net/iso88025.h#1 branch .. //depot/projects/pfil/net/net_osdep.c#1 branch .. //depot/projects/pfil/net/net_osdep.h#1 branch .. //depot/projects/pfil/net/netisr.c#1 branch .. //depot/projects/pfil/net/netisr.h#1 branch .. //depot/projects/pfil/net/pfil.c#1 branch .. //depot/projects/pfil/net/pfil.h#1 branch .. //depot/projects/pfil/net/pfkeyv2.h#1 branch .. //depot/projects/pfil/net/ppp_comp.h#1 branch .. //depot/projects/pfil/net/ppp_deflate.c#1 branch .. //depot/projects/pfil/net/ppp_defs.h#1 branch .. //depot/projects/pfil/net/ppp_tty.c#1 branch .. //depot/projects/pfil/net/radix.c#1 branch .. //depot/projects/pfil/net/radix.h#1 branch .. //depot/projects/pfil/net/raw_cb.c#1 branch .. //depot/projects/pfil/net/raw_cb.h#1 branch .. //depot/projects/pfil/net/raw_usrreq.c#1 branch .. //depot/projects/pfil/net/route.c#1 branch .. //depot/projects/pfil/net/route.h#1 branch .. //depot/projects/pfil/net/rtsock.c#1 branch .. //depot/projects/pfil/net/slcompress.c#1 branch .. //depot/projects/pfil/net/slcompress.h#1 branch .. //depot/projects/pfil/net/slip.h#1 branch .. //depot/projects/pfil/net/zlib.c#1 branch .. //depot/projects/pfil/net/zlib.h#1 branch .. //depot/projects/pfil/netinet/accf_data.c#1 branch .. //depot/projects/pfil/netinet/accf_http.c#1 branch .. //depot/projects/pfil/netinet/icmp6.h#1 branch .. //depot/projects/pfil/netinet/icmp_var.h#1 branch .. //depot/projects/pfil/netinet/if_atm.c#1 branch .. //depot/projects/pfil/netinet/if_atm.h#1 branch .. //depot/projects/pfil/netinet/if_ether.c#1 branch .. //depot/projects/pfil/netinet/if_ether.h#1 branch .. //depot/projects/pfil/netinet/igmp.c#1 branch .. //depot/projects/pfil/netinet/igmp.h#1 branch .. //depot/projects/pfil/netinet/igmp_var.h#1 branch .. //depot/projects/pfil/netinet/in.c#1 branch .. //depot/projects/pfil/netinet/in.h#1 branch .. //depot/projects/pfil/netinet/in_cksum.c#1 branch .. //depot/projects/pfil/netinet/in_gif.c#1 branch .. //depot/projects/pfil/netinet/in_gif.h#1 branch .. //depot/projects/pfil/netinet/in_pcb.c#1 branch .. //depot/projects/pfil/netinet/in_pcb.h#1 branch .. //depot/projects/pfil/netinet/in_proto.c#1 branch .. //depot/projects/pfil/netinet/in_rmx.c#1 branch .. //depot/projects/pfil/netinet/in_systm.h#1 branch .. //depot/projects/pfil/netinet/in_var.h#1 branch .. //depot/projects/pfil/netinet/ip.h#1 branch .. //depot/projects/pfil/netinet/ip6.h#1 branch .. //depot/projects/pfil/netinet/ip_divert.c#1 branch .. //depot/projects/pfil/netinet/ip_dummynet.c#1 branch .. //depot/projects/pfil/netinet/ip_dummynet.h#1 branch .. //depot/projects/pfil/netinet/ip_ecn.c#1 branch .. //depot/projects/pfil/netinet/ip_ecn.h#1 branch .. //depot/projects/pfil/netinet/ip_encap.c#1 branch .. //depot/projects/pfil/netinet/ip_encap.h#1 branch .. //depot/projects/pfil/netinet/ip_flow.c#1 branch .. //depot/projects/pfil/netinet/ip_flow.h#1 branch .. //depot/projects/pfil/netinet/ip_fw.c#1 branch .. //depot/projects/pfil/netinet/ip_fw.h#1 branch .. //depot/projects/pfil/netinet/ip_fw2.c#1 branch .. //depot/projects/pfil/netinet/ip_gre.c#1 branch .. //depot/projects/pfil/netinet/ip_gre.h#1 branch .. //depot/projects/pfil/netinet/ip_icmp.c#1 branch .. //depot/projects/pfil/netinet/ip_icmp.h#1 branch .. //depot/projects/pfil/netinet/ip_id.c#1 branch .. //depot/projects/pfil/netinet/ip_input.c#1 branch .. //depot/projects/pfil/netinet/ip_mroute.c#1 branch .. //depot/projects/pfil/netinet/ip_mroute.h#1 branch .. //depot/projects/pfil/netinet/ip_output.c#1 branch .. //depot/projects/pfil/netinet/ip_var.h#1 branch .. //depot/projects/pfil/netinet/ipprotosw.h#1 branch .. //depot/projects/pfil/netinet/raw_ip.c#1 branch .. //depot/projects/pfil/netinet/tcp.h#1 branch .. //depot/projects/pfil/netinet/tcp_debug.c#1 branch .. //depot/projects/pfil/netinet/tcp_debug.h#1 branch .. //depot/projects/pfil/netinet/tcp_fsm.h#1 branch .. //depot/projects/pfil/netinet/tcp_input.c#1 branch .. //depot/projects/pfil/netinet/tcp_output.c#1 branch .. //depot/projects/pfil/netinet/tcp_seq.h#1 branch .. //depot/projects/pfil/netinet/tcp_subr.c#1 branch .. //depot/projects/pfil/netinet/tcp_syncache.c#1 branch .. //depot/projects/pfil/netinet/tcp_timer.c#1 branch .. //depot/projects/pfil/netinet/tcp_timer.h#1 branch .. //depot/projects/pfil/netinet/tcp_usrreq.c#1 branch .. //depot/projects/pfil/netinet/tcp_var.h#1 branch .. //depot/projects/pfil/netinet/tcpip.h#1 branch .. //depot/projects/pfil/netinet/udp.h#1 branch .. //depot/projects/pfil/netinet/udp_usrreq.c#1 branch .. //depot/projects/pfil/netinet/udp_var.h#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 12:24:54 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24D9B37B405; Sat, 8 Feb 2003 12:24:49 -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 C3CC637B401 for ; Sat, 8 Feb 2003 12:24:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C7CA43FAF for ; Sat, 8 Feb 2003 12:24:48 -0800 (PST) (envelope-from sam@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 h18KOmbv062738 for ; Sat, 8 Feb 2003 12:24:48 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18KOlCO062735 for perforce@freebsd.org; Sat, 8 Feb 2003 12:24:47 -0800 (PST) Date: Sat, 8 Feb 2003 12:24:47 -0800 (PST) Message-Id: <200302082024.h18KOlCO062735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24842 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=24842 Change 24842 by sam@sam_ebb on 2003/02/08 12:24:43 add netgraph to branch Affected files ... .. //depot/projects/pfil/netgraph/NOTES#1 branch .. //depot/projects/pfil/netgraph/bluetooth/common/ng_bluetooth.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/drivers/h4/TODO#1 branch .. //depot/projects/pfil/netgraph/bluetooth/drivers/h4/ng_h4.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/drivers/h4/ng_h4_var.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/drivers/ubt/TODO#1 branch .. //depot/projects/pfil/netgraph/bluetooth/drivers/ubt/ng_ubt.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/hci/TODO#1 branch .. //depot/projects/pfil/netgraph/bluetooth/hci/ng_hci_cmds.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/hci/ng_hci_cmds.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/hci/ng_hci_evnt.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/hci/ng_hci_evnt.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/hci/ng_hci_main.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/hci/ng_hci_misc.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/hci/ng_hci_misc.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/hci/ng_hci_prse.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/hci/ng_hci_ulpi.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/hci/ng_hci_ulpi.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/hci/ng_hci_var.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/include/ng_bluetooth.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/include/ng_bt3c.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/include/ng_btsocket.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/include/ng_btsocket_l2cap.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/include/ng_h4.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/include/ng_hci.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/include/ng_l2cap.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/include/ng_ubt.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/l2cap/TODO#1 branch .. //depot/projects/pfil/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/l2cap/ng_l2cap_main.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/l2cap/ng_l2cap_prse.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/l2cap/ng_l2cap_var.h#1 branch .. //depot/projects/pfil/netgraph/bluetooth/socket/TODO#1 branch .. //depot/projects/pfil/netgraph/bluetooth/socket/ng_btsocket.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#1 branch .. //depot/projects/pfil/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#1 branch .. //depot/projects/pfil/netgraph/netgraph.h#1 branch .. //depot/projects/pfil/netgraph/ng_UI.c#1 branch .. //depot/projects/pfil/netgraph/ng_UI.h#1 branch .. //depot/projects/pfil/netgraph/ng_async.c#1 branch .. //depot/projects/pfil/netgraph/ng_async.h#1 branch .. //depot/projects/pfil/netgraph/ng_base.c#1 branch .. //depot/projects/pfil/netgraph/ng_bpf.c#1 branch .. //depot/projects/pfil/netgraph/ng_bpf.h#1 branch .. //depot/projects/pfil/netgraph/ng_bridge.c#1 branch .. //depot/projects/pfil/netgraph/ng_bridge.h#1 branch .. //depot/projects/pfil/netgraph/ng_cisco.c#1 branch .. //depot/projects/pfil/netgraph/ng_cisco.h#1 branch .. //depot/projects/pfil/netgraph/ng_device.c#1 branch .. //depot/projects/pfil/netgraph/ng_device.h#1 branch .. //depot/projects/pfil/netgraph/ng_echo.c#1 branch .. //depot/projects/pfil/netgraph/ng_echo.h#1 branch .. //depot/projects/pfil/netgraph/ng_eiface.c#1 branch .. //depot/projects/pfil/netgraph/ng_eiface.h#1 branch .. //depot/projects/pfil/netgraph/ng_etf.c#1 branch .. //depot/projects/pfil/netgraph/ng_etf.h#1 branch .. //depot/projects/pfil/netgraph/ng_ether.c#1 branch .. //depot/projects/pfil/netgraph/ng_ether.h#1 branch .. //depot/projects/pfil/netgraph/ng_fec.c#1 branch .. //depot/projects/pfil/netgraph/ng_fec.h#1 branch .. //depot/projects/pfil/netgraph/ng_frame_relay.c#1 branch .. //depot/projects/pfil/netgraph/ng_frame_relay.h#1 branch .. //depot/projects/pfil/netgraph/ng_gif.c#1 branch .. //depot/projects/pfil/netgraph/ng_gif.h#1 branch .. //depot/projects/pfil/netgraph/ng_gif_demux.c#1 branch .. //depot/projects/pfil/netgraph/ng_gif_demux.h#1 branch .. //depot/projects/pfil/netgraph/ng_hole.c#1 branch .. //depot/projects/pfil/netgraph/ng_hole.h#1 branch .. //depot/projects/pfil/netgraph/ng_iface.c#1 branch .. //depot/projects/pfil/netgraph/ng_iface.h#1 branch .. //depot/projects/pfil/netgraph/ng_ip_input.c#1 branch .. //depot/projects/pfil/netgraph/ng_ip_input.h#1 branch .. //depot/projects/pfil/netgraph/ng_ksocket.c#1 branch .. //depot/projects/pfil/netgraph/ng_ksocket.h#1 branch .. //depot/projects/pfil/netgraph/ng_l2tp.c#1 branch .. //depot/projects/pfil/netgraph/ng_l2tp.h#1 branch .. //depot/projects/pfil/netgraph/ng_lmi.c#1 branch .. //depot/projects/pfil/netgraph/ng_lmi.h#1 branch .. //depot/projects/pfil/netgraph/ng_message.h#1 branch .. //depot/projects/pfil/netgraph/ng_mppc.c#1 branch .. //depot/projects/pfil/netgraph/ng_mppc.h#1 branch .. //depot/projects/pfil/netgraph/ng_one2many.c#1 branch .. //depot/projects/pfil/netgraph/ng_one2many.h#1 branch .. //depot/projects/pfil/netgraph/ng_parse.c#1 branch .. //depot/projects/pfil/netgraph/ng_parse.h#1 branch .. //depot/projects/pfil/netgraph/ng_ppp.c#1 branch .. //depot/projects/pfil/netgraph/ng_ppp.h#1 branch .. //depot/projects/pfil/netgraph/ng_pppoe.c#1 branch .. //depot/projects/pfil/netgraph/ng_pppoe.h#1 branch .. //depot/projects/pfil/netgraph/ng_pptpgre.c#1 branch .. //depot/projects/pfil/netgraph/ng_pptpgre.h#1 branch .. //depot/projects/pfil/netgraph/ng_rfc1490.c#1 branch .. //depot/projects/pfil/netgraph/ng_rfc1490.h#1 branch .. //depot/projects/pfil/netgraph/ng_sample.c#1 branch .. //depot/projects/pfil/netgraph/ng_sample.h#1 branch .. //depot/projects/pfil/netgraph/ng_socket.c#1 branch .. //depot/projects/pfil/netgraph/ng_socket.h#1 branch .. //depot/projects/pfil/netgraph/ng_socketvar.h#1 branch .. //depot/projects/pfil/netgraph/ng_source.c#1 branch .. //depot/projects/pfil/netgraph/ng_source.h#1 branch .. //depot/projects/pfil/netgraph/ng_split.c#1 branch .. //depot/projects/pfil/netgraph/ng_split.h#1 branch .. //depot/projects/pfil/netgraph/ng_tee.c#1 branch .. //depot/projects/pfil/netgraph/ng_tee.h#1 branch .. //depot/projects/pfil/netgraph/ng_tty.c#1 branch .. //depot/projects/pfil/netgraph/ng_tty.h#1 branch .. //depot/projects/pfil/netgraph/ng_vjc.c#1 branch .. //depot/projects/pfil/netgraph/ng_vjc.h#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 12:29:57 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD3A037B405; Sat, 8 Feb 2003 12:29:55 -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 749E737B401 for ; Sat, 8 Feb 2003 12:29:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1371B43F85 for ; Sat, 8 Feb 2003 12:29:55 -0800 (PST) (envelope-from sam@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 h18KTsbv062915 for ; Sat, 8 Feb 2003 12:29:54 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18KTs9p062912 for perforce@freebsd.org; Sat, 8 Feb 2003 12:29:54 -0800 (PST) Date: Sat, 8 Feb 2003 12:29:54 -0800 (PST) Message-Id: <200302082029.h18KTs9p062912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24843 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=24843 Change 24843 by sam@sam_ebb on 2003/02/08 12:29:24 populate branch Affected files ... .. //depot/projects/em/if_em.c#3 branch .. //depot/projects/em/if_em.h#3 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 12:31:23 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B38537B405; Sat, 8 Feb 2003 12:30:58 -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 02F2537B401 for ; Sat, 8 Feb 2003 12:30:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A2DE43F3F for ; Sat, 8 Feb 2003 12:30:57 -0800 (PST) (envelope-from sam@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 h18KUubv063881 for ; Sat, 8 Feb 2003 12:30:56 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18KUuR9063864 for perforce@freebsd.org; Sat, 8 Feb 2003 12:30:56 -0800 (PST) Date: Sat, 8 Feb 2003 12:30:56 -0800 (PST) Message-Id: <200302082030.h18KUuR9063864@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24844 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=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) Affected files ... .. //depot/projects/em/if_em.c#4 edit .. //depot/projects/em/if_em.h#4 edit Differences ... ==== //depot/projects/em/if_em.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ /************************************************************************** -Copyright (c) 2001-2002, Intel Corporation +Copyright (c) 2001-2003, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -31,10 +31,14 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.18 2003/01/21 08:55:30 alfred Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.2.2.11 2003/01/03 18:18:55 pdeuskar Exp $*/ #include +#ifndef M_DONTWAIT +#define M_DONTWAIT M_NOWAIT /* XXX temporary workaround */ +#endif + /********************************************************************* * Set this to one to display debug statistics *********************************************************************/ @@ -112,6 +116,9 @@ static void em_identify_hardware(struct adapter *); static int em_allocate_pci_resources(struct adapter *); static void em_free_pci_resources(struct adapter *); +static int em_dma_malloc(struct adapter *, bus_size_t, + struct em_dma_alloc *, int); +static void em_dma_free(struct adapter *, struct em_dma_alloc *); static void em_local_timer(void *); static int em_hardware_init(struct adapter *); static void em_setup_interface(device_t, struct adapter *); @@ -140,8 +147,8 @@ static void em_set_multi(struct adapter *); static void em_print_hw_stats(struct adapter *); static void em_print_link_status(struct adapter *); -static int em_get_buf(int i, struct adapter *, - struct mbuf *); +static int em_get_buf(int i, struct adapter *); +static int em_set_buf(int i, struct adapter *, struct mbuf *); static void em_enable_vlans(struct adapter *adapter); static int em_encap(struct adapter *adapter, struct mbuf *m_head); @@ -303,42 +310,38 @@ splx(s); return(ENXIO); } - - tsize = EM_ROUNDUP(adapter->num_tx_desc * - sizeof(struct em_tx_desc), 4096); - /* Allocate Transmit Descriptor ring */ - if (!(adapter->tx_desc_base = (struct em_tx_desc *) - contigmalloc(tsize, M_DEVBUF, M_NOWAIT, 0, ~0, PAGE_SIZE, 0))) { - printf("em%d: Unable to allocate TxDescriptor memory\n", - adapter->unit); + tsize = adapter->num_tx_desc * sizeof(struct em_tx_desc); + if (em_dma_malloc(adapter, tsize, &adapter->txdma, BUS_DMA_NOWAIT)) { + printf("em%d: Unable to allocate tx_desc memory\n", + adapter->unit); em_free_pci_resources(adapter); splx(s); return(ENOMEM); } - - rsize = EM_ROUNDUP(adapter->num_rx_desc * - sizeof(struct em_rx_desc), 4096); + adapter->tx_desc_base = (struct em_tx_desc *) adapter->txdma.dma_vaddr; + adapter->tx_desc_end = adapter->tx_desc_base + adapter->num_tx_desc; /* Allocate Receive Descriptor ring */ - if (!(adapter->rx_desc_base = (struct em_rx_desc *) - contigmalloc(rsize, M_DEVBUF, M_NOWAIT, 0, ~0, PAGE_SIZE, 0))) { - printf("em%d: Unable to allocate rx_desc memory\n", - adapter->unit); + rsize = adapter->num_rx_desc * sizeof(struct em_rx_desc); + if (em_dma_malloc(adapter, rsize, &adapter->rxdma, BUS_DMA_NOWAIT)) { + printf("em%d: Unable to allocate rx_desc memory\n", + adapter->unit); em_free_pci_resources(adapter); - contigfree(adapter->tx_desc_base, tsize, M_DEVBUF); + em_dma_free(adapter, &adapter->txdma); splx(s); return(ENOMEM); } + adapter->rx_desc_base = (struct em_rx_desc *) adapter->rxdma.dma_vaddr; /* Initialize the hardware */ if (em_hardware_init(adapter)) { printf("em%d: Unable to initialize the hardware\n", adapter->unit); em_free_pci_resources(adapter); - contigfree(adapter->tx_desc_base, tsize, M_DEVBUF); - contigfree(adapter->rx_desc_base, rsize, M_DEVBUF); + em_dma_free(adapter, &adapter->txdma); + em_dma_free(adapter, &adapter->rxdma); splx(s); return(EIO); } @@ -395,7 +398,6 @@ struct adapter * adapter = device_get_softc(dev); struct ifnet *ifp = &adapter->interface_data.ac_if; int s; - int size; INIT_DEBUGOUT("em_detach: begin"); s = splimp(); @@ -409,21 +411,15 @@ #endif em_free_pci_resources(adapter); - size = EM_ROUNDUP(adapter->num_tx_desc * - sizeof(struct em_tx_desc), 4096); - /* Free Transmit Descriptor ring */ if (adapter->tx_desc_base) { - contigfree(adapter->tx_desc_base, size, M_DEVBUF); + em_dma_free(adapter, &adapter->txdma); adapter->tx_desc_base = NULL; } - size = EM_ROUNDUP(adapter->num_rx_desc * - sizeof(struct em_rx_desc), 4096); - /* Free Receive Descriptor ring */ if (adapter->rx_desc_base) { - contigfree(adapter->rx_desc_base, size, M_DEVBUF); + em_dma_free(adapter, &adapter->rxdma); adapter->rx_desc_base = NULL; } @@ -519,7 +515,7 @@ static int em_ioctl(struct ifnet *ifp, IOCTL_CMD_TYPE command, caddr_t data) { - int s, mask, error = 0; + int s, mask, error = 0, buf_size; struct ifreq *ifr = (struct ifreq *) data; struct adapter * adapter = ifp->if_softc; @@ -537,23 +533,56 @@ } else { ifp->if_mtu = ifr->ifr_mtu; adapter->hw.max_frame_size = - ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; + ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; + /* + * Adjust the receive buffer size according to the + * mtu. The hardware only handles fixed-size values + * for bounding receive frame sizes so we have to + * round the mtu up. Note that for jumbo frames + * we have a per-frame overhead that we must account + * for in selecting the buffer size. + */ + buf_size = adapter->hw.max_frame_size; + if (buf_size > MCLBYTES) + buf_size += JUMBO_OVERHEAD; + if (buf_size <= 2048) { + adapter->rx_buffer_len = EM_RXBUFFER_2048; + } else if (buf_size <= 4096) { + adapter->rx_buffer_len = EM_RXBUFFER_4096; + } else if (buf_size <= 8192) { + adapter->rx_buffer_len = EM_RXBUFFER_8192; + } else { + adapter->rx_buffer_len = EM_RXBUFFER_16384; + } em_init(adapter); } break; - case SIOCSIFFLAGS: - IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFFLAGS (Set Interface Flags)"); - if (ifp->if_flags & IFF_UP) { + case SIOCSIFFLAGS: + IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFFLAGS (Set Interface Flags)"); + if (ifp->if_flags & IFF_UP) { +#if __FreeBSD_version < 500000 + switch (ifp->if_flags & (IFF_RUNNING|IFF_PROMISC)) { + case IFF_RUNNING|IFF_PROMISC: + em_set_promisc(adapter); + break; + case IFF_RUNNING: + em_disable_promisc(adapter); + break; + default: + em_init(adapter); + break; + } +#else if (!(ifp->if_flags & IFF_RUNNING)) em_init(adapter); - em_disable_promisc(adapter); em_set_promisc(adapter); - } else { - if (ifp->if_flags & IFF_RUNNING) { - em_stop(adapter); - } - } +#endif + } else { + if (ifp->if_flags & IFF_RUNNING) { + em_stop(adapter); + } + } break; case SIOCADDMULTI: case SIOCDELMULTI: @@ -617,7 +646,6 @@ ifp->if_flags &= ~IFF_RUNNING; - em_stop(adapter); em_init(adapter); ifp->if_oerrors++; @@ -703,7 +731,7 @@ em_disable_intr(adapter); else #endif /* DEVICE_POLLING */ - em_enable_intr(adapter); + em_enable_intr(adapter); splx(s); return; @@ -769,7 +797,6 @@ } #endif /* DEVICE_POLLING */ - em_disable_intr(adapter); while (loop_cnt > 0 && (reg_icr = E1000_READ_REG(&adapter->hw, ICR)) != 0) { @@ -924,6 +951,19 @@ return(0); } +static void +em_tx_cb(void *arg, bus_dma_segment_t *seg, int nsegs, bus_size_t mapsize, int error) +{ + struct em_q *q = arg; + + if (error) + return; + KASSERT(nsegs <= EM_MAX_SCATTER, + ("Too many DMA segments returned when mapping tx packet")); + q->nsegs = nsegs; + bcopy(seg, q->segs, nsegs * sizeof(seg[0])); +} + /********************************************************************* * * This routine maps the mbufs to tx descriptors. @@ -934,104 +974,142 @@ static int em_encap(struct adapter *adapter, struct mbuf *m_head) { - vm_offset_t virtual_addr; u_int32_t txd_upper; u_int32_t txd_lower; - int txd_used, i, txd_saved; - struct mbuf *mp; + int i; #if __FreeBSD_version < 500000 struct ifvlan *ifv = NULL; #else struct m_tag *mtag; #endif - struct em_buffer *tx_buffer = NULL; - struct em_tx_desc *current_tx_desc = NULL; + struct em_q *q; + struct em_tx_desc *tx_desc; struct ifnet *ifp = &adapter->interface_data.ac_if; + int error; - /* Force a cleanup if number of TX descriptors available hits the threshold */ - if (adapter->num_tx_desc_avail <= EM_TX_CLEANUP_THRESHOLD) + /* + * Force a cleanup if the number of available + * TX descriptors hits the threshold. + */ + if (adapter->num_tx_desc_avail <= EM_TX_CLEANUP_THRESHOLD) { em_clean_transmit_interrupts(adapter); + if (adapter->num_tx_desc_avail <= EM_TX_CLEANUP_THRESHOLD) { + adapter->no_tx_desc_avail1++; + return (ENOBUFS); + } + } + + /* + * Grab a queue entry. + */ + q = STAILQ_FIRST(&adapter->tx_freeq); + if (!q) { + adapter->no_tx_buffer++; + return (ENOBUFS); + } + STAILQ_REMOVE_HEAD(&adapter->tx_freeq, next); - if (adapter->num_tx_desc_avail <= EM_TX_CLEANUP_THRESHOLD) { - adapter->no_tx_desc_avail1++; + /* + * Map the packet for DMA. + */ + if (bus_dmamap_create(adapter->txtag, BUS_DMA_NOWAIT, &q->map)) { + adapter->no_tx_map_avail++; + STAILQ_INSERT_TAIL(&adapter->tx_freeq, q, next); + return (ENOMEM); + } + error = bus_dmamap_load_mbuf(adapter->txtag, q->map, + m_head, em_tx_cb, q, BUS_DMA_NOWAIT); + if (error != 0) { + adapter->no_tx_dma_setup++; + bus_dmamap_destroy(adapter->txtag, q->map); + STAILQ_INSERT_TAIL(&adapter->tx_freeq, q, next); + return (error); + } + KASSERT(q->nsegs != 0, ("em_encap: empty packet")); + if (q->nsegs > adapter->num_tx_desc_avail) { + adapter->no_tx_desc_avail2++; + bus_dmamap_destroy(adapter->txtag, q->map); + STAILQ_INSERT_TAIL(&adapter->tx_freeq, q, next); return (ENOBUFS); } - if (ifp->if_hwassist > 0) { + /* + * Check if an offload context is needed for this packet. + * One is generated when checksum processing is offloaded + * to the NIC. This is done by inserting a descriptor + * before the packet. Offload descriptors must be inserted + * each time the ``current protocol'' (UDP or TCP) changes. + * + * NB: if we ever find out how to do IPsec offloading + * this would be done here. + */ + if (ifp->if_hwassist > 0) em_transmit_checksum_setup(adapter, m_head, &txd_upper, &txd_lower); - } else txd_upper = txd_lower = 0; - /* Find out if we are in vlan mode */ + /* + * Setup the tx descriptors for the packet. + */ + tx_desc = adapter->tx_desc_next; + for (i = 0; i < q->nsegs; i++) { + tx_desc->buffer_addr = htole64(q->segs[i].ds_addr); + tx_desc->lower.data = htole32( + adapter->txd_cmd | txd_lower | q->segs[i].ds_len); + tx_desc->upper.data = htole32(txd_upper); + + if (++tx_desc == adapter->tx_desc_end) + tx_desc = adapter->tx_desc_base; + } + adapter->tx_desc_next = tx_desc; + adapter->num_tx_desc_avail -= q->nsegs; + + /* + * Backup to the last descriptor in packet to tack on any + * VLAN bits and an EOP (End of Packet) marker. + */ + if (--tx_desc < adapter->tx_desc_base) + tx_desc = adapter->tx_desc_end-1; #if __FreeBSD_version < 500000 if ((m_head->m_flags & (M_PROTO1|M_PKTHDR)) == (M_PROTO1|M_PKTHDR) && m_head->m_pkthdr.rcvif != NULL && - m_head->m_pkthdr.rcvif->if_type == IFT_L2VLAN) + m_head->m_pkthdr.rcvif->if_type == IFT_L2VLAN) { ifv = m_head->m_pkthdr.rcvif->if_softc; -#else - mtag = VLAN_OUTPUT_TAG(ifp, m_head); -#endif - - i = adapter->next_avail_tx_desc; - txd_saved = i; - txd_used = 0; - for (mp = m_head; mp != NULL; mp = mp->m_next) { - if (mp->m_len == 0) - continue; - - if (txd_used == adapter->num_tx_desc_avail) { - adapter->next_avail_tx_desc = txd_saved; - adapter->no_tx_desc_avail2++; - return (ENOBUFS); + if (ifv != NULL) { + /* Set the vlan id */ + tx_desc->upper.fields.special = htole16(ifv->ifv_tag); + /* Tell hardware to add tag */ + tx_desc->lower.data |= htole32(E1000_TXD_CMD_VLE); } - - tx_buffer = &adapter->tx_buffer_area[i]; - current_tx_desc = &adapter->tx_desc_base[i]; - virtual_addr = mtod(mp, vm_offset_t); - current_tx_desc->buffer_addr = vtophys(virtual_addr); - - current_tx_desc->lower.data = (adapter->txd_cmd | txd_lower | mp->m_len); - current_tx_desc->upper.data = (txd_upper); - - if (++i == adapter->num_tx_desc) - i = 0; - - tx_buffer->m_head = NULL; - - txd_used++; } - - adapter->num_tx_desc_avail -= txd_used; - adapter->next_avail_tx_desc = i; - -#if __FreeBSD_version < 500000 - if (ifv != NULL) { - /* Set the vlan id */ - current_tx_desc->upper.fields.special = ifv->ifv_tag; #else + mtag = VLAN_OUTPUT_TAG(ifp, m_head); if (mtag != NULL) { /* Set the vlan id */ - current_tx_desc->upper.fields.special = VLAN_TAG_VALUE(mtag); -#endif + tx_desc->upper.fields.special = htole16(VLAN_TAG_VALUE(mtag)); /* Tell hardware to add tag */ - current_tx_desc->lower.data |= E1000_TXD_CMD_VLE; + tx_desc->lower.data |= htole32(E1000_TXD_CMD_VLE); } +#endif + tx_desc->lower.data |= htole32(E1000_TXD_CMD_EOP); - tx_buffer->m_head = m_head; - - /* - * Last Descriptor of Packet needs End Of Packet (EOP) + /* + * Mark the queue entry, sync the data to be sent, and + * stick the request at the end of the transmit queue. */ - current_tx_desc->lower.data |= (E1000_TXD_CMD_EOP); + q->m_head = m_head; + bus_dmamap_sync(adapter->txtag, q->map, BUS_DMASYNC_PREWRITE); + q->desc = tx_desc; + STAILQ_INSERT_TAIL(&adapter->tx_q, q, next); /* * Advance the Transmit Descriptor Tail (Tdt), this tells the E1000 * that this frame is available to transmit. */ - E1000_WRITE_REG(&adapter->hw, TDT, i); + E1000_WRITE_REG(&adapter->hw, TDT, + adapter->tx_desc_next - adapter->tx_desc_base); return (0); } @@ -1348,6 +1426,94 @@ return; } +/* + * Manage DMA'able memory. + */ +static void +em_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + if (error) + return; + *(bus_addr_t*) arg = segs->ds_addr; +} + +static int +em_dma_malloc( + struct adapter *adapter, + bus_size_t size, + struct em_dma_alloc *dma, + int mapflags +) +{ + int r; + + r = bus_dma_tag_create(NULL, /* parent */ + PAGE_SIZE, 0, /* alignment, bounds */ + BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + size, /* maxsize */ + 1, /* nsegments */ + size, /* maxsegsize */ + BUS_DMA_ALLOCNOW, /* flags */ + &dma->dma_tag); + if (r != 0) { + printf("em%d: em_dma_malloc: bus_dma_tag_create failed; " + "error %u\n", adapter->unit, r); + goto fail_0; + } + + r = bus_dmamap_create(dma->dma_tag, BUS_DMA_NOWAIT, &dma->dma_map); + if (r != 0) { + printf("em%d: em_dma_malloc: bus_dmamap_create failed; " + "error %u\n", adapter->unit, r); + goto fail_1; + } + + r = bus_dmamem_alloc(dma->dma_tag, (void**) &dma->dma_vaddr, + BUS_DMA_NOWAIT, &dma->dma_map); + if (r != 0) { + printf("em%d: em_dma_malloc: bus_dmammem_alloc failed; " + "size %u, error %u\n", adapter->unit, size, r); + goto fail_2; + } + + r = bus_dmamap_load(dma->dma_tag, dma->dma_map, dma->dma_vaddr, + size, + em_dmamap_cb, + &dma->dma_paddr, + mapflags | BUS_DMA_NOWAIT); + if (r != 0) { + printf("em%d: em_dma_malloc: bus_dmamap_load failed; " + "error %u\n", adapter->unit, r); + goto fail_3; + } + + dma->dma_size = size; + return (0); + +fail_3: + bus_dmamap_unload(dma->dma_tag, dma->dma_map); +fail_2: + bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map); +fail_1: + bus_dmamap_destroy(dma->dma_tag, dma->dma_map); + bus_dma_tag_destroy(dma->dma_tag); +fail_0: + dma->dma_map = NULL; + dma->dma_tag = NULL; + return (r); +} + +static void +em_dma_free(struct adapter *adapter, struct em_dma_alloc *dma) +{ + bus_dmamap_unload(dma->dma_tag, dma->dma_map); + bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map); + bus_dmamap_destroy(dma->dma_tag, dma->dma_map); + bus_dma_tag_destroy(dma->dma_tag); +} + /********************************************************************* * * Initialize the hardware to a configuration as specified by the @@ -1477,25 +1643,27 @@ /********************************************************************* * - * Allocate memory for tx_buffer structures. The tx_buffer stores all - * the information needed to transmit a packet on the wire. + * Allocate memory for transmission. The free q is populated with + * the transmit buffers needed to transmit a packet on the wire. * **********************************************************************/ static int em_allocate_transmit_structures(struct adapter * adapter) { - if (!(adapter->tx_buffer_area = - (struct em_buffer *) malloc(sizeof(struct em_buffer) * - adapter->num_tx_desc, M_DEVBUF, - M_NOWAIT))) { - printf("em%d: Unable to allocate tx_buffer memory\n", - adapter->unit); - return ENOMEM; + int i; + + for (i = 0; i < adapter->num_tx_desc; i++) { + struct em_q *q; + + q = malloc(sizeof(struct em_q), M_DEVBUF, M_NOWAIT | M_ZERO); + if (!q) { + printf("em%d: Unable to allocate tx_buffer memory\n", + adapter->unit); + return ENOMEM; + } + STAILQ_INSERT_TAIL(&adapter->tx_freeq, q, next); } - bzero(adapter->tx_buffer_area, - sizeof(struct em_buffer) * adapter->num_tx_desc); - return 0; } @@ -1507,14 +1675,42 @@ static int em_setup_transmit_structures(struct adapter * adapter) { - if (em_allocate_transmit_structures(adapter)) + /* + * Insure these are initialized so cleanup always works. + */ + STAILQ_INIT(&adapter->tx_freeq); + STAILQ_INIT(&adapter->tx_q); + + /* + * Setup DMA descriptor areas. + */ + /* XXX have 64-bit addressability */ + if (bus_dma_tag_create(NULL, /* parent */ + PAGE_SIZE, 0, /* alignment, bounds */ + BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + EM_RXBUFFER_16384, /* maxsize */ + EM_MAX_SCATTER, /* nsegments */ + EM_RXBUFFER_16384, /* maxsegsize */ + BUS_DMA_ALLOCNOW, /* flags */ + &adapter->txtag)) { + printf("em%d: Unable to allocate TX DMA tag\n", adapter->unit); + return ENOMEM; + } + + if (em_allocate_transmit_structures(adapter)) { + /* XXX who cleans up freeq? */ + bus_dma_tag_destroy(adapter->txtag); + adapter->txtag = NULL; return ENOMEM; + } bzero((void *) adapter->tx_desc_base, (sizeof(struct em_tx_desc)) * adapter->num_tx_desc); - adapter->next_avail_tx_desc = 0; - adapter->oldest_used_tx_desc = 0; + adapter->tx_desc_next = adapter->tx_desc_base; + adapter->tx_desc_next_to_check = adapter->tx_desc_next; /* Set number of descriptors available */ adapter->num_tx_desc_avail = adapter->num_tx_desc; @@ -1537,8 +1733,7 @@ u_int32_t reg_tipg = 0; /* Setup the Base and Length of the Tx Descriptor Ring */ - E1000_WRITE_REG(&adapter->hw, TDBAL, - vtophys((vm_offset_t) adapter->tx_desc_base)); + E1000_WRITE_REG(&adapter->hw, TDBAL, adapter->txdma.dma_paddr); E1000_WRITE_REG(&adapter->hw, TDBAH, 0); E1000_WRITE_REG(&adapter->hw, TDLEN, adapter->num_tx_desc * @@ -1614,24 +1809,29 @@ static void em_free_transmit_structures(struct adapter * adapter) { - struct em_buffer *tx_buffer; - int i; + INIT_DEBUGOUT("free_transmit_structures: begin"); + + while (!STAILQ_EMPTY(&adapter->tx_q)) { + struct em_q *q; - INIT_DEBUGOUT("free_transmit_structures: begin"); + q = STAILQ_FIRST(&adapter->tx_q); + STAILQ_REMOVE_HEAD(&adapter->tx_q, next); + m_freem(q->m_head); + bus_dmamap_unload(adapter->txtag, q->map); + bus_dmamap_destroy(adapter->txtag, q->map); + free(q, M_DEVBUF); + } + while (!STAILQ_EMPTY(&adapter->tx_freeq)) { + struct em_q *q; - if (adapter->tx_buffer_area != NULL) { - tx_buffer = adapter->tx_buffer_area; - for (i = 0; i < adapter->num_tx_desc; i++, tx_buffer++) { - if (tx_buffer->m_head != NULL) - m_freem(tx_buffer->m_head); - tx_buffer->m_head = NULL; - } + q = STAILQ_FIRST(&adapter->tx_freeq); + STAILQ_REMOVE_HEAD(&adapter->tx_freeq, next); + free(q, M_DEVBUF); } - if (adapter->tx_buffer_area != NULL) { - free(adapter->tx_buffer_area, M_DEVBUF); - adapter->tx_buffer_area = NULL; + if (adapter->txtag != NULL) { + bus_dma_tag_destroy(adapter->txtag); + adapter->txtag = NULL; } - return; } /********************************************************************* @@ -1648,8 +1848,6 @@ u_int32_t *txd_lower) { struct em_context_desc *TXD; - struct em_buffer *tx_buffer; - int curr_txd; if (mp->m_pkthdr.csum_flags) { @@ -1679,22 +1877,23 @@ return; } - /* If we reach this point, the checksum offload context + /* + * If we reach this point, the checksum offload context * needs to be reset. + * + * XXX doesn't handle being out of descriptors */ - curr_txd = adapter->next_avail_tx_desc; - tx_buffer = &adapter->tx_buffer_area[curr_txd]; - TXD = (struct em_context_desc *) &adapter->tx_desc_base[curr_txd]; + TXD = (struct em_context_desc *) adapter->tx_desc_next; TXD->lower_setup.ip_fields.ipcss = ETHER_HDR_LEN; TXD->lower_setup.ip_fields.ipcso = ETHER_HDR_LEN + offsetof(struct ip, ip_sum); TXD->lower_setup.ip_fields.ipcse = - ETHER_HDR_LEN + sizeof(struct ip) - 1; + htole16(ETHER_HDR_LEN + sizeof(struct ip) - 1); TXD->upper_setup.tcp_fields.tucss = ETHER_HDR_LEN + sizeof(struct ip); - TXD->upper_setup.tcp_fields.tucse = 0; + TXD->upper_setup.tcp_fields.tucse = htole16(0); if (adapter->active_checksum_context == OFFLOAD_TCP_IP) { TXD->upper_setup.tcp_fields.tucso = @@ -1706,16 +1905,12 @@ offsetof(struct udphdr, uh_sum); } - TXD->tcp_seg_setup.data = 0; - TXD->cmd_and_length = (adapter->txd_cmd | E1000_TXD_CMD_DEXT); + TXD->tcp_seg_setup.data = htole32(0); + TXD->cmd_and_length = htole32(adapter->txd_cmd | E1000_TXD_CMD_DEXT); - tx_buffer->m_head = NULL; - - if (++curr_txd == adapter->num_tx_desc) - curr_txd = 0; - + if (++(adapter->tx_desc_next) == adapter->tx_desc_end) + adapter->tx_desc_next = adapter->tx_desc_base; adapter->num_tx_desc_avail--; - adapter->next_avail_tx_desc = curr_txd; return; } @@ -1730,42 +1925,44 @@ static void em_clean_transmit_interrupts(struct adapter * adapter) { - int s; - int i, num_avail; - struct em_buffer *tx_buffer; + int num_avail; struct em_tx_desc *tx_desc; + struct em_q *q; - if (adapter->num_tx_desc_avail == adapter->num_tx_desc) - return; + if (adapter->num_tx_desc_avail == adapter->num_tx_desc) + return; - s = splimp(); #ifdef DBG_STATS adapter->clean_tx_interrupts++; #endif num_avail = adapter->num_tx_desc_avail; - i = adapter->oldest_used_tx_desc; + tx_desc = adapter->tx_desc_next_to_check; + q = STAILQ_FIRST(&adapter->tx_q); - tx_buffer = &adapter->tx_buffer_area[i]; - tx_desc = &adapter->tx_desc_base[i]; - - while(tx_desc->upper.fields.status & E1000_TXD_STAT_DD) { - + while (tx_desc->upper.fields.status & E1000_TXD_STAT_DD) { tx_desc->upper.data = 0; num_avail++; - - if (tx_buffer->m_head) { - m_freem(tx_buffer->m_head); - tx_buffer->m_head = NULL; + KASSERT(q != NULL, + ("em_clean_transmit_interrupts: descriptors w/o packet!")); + if (q && q->desc == tx_desc) { + /* + * Packet is complete, reclaim resources. + */ + STAILQ_REMOVE_HEAD(&adapter->tx_q, next); + bus_dmamap_sync(adapter->txtag, q->map, + BUS_DMASYNC_POSTWRITE); + bus_dmamap_unload(adapter->txtag, q->map); + bus_dmamap_destroy(adapter->txtag, q->map); + m_freem(q->m_head); + STAILQ_INSERT_TAIL(&adapter->tx_freeq, q, next); + + q = STAILQ_FIRST(&adapter->tx_q); } - - if (++i == adapter->num_tx_desc) - i = 0; + if (++tx_desc == adapter->tx_desc_end) + tx_desc = adapter->tx_desc_base; + } - tx_buffer = &adapter->tx_buffer_area[i]; - tx_desc = &adapter->tx_desc_base[i]; - } - - adapter->oldest_used_tx_desc = i; + adapter->tx_desc_next_to_check = tx_desc; /* * If we have enough room, clear IFF_OACTIVE to tell the stack @@ -1783,88 +1980,392 @@ ifp->if_timer = EM_TX_TIMEOUT; } adapter->num_tx_desc_avail = num_avail; - splx(s); - return; +} + +/* + * Memory management for jumbo frames. + */ + +/* + * Accounting info goes at the end so the data area is page-aligned. + */ +#define JENTRY(_base) (&((struct em_jumbo *)(_base))[-1]) +#define JDATA(_entry) ((void *)((caddr_t)&(_entry)[1])) + +static void +em_jcleanup(struct adapter *adapter) +{ + struct em_jumbo *entry; + + while ((entry = SLIST_FIRST(&adapter->jfree)) != NULL) { + SLIST_REMOVE_HEAD(&adapter->jfree, u.next); + +#if __FreeBSD_version < 500000 + KASSERT(entry->refcnt == 0, + ("em_jcleanup: freeing referenced jumbogram (ref %u)", + entry->refcnt)); +#endif + KASSERT(entry->ix < adapter->num_rx_buffers, + ("em_jcleanup: invalid rx descriptor index (%u > %u)", + entry->ix, adapter->num_rx_desc)); + bus_dmamem_free(adapter->rxtag, entry, + adapter->rx_buffer_area[entry->ix].map); + } +} + +static int +em_jsetup(struct adapter *adapter) +{ + int i, error = 0; + + for (i = 0; i < adapter->num_rx_buffers; i++) { + struct em_buffer *rx_buffer = &adapter->rx_buffer_area[i]; + struct em_jumbo *entry; + void *v; + + error = bus_dmamem_alloc(adapter->rxtag, &v, + BUS_DMA_NOWAIT, &rx_buffer->map); + if (error != 0) + break; + /* + * Load the buffer now and record the physical address + * so we can avoid doing this for each receive operation. + */ + entry = (struct em_jumbo *) v; + error = bus_dmamap_load(adapter->rxtag, + rx_buffer->map, + JDATA(entry), + adapter->rxtag_maxsize - JUMBO_OVERHEAD, + em_dmamap_cb, + &entry->paddr, + BUS_DMA_NOWAIT); + if (error != 0) { + printf("em%d: em_jsetup: bus_dmamap_load failed; " + "error %u\n", adapter->unit, error); + bus_dmamem_free(adapter->rxtag, v, rx_buffer->map); + break; + } + entry->ix = i; + entry->refcnt = 0; + SLIST_INSERT_HEAD(&adapter->jfree, entry, u.next); + } + if (i != adapter->num_rx_buffers) { + printf("em%d: Unable to allocate memory for jumbo buffers\n", + adapter->unit); + em_jcleanup(adapter); + } + return (error); +} + +#if __FreeBSD_version < 500000 +/* + * Adjust usage count on a jumbo buffer. + */ +static void +em_jref(caddr_t buf, u_int size) +{ + struct em_jumbo *entry = JENTRY(buf); + + KASSERT(entry->u.adapter != NULL, ("em_jref: no adapter pointer!")); + entry->refcnt++; +} + +/* + * Release a jumbo buffer. + */ +static void +em_jfree(caddr_t buf, u_int size) +{ + struct em_jumbo *entry = JENTRY(buf); + + KASSERT(entry->refcnt != 0, ("em_jfree: reference count is zero!")); + if (--(entry->refcnt) == 0) { + struct adapter *adapter = entry->u.adapter; + + KASSERT(adapter != NULL, ("em_jfree: no adapter pointer!")); + KASSERT(size + JUMBO_OVERHEAD == adapter->rxtag_maxsize, + ("em_jfree: buffer has wrong size! (%u != %u)", + size + JUMBO_OVERHEAD, adapter->rxtag_maxsize)); + KASSERT(entry->ix < adapter->num_rx_buffers, + ("em_jfree: bogus index %u > %u", entry->ix, + adapter->num_rx_buffers)); + /* NB: could also verify physical address */ + + /* return jumbo buffer to adapter's free list */ + SLIST_INSERT_HEAD(&adapter->jfree, entry, u.next); + } +} +#else +/* + * Release a jumbo buffer. + */ +static void +em_jfree(void *buf, void *arg) +{ + struct em_jumbo *entry = arg; + struct adapter *adapter = entry->u.adapter; + + KASSERT(adapter != NULL, ("em_jfree: no adapter pointer!")); + KASSERT(entry->ix < adapter->num_rx_buffers, + ("em_jfree: bogus index %u > %u", entry->ix, + adapter->num_rx_buffers)); + /* NB: could also verify physical address */ + + /* return jumbo buffer to adapter's free list */ + SLIST_INSERT_HEAD(&adapter->jfree, entry, u.next); +} +#endif + +/* + * Allocate a jumbo buffer from the free list and set it up for use. + */ +static int +em_jalloc(struct adapter *adapter, int i, struct mbuf *mp) +{ + struct em_jumbo *entry; + + entry = SLIST_FIRST(&adapter->jfree); + if (entry == NULL) { + INIT_DEBUGOUT1("em%d: em_jalloc: no jumbo buffers", + adapter->unit); + return (ENOBUFS); + } + + /* + * Take it off the free list, rewrite the list pointer + * with the adapter, and mark the reference count. + */ + SLIST_REMOVE_HEAD(&adapter->jfree, u.next); + entry->u.adapter = adapter; + >>> 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 Sat Feb 8 14:31:34 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D413F37B405; Sat, 8 Feb 2003 14:31:32 -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 77A4F37B401 for ; Sat, 8 Feb 2003 14:31:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16F9843F85 for ; Sat, 8 Feb 2003 14:31:32 -0800 (PST) (envelope-from sam@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 h18MVVbv011007 for ; Sat, 8 Feb 2003 14:31:31 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h18MVVYS010995 for perforce@freebsd.org; Sat, 8 Feb 2003 14:31:31 -0800 (PST) Date: Sat, 8 Feb 2003 14:31:31 -0800 (PST) Message-Id: <200302082231.h18MVVYS010995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24856 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=24856 Change 24856 by sam@sam_ebb on 2003/02/08 14:30:49 remove; needs to be branched Affected files ... .. //depot/projects/crypto/modules/Makefile#2 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 16:24:52 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97B3F37B405; Sat, 8 Feb 2003 16:24: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 2C25537B401 for ; Sat, 8 Feb 2003 16:24:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE87743FAF for ; Sat, 8 Feb 2003 16:24:50 -0800 (PST) (envelope-from sam@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 h190Oobv051800 for ; Sat, 8 Feb 2003 16:24:50 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h190OoFi051797 for perforce@freebsd.org; Sat, 8 Feb 2003 16:24:50 -0800 (PST) Date: Sat, 8 Feb 2003 16:24:50 -0800 (PST) Message-Id: <200302090024.h190OoFi051797@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24860 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=24860 Change 24860 by sam@sam_ebb on 2003/02/08 16:24:48 add to branch Affected files ... .. //depot/projects/crypto/conf/files#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 16:25:55 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7748B37B405; Sat, 8 Feb 2003 16:25: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 0F11537B401 for ; Sat, 8 Feb 2003 16:25:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A048A43FB1 for ; Sat, 8 Feb 2003 16:25:52 -0800 (PST) (envelope-from sam@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 h190Pqbv051852 for ; Sat, 8 Feb 2003 16:25:52 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h190PqTA051849 for perforce@freebsd.org; Sat, 8 Feb 2003 16:25:52 -0800 (PST) Date: Sat, 8 Feb 2003 16:25:52 -0800 (PST) Message-Id: <200302090025.h190PqTA051849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 24861 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=24861 Change 24861 by sam@sam_ebb on 2003/02/08 16:25:48 optional rndtest Affected files ... .. //depot/projects/crypto/conf/files#2 edit Differences ... ==== //depot/projects/crypto/conf/files#2 (text+ko) ==== @@ -623,6 +623,7 @@ dev/ray/if_ray.c optional ray card dev/ray/if_ray.c optional ray pccard dev/rc/rc.c optional rc +dev/rndtest/rndtest.c optional rndtest dev/rp/rp.c optional rp dev/rp/rp_isa.c optional rp isa dev/rp/rp_pci.c optional rp pci To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 18:41:52 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BAE737B405; Sat, 8 Feb 2003 18:41:39 -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 98FEB37B401 for ; Sat, 8 Feb 2003 18:41:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E29FF43F75 for ; Sat, 8 Feb 2003 18:41:37 -0800 (PST) (envelope-from marcel@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 h192fbbv000516 for ; Sat, 8 Feb 2003 18:41:37 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h192fboQ000504 for perforce@freebsd.org; Sat, 8 Feb 2003 18:41:37 -0800 (PST) Date: Sat, 8 Feb 2003 18:41:37 -0800 (PST) Message-Id: <200302090241.h192fboQ000504@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 24864 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=24864 Change 24864 by marcel@marcel_vaio on 2003/02/08 18:40:38 o Disconnect libvgl. o Remove kernel options for syscons, gfb, vga, tga and vesa. o Remove syscons and pcvt from GENERIC (i386) and modules. o Add #error directives to and . o Fix buildworld to not need the headers mentioned above. This mostly axes non-serial consoles (keyboard stuff still there) and makes room for something else. Affected files ... .. //depot/projects/tty/lib/Makefile#2 edit .. //depot/projects/tty/sys/conf/options.alpha#2 edit .. //depot/projects/tty/sys/conf/options.i386#2 edit .. //depot/projects/tty/sys/conf/options.ia64#2 edit .. //depot/projects/tty/sys/conf/options.pc98#2 edit .. //depot/projects/tty/sys/conf/options.x86_64#2 edit .. //depot/projects/tty/sys/i386/conf/GENERIC#2 edit .. //depot/projects/tty/sys/modules/Makefile#2 edit .. //depot/projects/tty/sys/sys/consio.h#2 edit .. //depot/projects/tty/sys/sys/fbio.h#2 edit .. //depot/projects/tty/usr.bin/kdump/mkioctls#2 edit .. //depot/projects/tty/usr.bin/lock/lock.c#2 edit .. //depot/projects/tty/usr.sbin/Makefile#2 edit Differences ... ==== //depot/projects/tty/lib/Makefile#2 (text+ko) ==== @@ -29,7 +29,7 @@ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap \ ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ - libstand ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ + libstand ${_libtelnet} libufs libugidfw libusbhid \ libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) @@ -59,7 +59,6 @@ _compat= compat _libncp= libncp _libsmb= libsmb -_libvgl= libvgl .endif .if ${MACHINE_ARCH} == "alpha" ==== //depot/projects/tty/sys/conf/options.alpha#2 (text+ko) ==== @@ -21,45 +21,6 @@ PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h -DEV_SC - -VGA_ALT_SEQACCESS opt_vga.h -VGA_DEBUG opt_vga.h -VGA_NO_FONT_LOADING opt_vga.h -VGA_NO_MODE_CHANGE opt_vga.h -VGA_SLOW_IOACCESS opt_vga.h -VGA_WIDTH90 opt_vga.h - -GFB_DEBUG opt_gfb.h -GFB_NO_FONT_LOADING opt_gfb.h -GFB_NO_MODE_CHANGE opt_gfb.h - -TGA_DEBUG opt_tga.h -TGA_NO_FONT_LOADING opt_tga.h -TGA_NO_MODE_CHANGE opt_tga.h - PSM_HOOKRESUME opt_psm.h PSM_RESETAFTERSUSPEND opt_psm.h PSM_DEBUG opt_psm.h ==== //depot/projects/tty/sys/conf/options.i386#2 (text+ko) ==== @@ -74,39 +74,6 @@ I586_CPU opt_global.h I686_CPU opt_global.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h - -VGA_ALT_SEQACCESS opt_vga.h -VGA_DEBUG opt_vga.h -VGA_NO_FONT_LOADING opt_vga.h -VGA_NO_MODE_CHANGE opt_vga.h -VGA_SLOW_IOACCESS opt_vga.h -VGA_WIDTH90 opt_vga.h - -VESA opt_vesa.h -VESA_DEBUG opt_vesa.h - PSM_HOOKRESUME opt_psm.h PSM_RESETAFTERSUSPEND opt_psm.h PSM_DEBUG opt_psm.h ==== //depot/projects/tty/sys/conf/options.ia64#2 (text+ko) ==== @@ -13,36 +13,6 @@ PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h - -VGA_ALT_SEQACCESS opt_vga.h -VGA_DEBUG opt_vga.h -VGA_NO_FONT_LOADING opt_vga.h -VGA_NO_MODE_CHANGE opt_vga.h -VGA_SLOW_IOACCESS opt_vga.h -VGA_WIDTH90 opt_vga.h - PSM_HOOKRESUME opt_psm.h PSM_RESETAFTERSUSPEND opt_psm.h PSM_DEBUG opt_psm.h ==== //depot/projects/tty/sys/conf/options.pc98#2 (text+ko) ==== @@ -69,29 +69,6 @@ I586_CPU opt_global.h I686_CPU opt_global.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h - GDC opt_gdc.h KBD_DISABLE_KEYMAP_LOAD opt_kbd.h @@ -132,7 +109,6 @@ PC98 opt_global.h EPSON_BOUNCEDMA opt_pc98.h EPSON_MEMWIN opt_pc98.h -LINE30 opt_syscons.h # Device options DEV_NPX opt_npx.h ==== //depot/projects/tty/sys/conf/options.x86_64#2 (text+ko) ==== @@ -10,39 +10,6 @@ CLK_CALIBRATION_LOOP opt_clock.h TIMER_FREQ opt_clock.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h - -VGA_ALT_SEQACCESS opt_vga.h -VGA_DEBUG opt_vga.h -VGA_NO_FONT_LOADING opt_vga.h -VGA_NO_MODE_CHANGE opt_vga.h -VGA_SLOW_IOACCESS opt_vga.h -VGA_WIDTH90 opt_vga.h - -VESA opt_vesa.h -VESA_DEBUG opt_vesa.h - ATKBD_DFLT_KEYMAP opt_atkbd.h KBD_DISABLE_KEYMAP_LOAD opt_kbd.h ==== //depot/projects/tty/sys/i386/conf/GENERIC#2 (text+ko) ==== @@ -135,18 +135,6 @@ device atkbd # AT keyboard device psm # PS/2 mouse -device vga # VGA video card driver - -device splash # Splash screen and screen saver support - -# syscons is the default console driver, resembling an SCO console -device sc - -# Enable this for the pcvt (VT220 compatible) console driver -#device vt -#options XSERVER # support for X server on a vt console -#options FAT_CURSOR # start with block cursor - device agp # support several AGP chipsets # Floating point support - do not disable. ==== //depot/projects/tty/sys/modules/Makefile#2 (text+ko) ==== @@ -148,10 +148,6 @@ SUBDIR+=ipfilter .endif -.if ${MACHINE_ARCH} != "sparc64" -SUBDIR+=syscons -.endif - # XXX some of these can move to the general case when de-i386'ed # XXX some of these can move now, but are untested on other architectures. .if ${MACHINE_ARCH} == "i386" @@ -172,9 +168,7 @@ gnufpu \ hea \ hfa \ - ibcs2 \ linprocfs \ - linux \ lnc \ ncv \ netgraph \ @@ -187,7 +181,6 @@ scsi_low \ smbfs \ sound \ - splash \ sppp \ sr \ stg \ @@ -210,10 +203,8 @@ exca \ iir \ mly \ - s3 \ - smapi \ - vesa - + smapi + .elif ${MACHINE} == "pc98" SUBDIR+=pcspeaker \ pmc \ ==== //depot/projects/tty/sys/sys/consio.h#2 (text+ko) ==== @@ -31,6 +31,8 @@ #ifndef _SYS_CONSIO_H_ #define _SYS_CONSIO_H_ +#error Gotta go... + #ifndef _KERNEL #include #endif ==== //depot/projects/tty/sys/sys/fbio.h#2 (text+ko) ==== @@ -42,6 +42,8 @@ #ifndef _SYS_FBIO_H_ #define _SYS_FBIO_H_ +#error Gotta go... + #ifndef _KERNEL #include #endif ==== //depot/projects/tty/usr.bin/kdump/mkioctls#2 (text+ko) ==== @@ -23,6 +23,7 @@ cd $1 find -s * -name '*.h' -follow | egrep -v '^(netns)/' | + egrep -v 'sys/consio.h' | egrep -v 'sys/fbio.h' | xargs egrep -l \ '^#[ ]*define[ ]+[A-Za-z_][A-Za-z0-9_]*[ ]+_IO[^a-z0-9_]' | awk '{printf("#include <%s>\\\\n", $1)}' ==== //depot/projects/tty/usr.bin/lock/lock.c#2 (text+ko) ==== @@ -60,7 +60,6 @@ #include #include #include -#include #include #include #include @@ -84,7 +83,6 @@ struct sgttyb tty, ntty; long nexttime; /* keep the timeout time */ int no_timeout; /* lock terminal forever */ -int vtyunlock; /* Unlock flag and code. */ /*ARGSUSED*/ int @@ -95,7 +93,7 @@ time_t timval_sec; struct itimerval ntimer, otimer; struct tm *timp; - int ch, failures, sectimeout, usemine, vtylock; + int ch, failures, sectimeout, usemine; char *ap, *mypw, *ttynam, *tzn; char hostname[MAXHOSTNAMELEN], s[BUFSIZ], s1[BUFSIZ]; @@ -105,8 +103,7 @@ mypw = NULL; usemine = 0; no_timeout = 0; - vtylock = 0; - while ((ch = getopt(argc, argv, "npt:v")) != -1) + while ((ch = getopt(argc, argv, "npt:")) != -1) switch((char)ch) { case 't': if ((sectimeout = atoi(optarg)) <= 0) @@ -121,9 +118,6 @@ case 'n': no_timeout = 1; break; - case 'v': - vtylock = 1; - break; case '?': default: usage(); @@ -181,19 +175,6 @@ ntimer.it_value = timeout; if (!no_timeout) setitimer(ITIMER_REAL, &ntimer, &otimer); - if (vtylock) { - /* - * If this failed, we want to err out; warn isn't good - * enough, since we don't want the user to think that - * everything is nice and locked because they got a - * "Key:" prompt. - */ - if (ioctl(0, VT_LOCKSWITCH, &vtylock) == -1) { - (void)ioctl(0, TIOCSETP, &tty); - err(1, "locking vty"); - } - vtyunlock = 0x2; - } /* header info */ (void)printf("lock: %s on %s.", ttynam, hostname); @@ -202,8 +183,6 @@ else (void)printf(" timeout in %d minute%s.", sectimeout, sectimeout != 1 ? "s" : ""); - if (vtylock) - (void)printf(" vty locked."); (void)printf("\ntime now is %.20s%s%s", ap, tzn, ap + 19); failures = 0; @@ -268,8 +247,6 @@ { (void)putchar('\n'); (void)ioctl(0, TIOCSETP, &tty); - if (vtyunlock) - (void)ioctl(0, VT_LOCKSWITCH, &vtyunlock); exit(0); } @@ -278,8 +255,6 @@ { if (!no_timeout) { (void)ioctl(0, TIOCSETP, &tty); - if (vtyunlock) - (void)ioctl(0, VT_LOCKSWITCH, &vtyunlock); (void)printf("lock: timeout\n"); exit(1); } ==== //depot/projects/tty/usr.sbin/Makefile#2 (text+ko) ==== @@ -40,7 +40,6 @@ inetd \ iostat \ jail \ - kbdcontrol \ kbdmap \ kernbb \ kldxref \ @@ -52,8 +51,7 @@ mixer \ mld6query \ mlxcontrol \ - mountd \ - moused \ + mountd \ mrouted \ mtest \ mtree \ @@ -100,7 +98,6 @@ sliplogin \ slstat \ spray \ - sysinstall \ syslogd \ tcpdchk \ tcpdmatch \ @@ -113,7 +110,6 @@ ugidfw \ usbd \ usbdevs \ - vidcontrol \ vipw \ vnconfig \ watch \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 18:46:47 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53ED137B405; Sat, 8 Feb 2003 18:46:45 -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 EC38E37B401 for ; Sat, 8 Feb 2003 18:46:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CC0843F75 for ; Sat, 8 Feb 2003 18:46:44 -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 h192kibv001941 for ; Sat, 8 Feb 2003 18:46:44 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h192kiYi001938 for perforce@freebsd.org; Sat, 8 Feb 2003 18:46:44 -0800 (PST) Date: Sat, 8 Feb 2003 18:46:44 -0800 (PST) Message-Id: <200302090246.h192kiYi001938@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 24865 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=24865 Change 24865 by jmallett@jmallett_dalek on 2003/02/08 18:46:12 Add a preliminary GEOM module capable of reading an fx-labelled disk. Enough to recognise an md(4) on i386. Affected files ... .. //depot/projects/mips/sys/conf/files#14 edit .. //depot/projects/mips/sys/conf/options#13 edit .. //depot/projects/mips/sys/geom/geom_fx.c#1 add Differences ... ==== //depot/projects/mips/sys/conf/files#14 (text+ko) ==== @@ -875,6 +875,7 @@ geom/geom_dump.c standard geom/geom_enc.c standard geom/geom_event.c standard +geom/geom_fx.c optional geom_fx geom/geom_gpt.c optional geom_gpt geom/geom_io.c standard geom/geom_kern.c standard ==== //depot/projects/mips/sys/conf/options#13 (text+ko) ==== @@ -90,6 +90,7 @@ GEOM_AES opt_geom.h GEOM_BDE opt_geom.h GEOM_BSD opt_geom.h +GEOM_FX opt_geom.h GEOM_GPT opt_geom.h GEOM_MBR opt_geom.h GEOM_MIRROR opt_geom.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 18:52:55 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A6B437B405; Sat, 8 Feb 2003 18:52: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 121FD37B401 for ; Sat, 8 Feb 2003 18:52:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A0BE443FA3 for ; Sat, 8 Feb 2003 18:52:52 -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 h192qqbv005412 for ; Sat, 8 Feb 2003 18:52:52 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h192qq3r005409 for perforce@freebsd.org; Sat, 8 Feb 2003 18:52:52 -0800 (PST) Date: Sat, 8 Feb 2003 18:52:52 -0800 (PST) Message-Id: <200302090252.h192qq3r005409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 24866 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=24866 Change 24866 by jmallett@jmallett_dalek on 2003/02/08 18:52:37 If the size is 0, then don't add the partition. Affected files ... .. //depot/projects/mips/sys/geom/geom_fx.c#2 edit Differences ... ==== //depot/projects/mips/sys/geom/geom_fx.c#2 (text+ko) ==== @@ -196,6 +196,8 @@ npart++; vp = &label->vh_part[i]; g_fx_swap_volpart(vp); + if (!vp->vp_size) + continue; g_slice_config(gp, i, G_SLICE_CONFIG_SET, vp->vp_begin, vp->vp_size, sectorsize, "%s%c", pp->name, 'a' + i); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 19:20:30 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AA8C37B405; Sat, 8 Feb 2003 19:20:27 -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 BAB2C37B401 for ; Sat, 8 Feb 2003 19:20:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6696D43F85 for ; Sat, 8 Feb 2003 19:20:26 -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 h193KQbv012962 for ; Sat, 8 Feb 2003 19:20:26 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h193KQno012954 for perforce@freebsd.org; Sat, 8 Feb 2003 19:20:26 -0800 (PST) Date: Sat, 8 Feb 2003 19:20:26 -0800 (PST) Message-Id: <200302090320.h193KQno012954@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 24867 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=24867 Change 24867 by jmallett@jmallett_dalek on 2003/02/08 19:20:15 Add a missing GEOM topology lock. Add some bootverbose tomfoolery for printing the slices added, and their types, also include a table of strings representing the different partition types, using the same text as NetBSD for consistency. Affected files ... .. //depot/projects/mips/sys/geom/geom_fx.c#3 edit Differences ... ==== //depot/projects/mips/sys/geom/geom_fx.c#3 (text+ko) ==== @@ -61,6 +61,23 @@ #define FX_LABEL_MAGIC 0xbe5a941 #define FX_NPARTS 16 +static const char *fx_typename[] = { + "Volume Header", + "Repl Trks", + "Repl Secs", + "Raw", + "4.2BSD", + "SysV", + "Volume", + "EFS", + "LVol", + "RLVol", + "XFS", + "XFSLog", + "XLV", + "XVM" +}; + struct dparms { u_int8_t dp_skew; u_int8_t dp_gap1; @@ -122,6 +139,17 @@ vp->vp_type = g_dec_be4((u_char *)&vp->vp_type); } +static const char * +g_fx_type(int32_t type) +{ + static size_t ntypes = sizeof fx_typename / sizeof fx_typename[0]; + + if (type < 0 || type >= ntypes) { + return ("Erroneous partition type."); + } + return (fx_typename[type]); +} + static int g_fx_start(struct bio *bp) { @@ -193,14 +221,21 @@ if (g_dec_be4((u_char *)&label->vh_magic) != FX_LABEL_MAGIC) break; for (i = 0; i < FX_NPARTS; i++) { - npart++; vp = &label->vh_part[i]; g_fx_swap_volpart(vp); if (!vp->vp_size) continue; + g_topology_lock(); g_slice_config(gp, i, G_SLICE_CONFIG_SET, vp->vp_begin, vp->vp_size, sectorsize, "%s%c", pp->name, 'a' + i); + g_topology_unlock(); + if (bootverbose) { + printf("Added %s%c of type %d (%s)\n", + pp->name, 'a' + i, vp->vp_type, + g_fx_type(vp->vp_type)); + } + npart++; } break; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 19:27:38 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5CF337B406; Sat, 8 Feb 2003 19:27:36 -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 7DBDC37B401 for ; Sat, 8 Feb 2003 19:27:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABBB443F93 for ; Sat, 8 Feb 2003 19:27:35 -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 h193RZbv016374 for ; Sat, 8 Feb 2003 19:27:35 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h193RZBG016371 for perforce@freebsd.org; Sat, 8 Feb 2003 19:27:35 -0800 (PST) Date: Sat, 8 Feb 2003 19:27:35 -0800 (PST) Message-Id: <200302090327.h193RZBG016371@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 24868 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=24868 Change 24868 by jmallett@jmallett_dalek on 2003/02/08 19:27:24 Fix call to g_slice_new to pass FX_NPARTS. Affected files ... .. //depot/projects/mips/sys/geom/geom_fx.c#4 edit Differences ... ==== //depot/projects/mips/sys/geom/geom_fx.c#4 (text+ko) ==== @@ -199,7 +199,7 @@ if (flags == G_TF_NORMAL && !strcmp(pp->geom->class->name, FX_CLASS_NAME)) return (NULL); - gp = g_slice_new(mp, 8, pp, &cp, &ms, sizeof *ms, g_fx_start); + gp = g_slice_new(mp, FX_NPARTS, pp, &cp, &ms, sizeof *ms, g_fx_start); if (gp == NULL) return (NULL); gsp = gp->softc; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 21:17:52 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 459E137B405; Sat, 8 Feb 2003 21:17:49 -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 CB3C437B401 for ; Sat, 8 Feb 2003 21:17:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77FD043F93 for ; Sat, 8 Feb 2003 21:17:48 -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 h195Hmbv055944 for ; Sat, 8 Feb 2003 21:17:48 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h195Hm5n055941 for perforce@freebsd.org; Sat, 8 Feb 2003 21:17:48 -0800 (PST) Date: Sat, 8 Feb 2003 21:17:48 -0800 (PST) Message-Id: <200302090517.h195Hm5n055941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 24869 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=24869 Change 24869 by jmallett@jmallett_dalek on 2003/02/08 21:17:07 Add checksum support, and a few more bootverbose messages. Affected files ... .. //depot/projects/mips/sys/geom/geom_fx.c#5 edit Differences ... ==== //depot/projects/mips/sys/geom/geom_fx.c#5 (text+ko) ==== @@ -129,6 +129,7 @@ } __packed; struct g_fx_softc { + struct volhdr sc_volhdr; }; static void @@ -151,6 +152,21 @@ } static int +g_fx_cksum(struct volhdr *vh) +{ + int32_t *words; + int32_t sum; + int i; + + sum = 0; + words = (int32_t *)vh; + + for (i = 0; i < 512 / sizeof *words; i++) + sum += g_dec_be4((u_char *)&words[i]); + return sum; +} + +static int g_fx_start(struct bio *bp) { struct g_geom *gp; @@ -220,6 +236,15 @@ label = (struct volhdr *)buf; if (g_dec_be4((u_char *)&label->vh_magic) != FX_LABEL_MAGIC) break; + error = g_fx_cksum(label); + if (error != 0) { + if (bootverbose) { + printf("Found a bad label on %s (sum %d)\n", + pp->name, error); + } + break; + } + ms->sc_volhdr = *label; for (i = 0; i < FX_NPARTS; i++) { vp = &label->vh_part[i]; g_fx_swap_volpart(vp); @@ -237,6 +262,10 @@ } npart++; } + if (bootverbose) { + printf("Configured %d partitions on %s\n", + npart, pp->name); + } break; } g_topology_lock(); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 21:34:11 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77C8437B405; Sat, 8 Feb 2003 21:34:09 -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 1006037B401 for ; Sat, 8 Feb 2003 21:34:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B32ED43FCB for ; Sat, 8 Feb 2003 21:34:08 -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 h195Y8bv063363 for ; Sat, 8 Feb 2003 21:34:08 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h195Y8qr063360 for perforce@freebsd.org; Sat, 8 Feb 2003 21:34:08 -0800 (PST) Date: Sat, 8 Feb 2003 21:34:08 -0800 (PST) Message-Id: <200302090534.h195Y8qr063360@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 24870 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=24870 Change 24870 by jmallett@jmallett_dalek on 2003/02/08 21:33:16 I may be giving credit, for the stuff I based this on, but it was not itself part of PHK's work. Affected files ... .. //depot/projects/mips/sys/geom/geom_fx.c#6 edit Differences ... ==== //depot/projects/mips/sys/geom/geom_fx.c#6 (text+ko) ==== @@ -4,11 +4,6 @@ * Copyright (c) 2002 Networks Associates Technology, Inc. * All rights reserved. * - * This software was developed for the FreeBSD Project by Poul-Henning Kamp - * and NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Feb 8 23: 1: 6 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9449237B405; Sat, 8 Feb 2003 23:00:54 -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 2697937B401 for ; Sat, 8 Feb 2003 23:00:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92E7C43F75 for ; Sat, 8 Feb 2003 23:00:53 -0800 (PST) (envelope-from marcel@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 h1970rbv092712 for ; Sat, 8 Feb 2003 23:00:53 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1970rMw092698 for perforce@freebsd.org; Sat, 8 Feb 2003 23:00:53 -0800 (PST) Date: Sat, 8 Feb 2003 23:00:53 -0800 (PST) Message-Id: <200302090700.h1970rMw092698@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 24871 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=24871 Change 24871 by marcel@marcel_vaio on 2003/02/08 23:00:07 o Insert a fixed translation in the TR for the EPC gateway page. consequently, we cannot have the page in regions 0-4 (non- constant RIDs). Use the first page in region 5 for the gateway page. o Export the address of the EPC page to userland in ar.k7. Previously it held the current thread, but was never used. We can move the EPC page around all we want now... o Reorder the text sections in the kernel so that we reduce the padding between the ELF headers and the first section. Add the EPC gateway page. o Remove adding a translation for the PAL from locore.s and add it to mp_machdep.c, where we now also insert translations for the EPC page and the I/O port range. Note: the gateway page has been reduced to a single page for the following reasons: o A fixed translation of a 1MB page requires us to align the page at a 1MB boundary. This is mostly a waste of space. o With a large page it's easy to get things wrong and create security holes. o With the gateway page in region 5, we would be required to manually relocate calls outside the gateway page. This is a pain. This change does not break previous behaviour. Affected files ... .. //depot/projects/ia64/sys/conf/ldscript.ia64#6 edit .. //depot/projects/ia64/sys/ia64/ia64/exception.s#17 edit .. //depot/projects/ia64/sys/ia64/ia64/locore.s#12 edit .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#61 edit .. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#28 edit .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#54 edit .. //depot/projects/ia64/sys/ia64/ia64/swtch.s#12 edit .. //depot/projects/ia64/sys/ia64/ia64/syscall.s#5 edit .. //depot/projects/ia64/sys/ia64/ia64/trap.c#41 edit .. //depot/projects/ia64/sys/ia64/include/asm.h#7 edit .. //depot/projects/ia64/sys/ia64/include/cpu.h#10 edit .. //depot/projects/ia64/sys/ia64/include/pmap.h#9 edit .. //depot/projects/ia64/sys/ia64/include/vmparam.h#7 edit Differences ... ==== //depot/projects/ia64/sys/conf/ldscript.ia64#6 (text+ko) ==== @@ -11,10 +11,11 @@ .text : { + *(.text) + *(.text.syscall) + *(.text.gateway) *(.text.ivt) . += 8192; - *(.text.syscall) - *(.text) *(.stub) /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) ==== //depot/projects/ia64/sys/ia64/ia64/exception.s#17 (text+ko) ==== @@ -31,7 +31,7 @@ #include /* - * ar.k7 = curthread + * ar.k7 = address of gateway page * ar.k6 = ksp * ar.k5 = kbsp * ar.k4 = pcpup ==== //depot/projects/ia64/sys/ia64/ia64/locore.s#12 (text+ko) ==== @@ -221,7 +221,6 @@ movl r16 = ap_stack movl r17 = ap_pcpu mov ar.rsc = 0 - movl gp = __gp ;; ld8 r16 = [r16] ld8 r17 = [r17] @@ -229,39 +228,15 @@ ;; add sp = r18, r16 mov ar.bspstore = r16 - mov ar.k4 = r17 - mov r13 = r17 /* gas doesn't know tp as an alias for r13 */ ;; loadrs - movl r16 = ia64_pal_base + movl gp = __gp ;; + mov ar.k4 = r17 mov ar.rsc = 3 - ld8 r16 = [r16] + mov r13 = r17 /* gas doesn't know tp as an alias for r13 */ ;; - cmp.eq p1, p0 = 0, r16 -(p1) br.cond.spnt 1f - ;; - mov r18 = 28<<2 - movl r17 = 7<<61 - ;; - mov cr.itir = r18 - or r17 = r17, r16 - mov r16 = (PTE_P|PTE_MA_WB|PTE_A|PTE_D|PTE_PL_KERN|PTE_AR_RWX) - ;; - mov cr.ifa = r17 - extr.u r18 = r17, 12, 38 - ;; - srlz.i - shl r18 = r18, 12 - ;; - add r17 = 1, r0 - or r16 = r16, r18 - ;; - itr.i itr[r17] = r16 - ;; - srlz.i - ;; -1: alloc r16 = ar.pfs, 0, 0, 0, 0 + alloc r16 = ar.pfs, 0, 0, 0, 0 ;; br.call.sptk.few rp = ia64_ap_startup /* NOT REACHED */ ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#61 (text+ko) ==== @@ -103,6 +103,8 @@ extern u_int64_t kernel_text[], _end[]; +extern u_int64_t ia64_gateway_page[]; + FPSWA_INTERFACE *fpswa_interface; u_int64_t ia64_pal_base; @@ -325,6 +327,39 @@ __asm __volatile("srlz.d"); } +void +map_gateway_page(void) +{ + struct ia64_pte pte; + u_int64_t psr; + + bzero(&pte, sizeof(pte)); + pte.pte_p = 1; + pte.pte_ma = PTE_MA_WB; + pte.pte_a = 1; + pte.pte_d = 1; + pte.pte_pl = PTE_PL_KERN; + pte.pte_ar = PTE_AR_X_RX; + pte.pte_ppn = IA64_RR_MASK((u_int64_t)ia64_gateway_page) >> 12; + + __asm __volatile("ptr.d %0,%1; ptr.i %0,%1" :: + "r"(VM_MAX_ADDRESS), "r"(PAGE_SHIFT << 2)); + + __asm __volatile("mov %0=psr" : "=r"(psr)); + __asm __volatile("rsm psr.ic|psr.i"); + __asm __volatile("srlz.i"); + __asm __volatile("mov cr.ifa=%0" :: "r"(VM_MAX_ADDRESS)); + __asm __volatile("mov cr.itir=%0" :: "r"(PAGE_SHIFT << 2)); + __asm __volatile("itr.d dtr[%0]=%1" :: "r"(3), "r"(*(u_int64_t*)&pte)); + __asm __volatile("srlz.d"); /* XXX not needed. */ + __asm __volatile("itr.i itr[%0]=%1" :: "r"(3), "r"(*(u_int64_t*)&pte)); + __asm __volatile("mov psr.l=%0" :: "r" (psr)); + __asm __volatile("srlz.i"); + + /* Expose the mapping to userland in ar.k7 */ + ia64_set_k7(VM_MAX_ADDRESS); +} + static void calculate_frequencies(void) { ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#28 (text+ko) ==== @@ -81,19 +81,21 @@ void ia64_ap_startup(void) { + ap_awake = 1; + ap_delay = 0; + __asm __volatile("mov cr.pta=%0;; srlz.i;;" :: "r" (vhpt_base + (1<<8) + (vhpt_size<<2) + 1)); + map_pal_code(); + map_port_space(); + map_gateway_page(); + ia64_set_fpsr(IA64_FPSR_DEFAULT); - /* - * Set ia32 control registers. - */ + /* Set ia32 control registers. */ ia64_set_cflg(CR0_PE | CR0_PG | ((long)(CR4_XMM|CR4_FXSR) << 32)); - ap_awake = 1; - ap_delay = 0; - /* Wait until it's time for us to be unleashed */ while (ap_spin) /* spin */; ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#54 (text+ko) ==== @@ -121,6 +121,7 @@ #include +#include #include #include @@ -191,9 +192,6 @@ vm_offset_t vhpt_base, vhpt_size; -/* Syscall gateway page. */ -extern u_int64_t ia64_syscall_page[]; - /* * We use an object to own the kernel's 'page tables'. For simplicity, * we use one page directory to index a set of pages containing @@ -424,8 +422,8 @@ __asm __volatile("mov cr.pta=%0;; srlz.i;;" :: "r" (vhpt_base + (1<<8) + (vhpt_size<<2) + 1)); - virtual_avail = IA64_RR_BASE(5); - virtual_end = IA64_RR_BASE(6)-1; + virtual_avail = VM_MIN_KERNEL_ADDRESS; + virtual_end = VM_MAX_KERNEL_ADDRESS; /* * Initialize protection array. @@ -472,6 +470,8 @@ * Clear out any random TLB entries left over from booting. */ pmap_invalidate_all(kernel_pmap); + + map_gateway_page(); } void * @@ -908,7 +908,7 @@ if (kernel_vm_end == 0) { kernel_vm_end = nkpt * PAGE_SIZE * NKPTEPG - + IA64_RR_BASE(5); + + VM_MIN_KERNEL_ADDRESS; } addr = (addr + PAGE_SIZE * NKPTEPG) & ~(PAGE_SIZE * NKPTEPG - 1); while (kernel_vm_end < addr) { @@ -1796,21 +1796,6 @@ pmap_install(oldpmap); } -int -pmap_wire_syscall_page(pmap, va) - pmap_t pmap; - vm_offset_t va; -{ - vm_offset_t d, pa; - struct ia64_lpte *pte; - - d = va - VM_MAX_ADDRESS; - pa = IA64_RR_MASK((u_int64_t)ia64_syscall_page) + d; - pte = pmap_find_pte(va); - pmap_set_pte(pte, va, pa, PTE_IG_MANAGED, PTE_PL_KERN, PTE_AR_X_RX); - return (0); -} - /* * Make temporary mapping for a physical address. This is called * during dump. ==== //depot/projects/ia64/sys/ia64/ia64/swtch.s#12 (text+ko) ==== @@ -417,8 +417,6 @@ add r14=PC_CURTHREAD,r13 ;; st8 [r14]=r4 // set r13->pc_curthread - mov ar.k7=r4 - ;; add r15=TD_PCB,r4 ;; ld8 r15=[r15] ==== //depot/projects/ia64/sys/ia64/ia64/syscall.s#5 (text+ko) ==== @@ -65,17 +65,35 @@ * r10 - syscall error flag */ - .section .text.syscall, "ax" + .section .text.gateway, "ax" + .align PAGE_SIZE + .global ia64_gateway_page +ia64_gateway_page: +{ .mfb + nop.m 0 + nop.f 0 + epc + ;; +} +{ .mlx + nop.m 0 + movl r16=epc_syscall + ;; +} +{ .mib + nop.m 0 + mov b7=r16 + br b7 + ;; +} .align PAGE_SIZE - .global ia64_syscall_page -ia64_syscall_page: + + .section .text.syscall, "ax" .global epc_syscall .proc epc_syscall .regstk 8,0,0,0 epc_syscall: - epc - ;; mov r16=psr // psr substitute mov r17=ar.rsc mov r18=sp @@ -242,12 +260,10 @@ ld8 r17=[r31] // restore cr.ipsr ;; ld8 r18=[r30] // restore cr.iip - mov cr.ifs=r22 + mov pr=r16,0x1ffff ;; - mov cr.iip=r18 - mov cr.ipsr=r17 - mov pr=r16,0x1ffff - br.ret.sptk rp + mov b6=r18 + br.ret.sptk b6 ;; .endp epc_syscall ==== //depot/projects/ia64/sys/ia64/ia64/trap.c#41 (text+ko) ==== @@ -562,10 +562,6 @@ vm = (p != NULL) ? p->p_vmspace : NULL; if (vm == NULL) goto no_fault_in; - if (va >= VM_MAX_ADDRESS) { - if (!pmap_wire_syscall_page(&vm->vm_pmap, va)) - goto out; - } map = &vm->vm_map; } ==== //depot/projects/ia64/sys/ia64/include/asm.h#7 (text+ko) ==== @@ -156,16 +156,15 @@ * System call glue. */ #define SYSCALLNUM(name) SYS_ ## name -#define GATEWAY_PAGE ((5 << 61) - 1048576) #define CALLSYS_NOERROR(name) \ mov r15=SYSCALLNUM(name); \ break 0x100000 ;; #define EPC_CALLSYS_NOERROR(name) \ -{ .mlx ; \ +{ .mmi ; \ alloc r9 = ar.pfs, 0, 0, 8, 0 ; \ - movl r14 = GATEWAY_PAGE ;; } \ + mov r14 = ar.k7 ;; } \ { .mib ; \ mov r8 = SYSCALLNUM(name) ; \ mov b7 = r14 ; \ ==== //depot/projects/ia64/sys/ia64/include/cpu.h#10 (text+ko) ==== @@ -135,6 +135,7 @@ void trap(int vector, int imm, struct trapframe *framep); void ia64_probe_sapics(void); int ia64_count_cpus(void); +void map_gateway_page(void); void map_pal_code(void); void map_port_space(void); void cpu_mp_add(uint, uint, uint); ==== //depot/projects/ia64/sys/ia64/include/pmap.h#9 (text+ko) ==== @@ -137,7 +137,6 @@ void pmap_set_opt (unsigned *); void pmap_set_opt_bsp (void); struct pmap *pmap_install(struct pmap *pmap); -int pmap_wire_syscall_page(struct pmap *pmap, vm_offset_t); #endif /* _KERNEL */ ==== //depot/projects/ia64/sys/ia64/include/vmparam.h#7 (text+ko) ==== @@ -139,12 +139,12 @@ /* user/kernel map constants */ #define VM_MIN_ADDRESS 0 -#define VM_MAXUSER_ADDRESS IA64_RR_BASE(5) -#define VM_MAX_ADDRESS VM_MAXUSER_ADDRESS - (1024*1024) -#define VM_MIN_KERNEL_ADDRESS IA64_RR_BASE(5) +#define VM_MAX_ADDRESS IA64_RR_BASE(5) +#define VM_MAXUSER_ADDRESS VM_MAX_ADDRESS + PAGE_SIZE +#define VM_MIN_KERNEL_ADDRESS VM_MAXUSER_ADDRESS #define VM_MAX_KERNEL_ADDRESS (IA64_RR_BASE(6) - 1) -#define KERNBASE (VM_MIN_KERNEL_ADDRESS) +#define KERNBASE VM_MAX_ADDRESS /* virtual sizes (bytes) for various kernel submaps */ #ifndef VM_KMEM_SIZE To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message