PERFORCE change 18719 for review

Robert Watson rwatson at freebsd.org
Sat Oct 5 15:38:18 GMT 2002 

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18719

Change 18719 by rwatson at rwatson_tislabs on 2002/10/05 08:38:06

	Integ TrustedBSD base tree from FreeBSD 5.0-CURRENT:
	
	- Pick up GEOM improvements, GEOM/Vinum interaction fixes
	- Loop back MAC changes, including move to label init/destroy
	  rather than object init/destroy at the policy level.
	- New ACPI
	- ABI fixes for 4.x applications

Affected files ...

.. //depot/projects/trustedbsd/base/bin/date/date.1#4 integrate
.. //depot/projects/trustedbsd/base/bin/ps/ps.h#4 integrate
.. //depot/projects/trustedbsd/base/etc/MAKEDEV#16 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#9 integrate
.. //depot/projects/trustedbsd/base/etc/rc#18 integrate
.. //depot/projects/trustedbsd/base/include/Makefile#17 integrate
.. //depot/projects/trustedbsd/base/include/regex.h#4 integrate
.. //depot/projects/trustedbsd/base/include/setjmp.h#3 integrate
.. //depot/projects/trustedbsd/base/include/string.h#6 integrate
.. //depot/projects/trustedbsd/base/include/wchar.h#10 integrate
.. //depot/projects/trustedbsd/base/lib/Makefile#10 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/iswalnum.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/mbrlen.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/gethostbydns.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/net/getnetbydns.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/string/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/string/stpcpy.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/string/strcpy.3#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/string/string.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/string/wcscoll.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/string/wcscoll.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/string/wcsxfrm.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/string/wcsxfrm.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/sys/sem.c#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/sigaction.2#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/sys/sigprocmask.2#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/man/sem_getvalue.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_kern.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libdisk/create_chunk.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libexpat/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/lib/libexpat/libbsdxml.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libopie/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/lib/libz/minigzip.c#4 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#25 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#41 integrate
.. //depot/projects/trustedbsd/base/sbin/fdisk_pc98/fdisk.c#4 integrate
.. //depot/projects/trustedbsd/base/sbin/newfs_msdos/newfs_msdos.c#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/Makefile#17 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/crypto.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/hifn.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/matcd.4#2 delete
.. //depot/projects/trustedbsd/base/share/man/man4/ubsec.4#1 branch
.. //depot/projects/trustedbsd/base/share/man/man5/utmp.5#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/Makefile#19 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/crypto.9#1 branch
.. //depot/projects/trustedbsd/base/share/man/man9/sbuf.9#4 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.kern.mk#4 integrate
.. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#10 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/busdma_machdep.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_2100_a50.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_axppci_33.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/include/bus.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/include/setjmp.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/pc98/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/boot.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/boot.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/dinode.h#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/disk.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/fs.h#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/inode.h#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/quota.h#1 branch
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/conf/NOTES#16 integrate
.. //depot/projects/trustedbsd/base/sys/conf/bsd.kern.mk#1 branch
.. //depot/projects/trustedbsd/base/sys/conf/files#36 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.alpha#10 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.i386#18 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.ia64#9 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.pc98#16 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#15 integrate
.. //depot/projects/trustedbsd/base/sys/conf/kern.mk#1 branch
.. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#14 integrate
.. //depot/projects/trustedbsd/base/sys/conf/majors#11 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/CHANGES.txt#2 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acconfig.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acdebug.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acexcep.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acglobal.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acinterp.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/aclocal.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acmacros.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acnamesp.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acparser.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/actbl2.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/actypes.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acutils.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbcmds.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbdisply.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbexec.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbinput.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbstats.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbxface.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dmnames.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dsfield.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dsobject.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dsopcode.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dsutils.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dswload.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dswscope.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/evevent.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/evmisc.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exconvrt.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/excreate.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exdump.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exmisc.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exoparg1.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exoparg2.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exresnte.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exresolv.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exresop.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exstore.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exstoren.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exstorob.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/nsdump.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/nsdumpdv.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/nsload.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/nsutils.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/psxface.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/rsdump.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/tbget.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/tbxface.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/utclib.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/utcopy.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/utdebug.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/utglobal.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/utinit.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/utmisc.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pci_link.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pcib.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pcib_pci.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pcibvar.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_resource.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751reg.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751var.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mcd/mcd.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mcd/mcd_isa.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mcd/mcdreg.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/mcd/mcdvar.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/scd/scd.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/scd/scdreg.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsec.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsecreg.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsecvar.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumconfig.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumio.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/fs/umapfs/umap_vfsops.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_dump.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_int.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_kern.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#22 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/bus_dma.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/setjmp.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/ucontext.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/matcd/TODO#2 delete
.. //depot/projects/trustedbsd/base/sys/i386/isa/matcd/audio.c#2 delete
.. //depot/projects/trustedbsd/base/sys/i386/isa/matcd/creative.h#2 delete
.. //depot/projects/trustedbsd/base/sys/i386/isa/matcd/matcd.c#4 delete
.. //depot/projects/trustedbsd/base/sys/i386/isa/matcd/matcddrv.h#2 delete
.. //depot/projects/trustedbsd/base/sys/i386/isa/matcd/options.h#2 delete
.. //depot/projects/trustedbsd/base/sys/i386/isa/mcd.c#4 delete
.. //depot/projects/trustedbsd/base/sys/i386/isa/mcdreg.h#2 delete
.. //depot/projects/trustedbsd/base/sys/i386/isa/scd.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/busdma_machdep.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/clock.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/interrupt.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/mp_machdep.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/sapic.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/vm_machdep.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/bus.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/clock.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/sapicvar.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/setjmp.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_disk.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_sbuf.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/modules/Makefile#24 integrate
.. //depot/projects/trustedbsd/base/sys/modules/acpi/Makefile#7 integrate
.. //depot/projects/trustedbsd/base/sys/modules/cryptodev/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/hifn/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/mcd/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/modules/ubsec/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/cast.c#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/cast.h#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/castsb.h#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/criov.c#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/crmbuf.c#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/crypto.c#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/crypto_if.m#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/cryptodev.c#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/cryptodev.h#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/cryptosoft.c#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/cryptosoft.h#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/deflate.c#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/deflate.h#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/rijndael.c#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/rijndael.h#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/rmd160.c#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/rmd160.h#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/skipjack.c#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/skipjack.h#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/xform.c#1 branch
.. //depot/projects/trustedbsd/base/sys/opencrypto/xform.h#1 branch
.. //depot/projects/trustedbsd/base/sys/pc98/pc98/fd.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/posix4/semaphore.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#9 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/include/db_machdep.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/include/param.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/include/setjmp.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/db_disasm.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/db_interface.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/db_memrw.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/db_trace.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/pmap.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/trap.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/bus.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/setjmp.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/bus_machdep.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/sys/_sigset.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sys/dmap.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sys/file.h#13 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/sys/random.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sbuf.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/sys/select.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/sys/signal.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/sys/types.h#13 integrate
.. //depot/projects/trustedbsd/base/tools/regression/geom/ConfCmp/ConfCmp.c#4 integrate
.. //depot/projects/trustedbsd/base/tools/regression/geom/ConfCmp/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/tools/regression/geom/GLib/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/tools/regression/geom/Test/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T014/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/tools/regression/geom/geom.c#4 integrate
.. //depot/projects/trustedbsd/base/tools/regression/geom/geom_simdisk.c#5 integrate
.. //depot/projects/trustedbsd/base/tools/regression/geom/geom_simdisk_xml.c#4 integrate
.. //depot/projects/trustedbsd/base/tools/tools/README#5 integrate
.. //depot/projects/trustedbsd/base/tools/tools/find-sb/Makefile#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/find-sb/README#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/find-sb/find-sb.c#1 branch
.. //depot/projects/trustedbsd/base/usr.bin/make/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/make/job.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.bin/make/job.h#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/minigzip/minigzip.1#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/unexpand/unexpand.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.bin/xmlwf/Makefile#2 delete

