PERFORCE change 35341 for review
Robert Watson
rwatson at FreeBSD.org
Fri Aug 1 16:38:25 GMT 2003
http://perforce.freebsd.org/chv.cgi?CH=35341
Change 35341 by rwatson at rwatson_tislabs on 2003/08/01 09:38:04
Further integrate the TrustedBSD base branch, looping back recent
Biba, MLS, and kern_mac.c drops to the main FreeBSD tree. Also,
some critical UMA bugfixes.
Affected files ...
.. //depot/projects/trustedbsd/base/MAINTAINERS#20 integrate
.. //depot/projects/trustedbsd/base/UPDATING#35 integrate
.. //depot/projects/trustedbsd/base/contrib/isc-dhcp/FREEBSD-upgrade#5 integrate
.. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.8#5 integrate
.. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/scripts/freebsd#4 integrate
.. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/dispatch.c#4 integrate
.. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/dhcpd.h#6 integrate
.. //depot/projects/trustedbsd/base/contrib/one-true-awk/FIXES#6 integrate
.. //depot/projects/trustedbsd/base/contrib/one-true-awk/FREEBSD-upgrade#6 integrate
.. //depot/projects/trustedbsd/base/contrib/one-true-awk/b.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/one-true-awk/lex.c#4 integrate
.. //depot/projects/trustedbsd/base/contrib/one-true-awk/main.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/one-true-awk/run.c#6 integrate
.. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/ctx.c#7 integrate
.. //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/mount_smbfs.8#4 integrate
.. //depot/projects/trustedbsd/base/etc/auth.conf#3 integrate
.. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#29 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#17 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#27 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#12 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/atm1#5 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/atm2#1 branch
.. //depot/projects/trustedbsd/base/etc/rc.d/atm2.sh#6 delete
.. //depot/projects/trustedbsd/base/etc/rc.d/atm3#1 branch
.. //depot/projects/trustedbsd/base/etc/rc.d/atm3.sh#3 delete
.. //depot/projects/trustedbsd/base/etc/rc.d/dhclient#6 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/hostname#2 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/ipfilter#9 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/ipfw#5 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/ipsec#6 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/netif#3 integrate
.. //depot/projects/trustedbsd/base/etc/rc.d/ttys#4 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_int/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/gnu/usr.bin/patch/backupfile.c#3 integrate
.. //depot/projects/trustedbsd/base/kerberos5/lib/libasn1/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/kerberos5/lib/libhdb/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/atm_addr.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/cache_key.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/ioctl_subr.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/ip_addr.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/ip_checksum.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libatm/libatm.h#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/makecontext.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/arc4random.3#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_get_ldt.2#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#14 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/gb18030.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/setrunelocale.c#9 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#13 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdlib/random.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/string/Makefile.inc#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/string/index.3#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/string/rindex.3#4 delete
.. //depot/projects/trustedbsd/base/lib/libc/string/strchr.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/string/strrchr.3#2 delete
.. //depot/projects/trustedbsd/base/lib/libkvm/kvm.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libkvm/kvm.h#4 integrate
.. //depot/projects/trustedbsd/base/lib/libkvm/kvm_file.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libkvm/kvm_getswapinfo.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#16 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/enter_uts.S#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/include/ksd.h#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/_atomic_lock.S#2 delete
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/thr_enter_uts.S#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/thr_getcontext.S#2 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/thr_switch.S#4 delete
.. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/include/pthread_md.h#3 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_concurrency.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#6 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#11 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#10 integrate
.. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigwait.c#7 integrate
.. //depot/projects/trustedbsd/base/release/Makefile#47 integrate
.. //depot/projects/trustedbsd/base/release/alpha/dokern.sh#11 delete
.. //depot/projects/trustedbsd/base/release/alpha/drivers.conf#14 delete
.. //depot/projects/trustedbsd/base/release/alpha/fixit_crunch.conf#6 delete
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#8 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#70 integrate
.. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml#3 integrate
.. //depot/projects/trustedbsd/base/release/ia64/dokern.sh#2 delete
.. //depot/projects/trustedbsd/base/release/ia64/mkisoimages.sh#3 integrate
.. //depot/projects/trustedbsd/base/release/pc98/dokern.sh#12 integrate
.. //depot/projects/trustedbsd/base/release/sparc64/dokern.sh#2 delete
.. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/atm/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/atm/atm.8#3 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/atm/atm.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/atm/atm.h#3 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/atm/atm_eni.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/atm/atm_fore200.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/atm/atm_inet.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/atm/atm_print.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/atm/atm_set.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/atm/atm_show.c#4 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/atm/atm_subr.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/fore_dnld/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/fore_dnld/fore_dnld.8#3 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/fore_dnld/fore_dnld.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/atm/fore_dnld/pca200e.c#2 integrate
.. //depot/projects/trustedbsd/base/sbin/dhclient/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsutil.c#14 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_ffs/main.c#12 integrate
.. //depot/projects/trustedbsd/base/sbin/fsck_ffs/setup.c#18 integrate
.. //depot/projects/trustedbsd/base/share/colldef/Makefile#14 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#8 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/puc.4#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#31 integrate
.. //depot/projects/trustedbsd/base/share/man/man7/Makefile#12 integrate
.. //depot/projects/trustedbsd/base/share/man/man7/rescue.7#2 delete
.. //depot/projects/trustedbsd/base/share/man/man8/Makefile#10 integrate
.. //depot/projects/trustedbsd/base/share/man/man8/rescue.8#1 branch
.. //depot/projects/trustedbsd/base/share/man/man9/bus_dma.9#4 integrate
.. //depot/projects/trustedbsd/base/share/mklocale/Makefile#13 integrate
.. //depot/projects/trustedbsd/base/share/mklocale/zh_CN.GB18030.src#1 branch
.. //depot/projects/trustedbsd/base/share/monetdef/Makefile#13 integrate
.. //depot/projects/trustedbsd/base/share/monetdef/zh_CN.GB18030.src#1 branch
.. //depot/projects/trustedbsd/base/share/msgdef/Makefile#13 integrate
.. //depot/projects/trustedbsd/base/share/msgdef/zh_CN.GB18030.src#1 branch
.. //depot/projects/trustedbsd/base/share/numericdef/Makefile#13 integrate
.. //depot/projects/trustedbsd/base/share/numericdef/zh_TW.Big5.src#2 delete
.. //depot/projects/trustedbsd/base/share/timedef/Makefile#12 integrate
.. //depot/projects/trustedbsd/base/share/timedef/zh_CN.GB18030.src#1 branch
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/busdma_machdep.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/mp_machdep.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/alpha/vm_machdep.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/include/bus.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/alpha/include/param.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/amd64_mem.c#1 branch
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/busdma_machdep.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/amd64/vm_machdep.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/bus_dma.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/amd64/include/param.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/cam/cam_ccb.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/conf/NOTES#39 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.alpha#17 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.amd64#4 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.i386#33 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files.ia64#20 integrate
.. //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#20 integrate
.. //depot/projects/trustedbsd/base/sys/conf/options#39 integrate
.. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbcmds.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/ddb/db_command.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/ddb/db_output.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/ddb/db_ps.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/ddb/ddb.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_ec.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ahb/ahb.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/amd/amd.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_pccard.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fatm/if_fatm.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fatm/if_fatmvar.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/firewirereg.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/fwdev.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/if_fwe.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatm.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatm_ioctl.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatm_tx.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hatm/if_hatmvar.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hea/eni_if.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hfa/fore_aali.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hfa/fore_command.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hfa/fore_if.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hfa/fore_init.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hfa/fore_intr.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hfa/fore_output.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hfa/fore_var.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hfa/fore_vcm.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hfa/hfa_freebsd.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hfa/hfa_freebsd.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/md/md.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/dev/patm/if_patm.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/patm/if_patm_ioctl.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/patm/if_patm_tx.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs.h#23 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pdq/if_fea.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ppc/ppc.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ppc/ppc_puc.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/ppc/ppcvar.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/puc/puc.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/raidframe/rf_freebsdkintf.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/dev/usb/usb_mem.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/utopia/utopia.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pci.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_ccd.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_mbr.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/locore.s#13 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#35 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/bus_dma.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/include/pcpu.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/i386/isa/pcvt/pcvt_hdr.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/busdma_machdep.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/mp_machdep.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia64/vm_machdep.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/bus.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/include/param.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/isa/ppc.c#8 delete
.. //depot/projects/trustedbsd/base/sys/isa/ppcreg.h#2 delete
.. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_alq.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#42 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_ktr.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#44 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/kern/link_elf.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_trap.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#37 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sys_generic.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#31 integrate
.. //depot/projects/trustedbsd/base/sys/kern/tty_cons.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#46 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#39 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#18 integrate
.. //depot/projects/trustedbsd/base/sys/modules/cam/Makefile#6 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_atm.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_atmsubr.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_spppsubr.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_if.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_ioctl.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_usrreq.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_vc.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_usrreq.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/sigpvc/sigpvc_if.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_arp.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_if.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/uniarp.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/uniarp_cache.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/uniip_var.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_if.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/atm/ng_atm.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/netgraph/atm/ng_atm.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/ip6_fw.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/netsmb/smb_conn.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_lock.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/i386/machdep.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/pccard/pcic_pci.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_dc.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_rl.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#25 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_xl.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/pci/ncr.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/include/bus.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/include/param.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/busdma_machdep.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/machdep.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/pmap.c#21 integrate
.. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/vm_machdep.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#32 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/bus.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/param.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/bus_machdep.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/iommu.c#16 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/machdep.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#38 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/vm_machdep.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/sys/lock.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/sys/param.h#28 integrate
.. //depot/projects/trustedbsd/base/sys/sys/vnode.h#38 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/extattr.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extattr.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#22 integrate
.. //depot/projects/trustedbsd/base/sys/vm/swap_pager.h#11 integrate
.. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/vm/uma_int.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#29 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_kern.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#38 integrate
.. //depot/projects/trustedbsd/base/tools/regression/README#7 integrate
.. //depot/projects/trustedbsd/base/tools/regression/pipe/Makefile#1 branch
.. //depot/projects/trustedbsd/base/tools/regression/pipe/bigpipetest.c#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/release/chk_dokern.sh_and_drivers.conf#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/ada.rc#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/current.rc#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/default.rc#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/dsa.rc#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/dwp.rc#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/Makefile#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/ada.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/current.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/default.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/dsa.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/dwp.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/experimental.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/releng_4.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/etc/stanley.rc#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/releng_4.rc#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/stanley.rc#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.1#3 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.pl#11 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/daemon.png#1 branch
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/index.cgi#3 integrate
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/valid-css.gif#2 delete
.. //depot/projects/trustedbsd/base/tools/tools/tinderbox/www/valid-css.png#1 branch
.. //depot/projects/trustedbsd/base/usr.bin/last/last.1#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/last/last.c#9 integrate
.. //depot/projects/trustedbsd/base/usr.bin/mklocale/yacc.y#10 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/acpi/acpiconf/acpiconf.8#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/acpi/acpiconf/acpiconf.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/atm/atmarpd/atmarp_log.c#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/atm/atmarpd/atmarp_subr.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/atm/atmarpd/atmarpd.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/atm/scspd/scsp_subr.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/edquota/edquota.8#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/i4b/isdnd/support.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/lpr/common_source/lp.local.h#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.8#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.c#11 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/rtadvd/rtadvd.conf.5#3 integrate
Differences ...
==== //depot/projects/trustedbsd/base/MAINTAINERS#20 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.75 2003/07/19 00:17:36 markm Exp $
+$FreeBSD: src/MAINTAINERS,v 1.76 2003/07/30 10:43:13 bp Exp $
subsystem login notes
-----------------------------
@@ -78,6 +78,10 @@
unifdef(1) fanf Pre-commit review requested.
ntp roberto Pre-commit review requested.
inetd dwmalone Recommends pre-commit review.
+nwfs bp In case of functional changes pre-commit review
+ requested.
+contrib/smbfs bp Open for in-tree committs. In case of functional
+ changes pre-commit review requested.
Following are the entries from the Makefiles, and a few other sources.
Please remove stale entries from both their origin, and this file.
==== //depot/projects/trustedbsd/base/UPDATING#35 (text+ko) ====
@@ -17,6 +17,13 @@
developers choose to disable these features on build machines
to maximize performance.
+20030728:
+ All current USB and Firewire quirks in da(4) have been deprecated
+ and will be removed for 5.2. If this causes failure for your
+ umass(4) devices, enable "options DA_OLD_QUIRKS" in your kernel
+ and send the output of "camcontrol inquiry da0" to scsi at freebsd.org
+ so the quirk can be re-enabled.
+
20030722:
FPU-less support has been removed from FreeBSD. Chances are you won't
notice. 386+387 support should still work after this change, but
@@ -1326,4 +1333,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.259 2003/07/22 11:08:41 imp Exp $
+$FreeBSD: src/UPDATING,v 1.260 2003/07/29 04:40:33 njl Exp $
==== //depot/projects/trustedbsd/base/contrib/isc-dhcp/FREEBSD-upgrade#5 (text+ko) ====
@@ -1,5 +1,5 @@
# ex:ts=8
-$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.14 2003/01/16 19:05:56 murray Exp $
+$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.16 2003/07/28 08:30:11 mbr Exp $
ISC DHCP client 3.0.1rc11
originals can be found at: ftp://ftp.isc.org/isc/dhcp/
@@ -42,19 +42,26 @@
client/clparse.c
r1.6 - prefer strlcpy to strcpy.
client/dhclient.8
+ r1.14 - interface polling
r1.8 - correct a man reference and a typo.
r1.6 - document -D option.
- remove dhcpd from SEE ALSO section.
client/dhclient.c
+ r1.26 - interface polling
+ r1.25 - correct release lease option
r1.19 - connect std{in,out,err}.
r1.13 - prefer strlcpy to strcpy.
r1.6 - quiet by default.
- document -D option.
client/dhclient.conf.5
- - Remove dhcpd from SEE ALSO section.
+ - Remove dhcpd from SEE ALSO section.
common/dhcp-options.5
r1.2 - note that hostname is only set if not already set.
- - Remove dhcpd from SEE ALSO section.
+ - Remove dhcpd from SEE ALSO section.
+ common/dispatch.c
+ r1.2 - polling mode
+ includes/dhcpd.h
+ r1.2 - polling mode
(see CVS logs for complete details)
murray at FreeBSD.org
==== //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.8#5 (text+ko) ====
@@ -20,7 +20,7 @@
.\"
.\" Portions copyright (c) 2000 David E. O'Brien.
.\" All rights reserved.
-.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.8,v 1.13 2003/03/18 19:46:55 obrien Exp $
+.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.8,v 1.14 2003/07/28 08:30:11 mbr Exp $
.\"
.TH dhclient 8
.SH NAME
@@ -74,6 +74,10 @@
relay
]
[
+.B -i
+interval
+]
+[
.B -n
]
[
@@ -190,6 +194,12 @@
flag, followed by the IP address to send. This is only useful for testing,
and should not be expected to work in any consistent or useful way.
.PP
+On FreeBSD, dhclient can be enabled to automatically handle the
+link status of the network card. Normally polling is done every
+five seconds. The polling interval can be set using the
+.B -i
+flag, followed by the numbers of seconds. Minimum is one second.
+.PP
The DHCP client will normally run in the foreground until it has
configured an interface, and then will revert to running in the
background. To run force dhclient to always run as a foreground
==== //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.c#7 (text+ko) ====
@@ -42,12 +42,19 @@
#ifndef lint
static char ocopyright[] =
"$Id: dhclient.c,v 1.129.2.12 2002/11/07 23:26:38 dhankins Exp $ Copyright (c) 1995-2002 Internet Software Consortium. All rights reserved.\n"
-"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.25 2003/03/23 23:29:36 mbr Exp $\n";
+"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.27 2003/07/28 13:25:04 mbr Exp $\n";
#endif /* not lint */
#include "dhcpd.h"
#include "version.h"
+#ifdef __FreeBSD__
+#include <sys/ioctl.h>
+#include <net/if_media.h>
+#include <net80211/ieee80211_ioctl.h>
+#include <net80211/ieee80211.h>
+#endif
+
TIME cur_time;
TIME default_lease_time = 43200; /* 12 hours... */
TIME max_lease_time = 86400; /* 24 hours... */
@@ -85,6 +92,10 @@
int onetry=0;
int quiet=1;
int nowait=0;
+int doinitcheck=0;
+#ifdef ENABLE_POLLING_MODE
+int polling_interval = 5;
+#endif
static void usage PROTO ((void));
@@ -202,6 +213,19 @@
} else if (!strcmp (argv [i], "-n")) {
/* do not start up any interfaces */
interfaces_requested = 1;
+#ifdef ENABLE_POLLING_MODE
+ } else if (!strcmp (argv [i], "-i")) {
+ if (++i == argc)
+ usage ();
+ polling_interval = (int)strtol(argv [i],
+ (char **)NULL, 10);
+ if (polling_interval <= 0) {
+ log_info ("Incorrect polling interval %d",
+ polling_interval);
+ log_info ("Using a default of 5 seconds");
+ polling_interval = 5;
+ }
+#endif
} else if (!strcmp (argv [i], "-w")) {
/* do not exit if there are no broadcast interfaces. */
persist = 1;
@@ -233,6 +257,8 @@
log_fatal ("%s: interface name too long (max %ld)",
argv [i], (long)strlen (argv [i]));
strlcpy (tmp -> name, argv [i], IFNAMSIZ);
+ set_ieee802(tmp);
+ tmp->linkstatus = interface_active(tmp);
if (interfaces) {
interface_reference (&tmp -> next,
interfaces, MDL);
@@ -386,6 +412,7 @@
INTERFACE_AUTOMATIC)) !=
INTERFACE_REQUESTED))
continue;
+ set_ieee802(ip);
script_init (ip -> client,
"PREINIT", (struct string_list *)0);
if (ip -> client -> alias)
@@ -428,8 +455,13 @@
client -> state = S_INIT;
/* Set up a timeout to start the initialization
process. */
+#ifdef ENABLE_POLLING_MODE
add_timeout (cur_time + random () % 5,
+ state_link, client, 0, 0);
+#else
+ add_timeout(cur_time + random () % 5,
state_reboot, client, 0, 0);
+#endif
}
}
}
@@ -1353,6 +1385,9 @@
int interval;
int increase = 1;
+ if (interface_active(client -> interface) == 0)
+ return;
+
/* Figure out how long it's been since we started transmitting. */
interval = cur_time - client -> first_sending;
@@ -1458,6 +1493,9 @@
struct client_lease *loop;
struct client_lease *lp;
+ if (interface_active(client -> interface) == 0)
+ return;
+
loop = lp = client -> active;
log_info ("No DHCPOFFERS received.");
@@ -2771,7 +2809,8 @@
break;
}
client -> state = S_INIT;
- state_reboot (client);
+ if (interface_active(ip))
+ state_reboot(client);
}
}
}
@@ -2932,8 +2971,10 @@
client -> state = S_INIT;
/* Set up a timeout to start the initialization
process. */
- add_timeout (cur_time + random () % 5,
- state_reboot, client, 0, 0);
+ if (interface_active(ip)) {
+ add_timeout(cur_time + random () % 5,
+ state_reboot, client, 0, 0);
+ }
}
}
return ISC_R_SUCCESS;
@@ -2997,7 +3038,8 @@
break;
case server_awaken:
- state_reboot (client);
+ if (interface_active(ip))
+ state_reboot(client);
break;
}
}
@@ -3134,3 +3176,152 @@
data_string_forget (&ddns_dhcid, MDL);
return rcode;
}
+
+/* Check to see if there's a wire plugged in */
+int
+interface_active(struct interface_info *ip) {
+#ifdef __FreeBSD__
+ struct ifmediareq ifmr;
+ int *media_list, i;
+ char *ifname;
+ int sock;
+
+ ifname = ip -> name;
+
+ if ((sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
+ log_fatal("Can't create interface_active socket");
+
+ (void) memset(&ifmr, 0, sizeof(ifmr));
+ (void) strncpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name));
+
+ if (ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
+ /*
+ * Interface doesn't support SIOCGIFMEDIA, presume okay
+ */
+ close(sock);
+ return (1);
+ }
+ close(sock);
+
+ if (ifmr.ifm_count == 0) {
+ /*
+ * this is unexpected (to me), but we'll just assume
+ * that this means interface does not support SIOCGIFMEDIA
+ */
+ log_fatal("%s: no media types?", ifname);
+ return (1);
+ }
+
+ if (ifmr.ifm_status & IFM_AVALID) {
+ if (ip->ieee802) {
+ if ((IFM_TYPE(ifmr.ifm_active) == IFM_IEEE80211) &&
+ (ifmr.ifm_status & IFM_ACTIVE))
+ return (1);
+ } else {
+ if (ifmr.ifm_status & IFM_ACTIVE)
+ return (1);
+ }
+ }
+
+ return (0);
+#else /* ifdef __FreeBSD__ */
+
+ return (1);
+#endif /* Other OSs */
+}
+
+#ifdef __FreeBSD__
+set_ieee802 (struct interface_info *ip) {
+
+ struct ieee80211req ireq;
+ u_int8_t data[32];
+ int associated = 0;
+ int *media_list, i;
+ char *ifname;
+ int sock;
+
+ ifname = ip -> name;
+
+ if ((sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
+ log_fatal("Can't create interface_active socket");
+
+ (void) memset(&ireq, 0, sizeof(ireq));
+ (void) strncpy(ireq.i_name, ifname, sizeof(ireq.i_name));
+ ireq.i_data = &data;
+ ireq.i_type = IEEE80211_IOC_SSID;
+ ireq.i_val = -1;
+ /*
+ * If we can't get the SSID,
+ * this isn't an 802.11 device.
+ */
+ if (ioctl(sock, SIOCG80211, &ireq) < 0)
+ ip->ieee802 = 0;
+ else {
+#ifdef DEBUG
+ printf("Device %s has 802.11\n", ifname);
+#endif
+ ip->ieee802 = 1;
+ }
+ close(sock);
+}
+#endif /* __FreeBSD__ */
+
+#ifdef ENABLE_POLLING_MODE
+/* Check the state of the NICs if we have link */
+void state_link (cpp)
+ void *cpp;
+{
+ struct interface_info *ip;
+ struct client_state *client;
+
+#ifdef DEBUG
+ printf("Polling interface status\n");
+#endif
+ for (ip = interfaces; ip; ip = ip -> next) {
+ if (ip->linkstatus == 0 || doinitcheck == 0) {
+ if (interface_active(ip)) {
+#ifdef DEBUG
+ printf("%s: Found Link on interface\n", ip->name);
+#endif
+ for (client = ip -> client;
+ client; client = client -> next) {
+ add_timeout(cur_time + random () % 5,
+ state_reboot, client, 0, 0);
+ }
+ ip->linkstatus = 1;
+ } else {
+#ifdef DEBUG
+ printf("%s: No Link on interface\n", ip->name);
+#endif
+ for (client = ip -> client;
+ client; client = client -> next) {
+ cancel_timeout(state_init, client);
+ cancel_timeout(send_discover, client);
+ cancel_timeout(send_request, client);
+ /*
+ * XXX without this, dhclient does
+ * not poll on a interface if there
+ * is no cable plugged in at startup
+ * time
+ */
+ if (client -> state == S_INIT) {
+ add_timeout(cur_time + polling_interval,
+ state_link, client, 0, 0);
+ }
+ }
+ ip->linkstatus = 0;
+ }
+ } else {
+ if (interface_active(ip) == 0) {
+#ifdef DEBUG
+ printf("%s: Lost Link on interface\n", ip->name);
+#endif
+ ip->linkstatus = 0;
+ }
+ }
+ }
+ if (doinitcheck)
+ go_daemon ();
+ doinitcheck = 1;
+}
+#endif /* ifdef ENABLE_POLLING_MODE */
==== //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/scripts/freebsd#4 (text+ko) ====
@@ -2,7 +2,7 @@
#
# $Id: freebsd,v 1.13.2.4 2002/06/09 22:37:55 murray Exp $
#
-# $FreeBSD: src/contrib/isc-dhcp/client/scripts/freebsd,v 1.21 2003/01/15 10:47:32 murray Exp $
+# $FreeBSD: src/contrib/isc-dhcp/client/scripts/freebsd,v 1.22 2003/07/28 22:25:20 mbr Exp $
if [ -x /usr/bin/logger ]; then
LOGGER="/usr/bin/logger -s -p user.notice -t dhclient"
@@ -13,13 +13,19 @@
make_resolv_conf() {
if [ x"$new_domain_name_servers" != x ]; then
if [ "x$new_domain_name" != x ]; then
- echo search $new_domain_name >/etc/resolv.conf
+ ( echo search $new_domain_name >/etc/resolv.conf )
+ exit_status=$?
+ else
+ ( rm /etc/resolv.conf )
+ exit_status=$?
+ fi
+ if [ $exit_status -ne 0 ]; then
+ $LOGGER "WARNING: Unable to update resolv.conf: Error $exit_status"
else
- rm /etc/resolv.conf
+ for nameserver in $new_domain_name_servers; do
+ ( echo nameserver $nameserver >>/etc/resolv.conf )
+ done
fi
- for nameserver in $new_domain_name_servers; do
- echo nameserver $nameserver >>/etc/resolv.conf
- done
fi
}
==== //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/dispatch.c#4 (text+ko) ====
@@ -43,7 +43,8 @@
#ifndef lint
static char copyright[] =
-"$Id: dispatch.c,v 1.63.2.3 2002/11/17 02:26:57 dhankins Exp $ Copyright (c) 1995-2002 The Internet Software Consortium. All rights reserved.\n";
+"$Id: dispatch.c,v 1.63.2.3 2002/11/17 02:26:57 dhankins Exp $ Copyright (c) 1995-2002 The Internet Software Consortium. All rights reserved.\n"
+"$FreeBSD: src/contrib/isc-dhcp/common/dispatch.c,v 1.3 2003/07/28 11:49:07 mbr Exp $\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -51,6 +52,10 @@
struct timeout *timeouts;
static struct timeout *free_timeouts;
+#ifdef ENABLE_POLLING_MODE
+extern int polling_interval;
+#endif
+
void set_time (u_int32_t t)
{
/* Do any outstanding timeouts. */
@@ -95,11 +100,26 @@
void dispatch ()
{
struct timeval tv, *tvp;
+#ifdef ENABLE_POLLING_MODE
+ struct timeval *tvp_new;
+#endif
isc_result_t status;
+ TIME cur_time;
+ tvp = NULL;
+#ifdef ENABLE_POLLING_MODE
+ tvp_new = NULL;
+#endif
/* Wait for a packet or a timeout... XXX */
do {
tvp = process_outstanding_timeouts (&tv);
+#ifdef ENABLE_POLLING_MODE
+ GET_TIME (&cur_time);
+ add_timeout(cur_time + polling_interval, state_link, 0, 0, 0);
+ tvp_new = process_outstanding_timeouts(&tv);
+ if (tvp != NULL && (tvp -> tv_sec > tvp_new -> tv_sec))
+ tvp = tvp_new;
+#endif /* ENABLE_POLLING_MODE */
status = omapi_one_dispatch (0, tvp);
} while (status == ISC_R_TIMEDOUT || status == ISC_R_SUCCESS);
log_fatal ("omapi_one_dispatch failed: %s -- exiting.",
==== //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/dhcpd.h#6 (text+ko) ====
@@ -39,6 +39,8 @@
* ``http://www.isc.org/''. To learn more about Vixie Enterprises,
* see ``http://www.vix.com''. To learn more about Nominum, Inc., see
* ``http://www.nominum.com''.
+ *
+ * $FreeBSD: src/contrib/isc-dhcp/includes/dhcpd.h,v 1.3 2003/07/28 11:49:07 mbr Exp $
*/
#ifndef __CYGWIN32__
@@ -778,6 +780,8 @@
unsigned remote_id_len; /* Length of Remote ID. */
char name [IFNAMSIZ]; /* Its name... */
+ int linkstatus; /* Link status */
+ int ieee802; /* True if media is ieee802 */
int index; /* Its index. */
int rfdesc; /* Its read file descriptor. */
int wfdesc; /* Its write file descriptor, if
@@ -1853,6 +1857,9 @@
void send_decline PROTO ((void *));
void state_reboot PROTO ((void *));
+#ifdef ENABLE_POLLING_MODE
+void state_link PROTO (());
+#endif
void state_init PROTO ((void *));
void state_selecting PROTO ((void *));
void state_requesting PROTO ((void *));
==== //depot/projects/trustedbsd/base/contrib/one-true-awk/FIXES#6 (text+ko) ====
@@ -25,6 +25,52 @@
This file lists all bug fixes, changes, etc., made since the AWK book
was sent to the printers in August, 1987.
+Jul 29, 2003:
+ fixed (i think) the long-standing botch that included the beginning of
+ line state ^ for RE's in the set of valid characters; this led to a
+ variety of odd problems, including failure to properly match certain
+ regular expressions in non-US locales. thanks to ruslan for keeping
+ at this one.
+
+Jul 28, 2003:
+ n-th try at getting internationalization right, with thanks to volker
+ kiefel, arnold robbins and ruslan ermilov for advice, though they
+ should not be blamed for the outcome. according to posix, "." is the
+ radix character in programs and command line arguments regardless of
+ the locale; otherwise, the locale should prevail for input and output
+ of numbers. so it's intended to work that way.
+
+ i have rescinded the attempt to use strcoll in expanding shorthands in
+ regular expressions (cclenter). its properties are much too
+ surprising; for example [a-c] matches aAbBc in locale en_US but abBcC
+ in locale fr_CA. i can see how this might arise by implementation
+ but i cannot explain it to a human user. (this behavior can be seen
+ in gawk as well; we're leaning on the same library.)
+
+ the issue appears to be that strcoll is meant for sorting, where
+ merging upper and lower case may make sense (though note that unix
+ sort does not do this by default either). it is not appropriate
+ for regular expressions, where the goal is to match specific
+ patterns of characters. in any case, the notations [:lower:], etc.,
+ are available in awk, and they are more likely to work correctly in
+ most locales.
+
+ a moratorium is hereby declared on internationalization changes.
+ i apologize to friends and colleagues in other parts of the world.
+ i would truly like to get this "right", but i don't know what
+ that is, and i do not want to keep making changes until it's clear.
+
+Jul 4, 2003:
+ fixed bug that permitted non-terminated RE, as in "awk /x".
+
+Jun 1, 2003:
+ subtle change to split: if source is empty, number of elems
+ is always 0 and the array is not set.
+
+Mar 21, 2003:
+ added some parens to isblank, in another attempt to make things
+ internationally portable.
+
Mar 14, 2003:
the internationalization changes, somewhat modified, are now
reinstated. in theory awk will now do character comparisons
==== //depot/projects/trustedbsd/base/contrib/one-true-awk/FREEBSD-upgrade#6 (text+ko) ====
@@ -1,18 +1,19 @@
-# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.5 2002/12/19 04:34:00 obrien Exp $
+# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.6 2003/07/30 06:50:31 ru Exp $
-Import of the February 1998 version of the "one true awk", as described
+Import of the July 2003 version of the "one true awk", as described
in "The AWK Programming Language", by Al Aho, Brian Kernighan,
and Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X).
-Original source were taken from Brian Kernighan's home page
+Original sources were taken from the Brian Kernighan's home page
(http://cm.bell-labs.com/who/bwk/) and include bug fixes up thru
-Novembe 29, 2002.
+July 29, 2003.
The following files were removed for this import:
buildwin.bat
makefile.win
missing95.c
+ vcvars32.bat
ytab.c
ytab.h
ytabc.bak
@@ -20,4 +21,4 @@
The vendor import was done by:
- cvs import src/contrib/one-true-awk BELL_LABS bwk_20021213
+ cvs import src/contrib/one-true-awk BELL_LABS bwk_20030729
==== //depot/projects/trustedbsd/base/contrib/one-true-awk/b.c#6 (text+ko) ====
@@ -33,7 +33,7 @@
#include "awk.h"
#include "ytab.h"
-#define HAT (NCHARS-2) /* matches ^ in regular expr */
+#define HAT (NCHARS+2) /* matches ^ in regular expr */
/* NCHARS is 2**n */
#define MAXLIN 22
@@ -282,24 +282,9 @@
return c;
}
-static int collate_range_cmp(int a, int b)
-{
- int r;
- static char s[2][2];
-
- if ((uschar)a == (uschar)b)
- return 0;
- s[0][0] = a;
- s[1][0] = b;
- if ((r = strcoll(s[0], s[1])) == 0)
- r = (uschar)a - (uschar)b;
>>> 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