Differences ...

==== //depot/projects/trustedbsd/base/bin/date/date.1#4 (text+ko) ====

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD: src/bin/date/date.1,v 1.57 2002/04/16 14:28:47 trhodes Exp $
+.\" $FreeBSD: src/bin/date/date.1,v 1.58 2002/10/03 14:11:29 fanf Exp $
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -168,7 +168,7 @@
 When setting values
 (rather than adjusting them),
 seconds are in the range 0-59, minutes are in the range 0-59, hours are
-in the range 1-12, month days are in the range 1-31, week days are in the
+in the range 0-23, month days are in the range 1-31, week days are in the
 range 0-6 (Sun-Sat),
 months are in the range 1-12 (Jan-Dec)
 and years are in the range 80-38 or 1980-2038.

==== //depot/projects/trustedbsd/base/bin/ps/ps.h#4 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ps.h	8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/bin/ps/ps.h,v 1.12 2002/09/17 17:13:52 jmallett Exp $
+ * $FreeBSD: src/bin/ps/ps.h,v 1.14 2002/10/03 17:19:36 bde Exp $
  */
 
 #define	UNLIMITED	0	/* unlimited terminal width */
@@ -69,7 +69,7 @@
 	 * to the generic output routine pvar (which prints simple elements
 	 * from the well known kinfo_proc structure).
 	 */
-	off_t	off;		/* offset in structure */
+	size_t	off;		/* offset in structure */
 	enum	type type;	/* type of element */
 	const char *fmt;	/* printf format */
 	short	dwidth;		/* dynamic printing width */

==== //depot/projects/trustedbsd/base/etc/MAKEDEV#16 (text+ko) ====

@@ -20,7 +20,7 @@
 # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 #	@(#)MAKEDEV	5.2 (Berkeley) 6/22/90
-# $FreeBSD: src/etc/MAKEDEV,v 1.328 2002/09/17 22:39:16 sam Exp $
+# $FreeBSD: src/etc/MAKEDEV,v 1.329 2002/10/04 20:44:46 sam Exp $
 #
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, standard number of units (or close)
@@ -128,6 +128,7 @@
 #	apm	Advanced Power Management BIOS
 #	apmctl	APM BIOS control device
 #	bpf*	packet filter
+#	crypto	crypto interface
 #	speaker	pc speaker
 #	tw*	xten power controller
 #	snd*	various sound cards
@@ -341,6 +342,7 @@
 	sh $0 agpgart					# AGP
  	sh $0 nsmb0					# SMB/CIFS
 	sh $0 ti0 ti1					# ti(4)
+	sh $0 crypto					# crypto
 	;;
 
 # a much restricted set of the above, to save precious i-nodes on the
@@ -1770,6 +1772,11 @@
 	chmod 600 elan-mmcr
 	;;
 
+crypto)
+	mknod crypto c 70 0 root:operator
+	chmod 666 crypto
+	;;
+
 local)
 	umask 0			# XXX should be elsewhere
 	sh $0.local

==== //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#9 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.57 2002/09/19 08:35:12 truckman Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.58 2002/10/04 20:44:28 sam Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -11,6 +11,8 @@
         scsi
         ..
     ..
+    crypto
+    ..
     dev
         an
         ..

==== //depot/projects/trustedbsd/base/etc/rc#18 (text+ko) ====

@@ -25,7 +25,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)rc	5.27 (Berkeley) 6/5/91
-# $FreeBSD: src/etc/rc,v 1.320 2002/10/02 00:59:14 dd Exp $
+# $FreeBSD: src/etc/rc,v 1.321 2002/10/03 20:39:29 schweikh Exp $
 #
 
 # System startup script run by init on autoboot
@@ -54,10 +54,10 @@
 # XXX - The only purpose of duplicating it here is to catch rc_ng="YES"
 #
 if [ -r /etc/defaults/rc.conf ]; then
-        . /etc/defaults/rc.conf
-        source_rc_confs
+	. /etc/defaults/rc.conf
+	source_rc_confs
 elif [ -r /etc/rc.conf ]; then
-        . /etc/rc.conf
+	. /etc/rc.conf
 fi
 
 # Diskless setups have to depend on a different mechanism since
@@ -75,9 +75,9 @@
 	load_rc_config 'XXX'
 
 	if [ "$1" = autoboot ]; then
-        	autoboot=yes
+		autoboot=yes
 		_boot="faststart"
-        	rc_fast=yes        # run_rc_command(): do fast booting
+		rc_fast=yes        # run_rc_command(): do fast booting
 	else
 		autoboot=no
 		_boot="start"
@@ -87,7 +87,7 @@
 	files=`rcorder -k ${os} -s nostart /etc/rc.d/* 2>/dev/null`
 
 	for _rc_elem in ${files}; do
-        	run_rc_script ${_rc_elem} ${_boot}
+		run_rc_script ${_rc_elem} ${_boot}
 		# Local FreeBSD hack to reload the rc.conf on
 		# a return status of 2
 		if [ $? -eq 2 ]; then
@@ -158,12 +158,12 @@
 	[Yy][Ee][Ss])
 		case ${dep_val} in
 		[Yy][Ee][Ss])
-		    ;;
+			;;
 		*)
-		    eval ${dep_var}="YES"
-		    echo "DEPENDENCY NOTE: ${dep} will be enabled" \
-			 "to support ${svc}"
-		    ;;
+			eval ${dep_var}="YES"
+			echo "DEPENDENCY NOTE: ${dep} will be enabled" \
+			"to support ${svc}"
+			;;
 		esac
 		;;
 	esac
@@ -545,10 +545,10 @@
 	fi
 	case "`mount -d -a -t ${fstype}`" in
 	*mount_${fstype}*)
-	       echo -n "Mounting ${fsdecr} filesystems:"
-	       mount -a -t ${fstype}
-	       echo '.'
-	       ;;
+		echo -n "Mounting ${fsdecr} filesystems:"
+		mount -a -t ${fstype}
+		echo '.'
+		;;
 	esac
 done
 

==== //depot/projects/trustedbsd/base/include/Makefile#17 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.180 2002/10/01 13:29:45 ru Exp $
+# $FreeBSD: src/include/Makefile,v 1.181 2002/10/04 20:44:26 sam Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -83,7 +83,7 @@
 .endfor
 
 copies:
-.for i in ${LDIRS} ${LSYMSUBDIRS} machine
+.for i in ${LDIRS} ${LSYMSUBDIRS} machine crypto
 	if [ -L ${DESTDIR}/usr/include/$i ]; then \
 		rm -f ${DESTDIR}/usr/include/$i; \
 	fi
@@ -95,6 +95,9 @@
 		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
 		${DESTDIR}/usr/include/$i
 .endfor
+	cd ${.CURDIR}/../sys; \
+		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 opencrypto/*.h \
+		${DESTDIR}/usr/include/crypto
 .if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include)
 	cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \
 		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
@@ -112,6 +115,8 @@
 	rm -rf ${DESTDIR}/usr/include/$i
 	ln -s ../../sys/$i ${DESTDIR}/usr/include/$i
 .endfor
+	rm -rf ${DESTDIR}/usr/include/crypto
+	ln -s ../../sys/opencrypto ${DESTDIR}/usr/include/crypto
 .for i in ${LSYMSUBDIRS}
 	rm -rf ${DESTDIR}/usr/include/$i
 	ln -s ../../../sys/$i ${DESTDIR}/usr/include/$i

==== //depot/projects/trustedbsd/base/include/regex.h#4 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)regex.h	8.2 (Berkeley) 1/3/94
- * $FreeBSD: src/include/regex.h,v 1.5 2002/10/02 07:48:13 mike Exp $
+ * $FreeBSD: src/include/regex.h,v 1.6 2002/10/03 18:12:03 mike Exp $
  */
 
 #ifndef _REGEX_H_
@@ -105,8 +105,13 @@
 __BEGIN_DECLS
 int	regcomp(regex_t * __restrict, const char * __restrict, int);
 size_t	regerror(int, const regex_t * __restrict, char * __restrict, size_t);
+/*
+ * XXX forth parameter should be `regmatch_t [__restrict]', but isn't because
+ * of a bug in GCC 3.2 (when -std=c99 is specified) which perceives this as a
+ * syntax error.
+ */
 int	regexec(const regex_t * __restrict, const char * __restrict, size_t,
-	    regmatch_t [__restrict], int);
+	    regmatch_t * __restrict, int);
 void	regfree(regex_t *);
 __END_DECLS
 

==== //depot/projects/trustedbsd/base/include/setjmp.h#3 (text+ko) ====

@@ -36,31 +36,31 @@
  * SUCH DAMAGE.
  *
  *	@(#)setjmp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: src/include/setjmp.h,v 1.7 2002/03/23 17:24:53 imp Exp $
+ * $FreeBSD: src/include/setjmp.h,v 1.8 2002/10/05 05:48:50 mike Exp $
  */
 
 #ifndef _SETJMP_H_
 #define _SETJMP_H_
 
+#include <sys/cdefs.h>
+
 /* The size of the jmp_buf is machine dependent: */
 #include <machine/setjmp.h>
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
+#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
+void	_longjmp(jmp_buf, int) __dead2;
+int	_setjmp(jmp_buf);
+#endif
+void	longjmp(jmp_buf, int) __dead2;
+#if __BSD_VISIBLE
+void	longjmperror(void);
+#endif
 int	setjmp(jmp_buf);
-void	longjmp(jmp_buf, int) __dead2;
-
-#ifndef _ANSI_SOURCE
+#if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE
+void	siglongjmp(sigjmp_buf, int) __dead2;
 int	sigsetjmp(sigjmp_buf, int);
-void	siglongjmp(sigjmp_buf, int) __dead2;
-#endif /* not ANSI */
-
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-int	_setjmp(jmp_buf);
-void	_longjmp(jmp_buf, int) __dead2;
-void	longjmperror(void);
-#endif /* neither ANSI nor POSIX */
+#endif
 __END_DECLS
 
 #endif /* !_SETJMP_H_ */

==== //depot/projects/trustedbsd/base/include/string.h#6 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)string.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/string.h,v 1.15 2002/08/21 16:19:55 mike Exp $
+ * $FreeBSD: src/include/string.h,v 1.16 2002/10/03 19:51:04 obrien Exp $
  */
 
 #ifndef _STRING_H_
@@ -68,6 +68,7 @@
 int	 strcmp(const char *, const char *);
 int	 strcoll(const char *, const char *);
 char	*strcpy(char * __restrict, const char * __restrict);
+char	*stpcpy(char *, const char *);
 size_t	 strcspn(const char *, const char *);
 char	*strerror(int);
 size_t	 strlen(const char *);

==== //depot/projects/trustedbsd/base/include/wchar.h#10 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/include/wchar.h,v 1.31 2002/09/28 07:43:43 tjr Exp $
+ * $FreeBSD: src/include/wchar.h,v 1.32 2002/10/04 03:18:25 tjr Exp $
  */
 
 /*-
@@ -141,6 +141,7 @@
 wchar_t	*wcscat(wchar_t * __restrict, const wchar_t * __restrict);
 wchar_t	*wcschr(const wchar_t *, wchar_t);
 int	wcscmp(const wchar_t *, const wchar_t *);
+int	wcscoll(const wchar_t *, const wchar_t *);
 wchar_t	*wcscpy(wchar_t * __restrict, const wchar_t * __restrict);
 size_t	wcscspn(const wchar_t *, const wchar_t *);
 size_t	wcsftime(wchar_t * __restrict, size_t, const wchar_t * __restrict,
@@ -156,6 +157,7 @@
 	    mbstate_t * __restrict);
 size_t	wcsspn(const wchar_t *, const wchar_t *);
 wchar_t	*wcsstr(const wchar_t * __restrict, const wchar_t * __restrict);
+size_t	wcsxfrm(wchar_t * __restrict, const wchar_t * __restrict, size_t);
 int	wctob(wint_t);
 double	wcstod(const wchar_t * __restrict, wchar_t ** __restrict);
 wchar_t	*wcstok(wchar_t * __restrict, const wchar_t * __restrict,

==== //depot/projects/trustedbsd/base/lib/Makefile#10 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.144 2002/09/19 08:06:23 julian Exp $
+# $FreeBSD: src/lib/Makefile,v 1.145 2002/10/04 13:40:39 phk Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
@@ -25,7 +25,7 @@
 	libncurses libradius librpcsvc libsbuf libtacplus libutil libypclnt \
 	${_compat} libalias libatm ${_libbind} libbz2 libc ${_libc_r} \
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
-	libedit libfetch libform libftpio ${_libio} libipsec \
+	libedit libexpat libfetch libform libftpio ${_libio} libipsec \
 	libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \
 	libnetgraph libopie libpam libpanel libpcap \
 	${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \

==== //depot/projects/trustedbsd/base/lib/libc/locale/iswalnum.3#2 (text+ko) ====

@@ -36,7 +36,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isalnum.3	5.2 (Berkeley) 6/29/91
-.\" $FreeBSD: src/lib/libc/locale/iswalnum.3,v 1.3 2002/08/05 11:02:04 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/iswalnum.3,v 1.4 2002/10/03 14:09:06 tjr Exp $
 .\"
 .Dd December 22, 2000
 .Dt ISWALNUM 3
@@ -105,15 +105,16 @@
 .Ft int
 .Fn iswxdigit "wint_t wc"
 .Sh DESCRIPTION
-The functions are character classification utility functions,
+The above functions are character classification utility functions,
 for use with wide characters
 .Po
 .Fa wchar_t
 or
 .Fa wint_t
 .Pc .
-See description for singlebyte classification functions, like
-.Xr isalnum 3 ,
+See the description for the similarly-named single byte classification
+functions (like
+.Xr isalnum 3 ),
 for details.
 .Sh RETURN VALUES
 The functions return zero if the character tests false and
@@ -155,5 +156,7 @@
 .Fx
 extensions.
 .Sh CAVEATS
-The argument to these functions must be WEOF or valid wchar_t
-value with current locale; otherwise, the result is undefined.
+The result of these functions is undefined unless
+the argument is WEOF or a valid
+.Vt wchar_t
+value for the current locale.

==== //depot/projects/trustedbsd/base/lib/libc/locale/mbrlen.3#3 (text+ko) ====

@@ -22,8 +22,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/locale/mbrlen.3,v 1.2 2002/09/06 11:23:45 tjr Exp $
-.Dd August 16, 2002
+.\" $FreeBSD: src/lib/libc/locale/mbrlen.3,v 1.3 2002/10/03 14:07:26 tjr Exp $
+.Dd October 4, 2002
 .Dt MBRLEN 3
 .Os
 .Sh NAME
@@ -91,6 +91,27 @@
 .Fa s
 is an invalid multibyte sequence.
 .El
+.Sh EXAMPLES
+A function which calculates the number of characters in a multibyte
+character string:
+.Bd -literal -offset indent
+size_t
+nchars(const char *s)
+{
+	size_t charlen, chars;
+	mbstate_t mbs;
+
+	chars = 0;
+	memset(&mbs, 0, sizeof(mbs));
+	while ((charlen = mbrlen(s, MB_CUR_MAX, &mbs)) != 0 &&
+	    charlen != (size_t)-1 && charlen != (size_t)-2) {
+		s += charlen;
+		chars++;
+	}
+
+	return (chars);
+}
+.Ed
 .Sh ERRORS
 The
 .Fn mbrlen

==== //depot/projects/trustedbsd/base/lib/libc/net/gethostbydns.c#6 (text+ko) ====

@@ -58,7 +58,7 @@
 static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.39 2002/09/15 16:51:09 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.40 2002/10/03 17:25:33 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -68,6 +68,7 @@
 #include <arpa/nameser.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <netdb.h>
@@ -103,11 +104,7 @@
 static void dprintf(char *, int) __printflike(1, 0);
 #endif
 
-#if PACKETSZ > 1024
-#define	MAXPACKET	PACKETSZ
-#else
-#define	MAXPACKET	1024
-#endif
+#define MAXPACKET	(64*1024)
 
 typedef union {
     HEADER hdr;
@@ -477,7 +474,7 @@
 {
 	const char *name;
 	int af;
-	querybuf buf;
+	querybuf *buf;
 	const char *cp;
 	char *bp, *ep;
 	int n, size, type, len;
@@ -587,15 +584,22 @@
 				break;
 		}
 
-	n = res_search(name, C_IN, type, buf.buf, sizeof(buf.buf));
+	if ((buf = malloc(sizeof(*buf))) == NULL) {
+		h_errno = NETDB_INTERNAL;
+		return NS_NOTFOUND;
+	}
+	n = res_search(name, C_IN, type, buf->buf, sizeof(buf->buf));
 	if (n < 0) {
+		free(buf);
 		dprintf("res_search failed (%d)\n", n);
 		return (NULL);
-	} else if (n > sizeof(buf.buf)) {
+	} else if (n > sizeof(buf->buf)) {
+		free(buf);
 		dprintf("static buffer is too small (%d)\n", n);
 		return (NULL);
 	}
-	*(struct hostent **)rval = gethostanswer(&buf, n, name, type);
+	*(struct hostent **)rval = gethostanswer(buf, n, name, type);
+	free(buf);
 	return (*(struct hostent **)rval != NULL) ? NS_SUCCESS : NS_NOTFOUND;
 }
 
@@ -608,7 +612,7 @@
 	static const u_char mapped[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0xff,0xff };
 	static const u_char tunnelled[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0,0 };
 	int n, size;
-	querybuf buf;
+	querybuf *buf;
 	struct hostent *hp;
 	char qbuf[MAXDNAME+1], *qp;
 #ifdef SUNSECURITY
@@ -675,17 +679,26 @@
 	default:
 		abort();
 	}
-	n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf.buf, sizeof buf.buf);
+	if ((buf = malloc(sizeof(*buf))) == NULL) {
+		h_errno = NETDB_INTERNAL;
+		return NS_NOTFOUND;
+	}
+	n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf->buf, sizeof buf->buf);
 	if (n < 0) {
+		free(buf);
 		dprintf("res_query failed (%d)\n", n);
 		return NS_UNAVAIL;
 	}
-	if (n > sizeof buf.buf) {
+	if (n > sizeof buf->buf) {
+		free(buf);
 		dprintf("static buffer is too small (%d)\n", n);
 		return NS_UNAVAIL;
 	}
-	if (!(hp = gethostanswer(&buf, n, qbuf, T_PTR)))
+	if (!(hp = gethostanswer(buf, n, qbuf, T_PTR))) {
+		free(buf);
 		return NS_NOTFOUND;   /* h_errno was set by gethostanswer() */
+	}
+	free(buf);
 #ifdef SUNSECURITY
 	if (af == AF_INET) {
 	    /*

==== //depot/projects/trustedbsd/base/lib/libc/net/getnetbydns.c#6 (text+ko) ====

@@ -62,7 +62,7 @@
 static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getnetbydns.c,v 1.25 2002/09/19 11:36:47 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnetbydns.c,v 1.26 2002/10/03 17:25:33 ume Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
@@ -71,6 +71,7 @@
 #include <arpa/nameser.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <netdb.h>
 #include <resolv.h>
 #include <ctype.h>
@@ -88,11 +89,7 @@
 #define BYNAME 1
 #define	MAXALIASES	35
 
-#if PACKETSZ > 1024
-#define	MAXPACKET	PACKETSZ
-#else
-#define	MAXPACKET	1024
-#endif
+#define MAXPACKET	(64*1024)
 
 typedef union {
 	HEADER	hdr;
@@ -228,7 +225,7 @@
 	int net_type;
 	unsigned int netbr[4];
 	int nn, anslen;
-	querybuf buf;
+	querybuf *buf;
 	char qbuf[MAXDNAME];
 	unsigned long net2;
 	struct netent *net_entry;
@@ -259,21 +256,28 @@
 		    netbr[1], netbr[0]);
 		break;
 	}
-	anslen = res_query(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
+	if ((buf = malloc(sizeof(*buf))) == NULL) {
+		h_errno = NETDB_INTERNAL;
+		return NS_NOTFOUND;
+	}
+	anslen = res_query(qbuf, C_IN, T_PTR, (u_char *)buf, sizeof(*buf));
 	if (anslen < 0) {
+		free(buf);
 #ifdef DEBUG
 		if (_res.options & RES_DEBUG)
 			printf("res_search failed\n");
 #endif
 		return NS_UNAVAIL;
-	} else if (anslen > sizeof(buf)) {
+	} else if (anslen > sizeof(*buf)) {
+		free(buf);
 #ifdef DEBUG
 		if (_res.options & RES_DEBUG)
 			printf("res_search static buffer too small\n");
 #endif
 		return NS_UNAVAIL;
 	}
-	net_entry = getnetanswer(&buf, anslen, BYADDR);
+	net_entry = getnetanswer(buf, anslen, BYADDR);
+	free(buf);
 	if (net_entry) {
 		unsigned u_net = net;	/* maybe net should be unsigned ? */
 
@@ -292,7 +296,7 @@
 {
 	const char *net;
 	int anslen;
-	querybuf buf;
+	querybuf *buf;
 	char qbuf[MAXDNAME];
 
 	net = va_arg(ap, const char *);
@@ -303,23 +307,30 @@
 		h_errno = NETDB_INTERNAL;
 		return NS_UNAVAIL;
 	}
+	if ((buf = malloc(sizeof(*buf))) == NULL) {
+		h_errno = NETDB_INTERNAL;
+		return NS_NOTFOUND;
+	}
 	strncpy(qbuf, net, sizeof(qbuf) - 1);
 	qbuf[sizeof(qbuf) - 1] = '\0';
-	anslen = res_search(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
+	anslen = res_search(qbuf, C_IN, T_PTR, (u_char *)buf, sizeof(*buf));
 	if (anslen < 0) {
+		free(buf);
 #ifdef DEBUG
 		if (_res.options & RES_DEBUG)
 			printf("res_search failed\n");
 #endif
 		return NS_UNAVAIL;
-	} else if (anslen > sizeof(buf)) {
+	} else if (anslen > sizeof(*buf)) {
+		free(buf);
 #ifdef DEBUG
 		if (_res.options & RES_DEBUG)
 			printf("res_search static buffer too small\n");
 #endif
 		return NS_UNAVAIL;
 	}
-	*(struct netent**)rval = getnetanswer(&buf, anslen, BYNAME);
+	*(struct netent**)rval = getnetanswer(buf, anslen, BYNAME);
+	free(buf);
 	return (*(struct netent**)rval != NULL) ? NS_SUCCESS : NS_NOTFOUND;
 }
 

==== //depot/projects/trustedbsd/base/lib/libc/string/Makefile.inc#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.29 2002/09/07 08:16:57 tjr Exp $
+# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.31 2002/10/04 03:18:26 tjr Exp $
 
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/string ${.CURDIR}/../libc/string
 
@@ -7,14 +7,16 @@
 
 # machine-independent string sources
 MISRCS+=bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \
-	memcpy.c memmove.c memset.c rindex.c strcasecmp.c strcat.c strchr.c \
-	strcmp.c strcoll.c strcpy.c strcspn.c strdup.c strerror.c \
+	memcpy.c memmove.c memset.c rindex.c stpcpy.c strcasecmp.c strcat.c \
+	strchr.c strcmp.c strcoll.c strcpy.c strcspn.c strdup.c strerror.c \
 	strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c strncpy.c \
 	strcasestr.c strnstr.c \
 	strpbrk.c strrchr.c strsep.c strsignal.c strspn.c strstr.c strtok.c \
-	strxfrm.c swab.c wcscat.c wcschr.c wcscmp.c wcscpy.c wcscspn.c \
+	strxfrm.c swab.c wcscat.c wcschr.c wcscmp.c wcscoll.c wcscpy.c \
+	wcscspn.c \
 	wcslcat.c wcslcpy.c wcslen.c wcsncat.c wcsncmp.c wcsncpy.c wcspbrk.c \
-	wcsrchr.c wcsspn.c wcsstr.c wcstok.c wcswidth.c wmemchr.c wmemcmp.c \
+	wcsrchr.c wcsspn.c wcsstr.c wcstok.c wcswidth.c wcsxfrm.c wmemchr.c \
+	wmemcmp.c \
 	wmemcpy.c wmemmove.c wmemset.c
 
 
@@ -28,12 +30,13 @@
 	memcmp.3 memcpy.3 memmove.3 memset.3 rindex.3 strcasecmp.3 strcat.3 \
 	strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strdup.3 strerror.3 \
 	string.3 strlcpy.3 strlen.3 strmode.3 strpbrk.3 strrchr.3 strsep.3 \
-	strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3 wcstok.3 wcswidth.3 \
-	wmemchr.3
+	strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3 wcscoll.3 wcstok.3 \
+	wcswidth.3 wcsxfrm.3 wmemchr.3
 
 MLINKS+=strcasecmp.3 strncasecmp.3
 MLINKS+=strcat.3 strncat.3
 MLINKS+=strcmp.3 strncmp.3
+MLINKS+=strcpy.3 stpcpy.3
 MLINKS+=strcpy.3 strncpy.3
 MLINKS+=strerror.3 perror.3 strerror.3 sys_errlist.3 strerror.3 sys_nerr.3
 MLINKS+=strerror.3 strerror_r.3

==== //depot/projects/trustedbsd/base/lib/libc/string/strcpy.3#6 (text+ko) ====

@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strcpy.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/string/strcpy.3,v 1.17 2002/09/06 11:24:06 tjr Exp $

>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message

More information about the trustedbsd-cvs mailing list