Date: Sun, 29 Apr 2007 08:32:10 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 118932 for review Message-ID: <200704290832.l3T8WAP4079006@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=118932 Change 118932 by imp@imp_paco-paco on 2007/04/29 08:31:47 IFC @118931 Affected files ... .. //depot/projects/arm/src/MAINTAINERS#6 integrate .. //depot/projects/arm/src/ObsoleteFiles.inc#19 integrate .. //depot/projects/arm/src/UPDATING#14 integrate .. //depot/projects/arm/src/compat/opensolaris/misc/fsshare.c#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/arm/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/engine.c#3 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/listener.c#3 integrate .. //depot/projects/arm/src/contrib/sendmail/libmilter/main.c#3 integrate .. //depot/projects/arm/src/contrib/top/top.c#3 integrate .. //depot/projects/arm/src/etc/mtree/BSD.include.dist#7 integrate .. //depot/projects/arm/src/etc/rc.d/zfs#3 integrate .. //depot/projects/arm/src/etc/sendmail/freebsd.mc#3 integrate .. //depot/projects/arm/src/etc/sendmail/freebsd.submit.mc#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_disk_set_standard_lookup.c#2 integrate .. //depot/projects/arm/src/lib/libbsm/Makefile#4 integrate .. //depot/projects/arm/src/lib/libc/net/rthdr.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fputs.3#3 integrate .. //depot/projects/arm/src/lib/libc/sys/send.2#4 integrate .. //depot/projects/arm/src/lib/libexpat/expat_config.h#2 integrate .. //depot/projects/arm/src/lib/libfetch/fetch.3#2 integrate .. //depot/projects/arm/src/lib/libfetch/ftp.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_info.c#3 integrate .. //depot/projects/arm/src/libexec/ftpd/ftpcmd.y#2 integrate .. //depot/projects/arm/src/libexec/ftpd/ftpd.8#2 integrate .. //depot/projects/arm/src/libexec/ftpd/ftpd.c#3 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate .. //depot/projects/arm/src/sbin/fdisk_pc98/fdisk.8#3 integrate .. //depot/projects/arm/src/sbin/fdisk_pc98/fdisk.c#2 integrate .. //depot/projects/arm/src/sbin/ping6/ping6.c#2 integrate .. //depot/projects/arm/src/share/examples/Makefile#2 integrate .. //depot/projects/arm/src/share/examples/netgraph/bluetooth/rc.bluetooth#2 delete .. //depot/projects/arm/src/share/man/man4/Makefile#11 integrate .. //depot/projects/arm/src/share/man/man4/led.4#2 integrate .. //depot/projects/arm/src/share/man/man4/sbsh.4#2 integrate .. //depot/projects/arm/src/share/man/man4/vlan.4#5 integrate .. //depot/projects/arm/src/share/man/man4/worm.4#2 delete .. //depot/projects/arm/src/share/man/man7/hier.7#8 integrate .. //depot/projects/arm/src/share/man/man8/nanobsd.8#3 integrate .. //depot/projects/arm/src/share/man/man9/pseudofs.9#2 integrate .. //depot/projects/arm/src/share/misc/committers-ports.dot#4 integrate .. //depot/projects/arm/src/share/misc/committers-src.dot#4 integrate .. //depot/projects/arm/src/share/misc/organization.dot#2 integrate .. //depot/projects/arm/src/share/mk/version_gen.awk#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#12 integrate .. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#19 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#32 integrate .. //depot/projects/arm/src/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/arm/src/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_dummy.c#9 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_machdep.c#15 integrate .. //depot/projects/arm/src/sys/bsm/audit.h#9 integrate .. //depot/projects/arm/src/sys/bsm/audit_internal.h#8 integrate .. //depot/projects/arm/src/sys/bsm/audit_kevents.h#10 integrate .. //depot/projects/arm/src/sys/bsm/audit_record.h#9 integrate .. //depot/projects/arm/src/sys/cam/cam_periph.c#9 integrate .. //depot/projects/arm/src/sys/cam/cam_periph.h#3 integrate .. //depot/projects/arm/src/sys/cam/cam_sim.c#4 integrate .. //depot/projects/arm/src/sys/cam/cam_sim.h#3 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.c#18 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt_periph.h#4 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#18 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_low.c#5 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_pass.c#5 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sa.c#6 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sg.c#4 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#19 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/arm/src/sys/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/arm/src/sys/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/arm/src/sys/conf/files#69 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/dnlc.c#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_ibm.c#7 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#18 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx.c#5 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx.h#4 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx.c#4 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx.h#3 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#12 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#25 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/arm/src/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/arm/src/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwdev.c#5 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_logging.c#5 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_mod.c#13 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_piv.c#5 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#26 integrate .. //depot/projects/arm/src/sys/dev/led/led.c#3 integrate .. //depot/projects/arm/src/sys/dev/led/led.h#2 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#37 integrate .. //depot/projects/arm/src/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/arm/src/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#14 integrate .. //depot/projects/arm/src/sys/dev/pci/pci.c#25 integrate .. //depot/projects/arm/src/sys/dev/pci/pcireg.h#11 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2560.c#10 integrate .. //depot/projects/arm/src/sys/dev/re/if_re.c#24 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/ad1816.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/ess.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/mss.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/sb16.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/sb8.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/als4000.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.c#12 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/au88x0.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/aureal.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/cmi.c#12 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/cs4281.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/csapcm.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ds1.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10k1.c#10 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10kx-pcm.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/envy24.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/envy24ht.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/es137x.c#9 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/fm801.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#11 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ich.c#18 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/maestro3.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/solo.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/t4dwave.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/via8233.c#11 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/via82c686.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/vibes.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97.c#11 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97.h#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97_patch.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97_patch.h#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/buffer.c#9 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/buffer.h#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sound.h#11 integrate .. //depot/projects/arm/src/sys/dev/sound/sbus/cs4231.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#19 integrate .. //depot/projects/arm/src/sys/dev/wi/if_wi.c#12 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_devs.c#9 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#16 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_map.c#4 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_vncache.c#8 integrate .. //depot/projects/arm/src/sys/geom/part/g_part.c#2 integrate .. //depot/projects/arm/src/sys/geom/uzip/g_uzip.c#6 integrate .. //depot/projects/arm/src/sys/i386/i386/bios.c#3 integrate .. //depot/projects/arm/src/sys/i386/i386/busdma_machdep.c#13 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#22 integrate .. //depot/projects/arm/src/sys/i386/i386/local_apic.c#18 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#32 integrate .. //depot/projects/arm/src/sys/i386/i386/sys_machdep.c#7 integrate .. //depot/projects/arm/src/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/arm/src/sys/i386/include/vmparam.h#3 integrate .. //depot/projects/arm/src/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/arm/src/sys/kern/kern_descrip.c#20 integrate .. //depot/projects/arm/src/sys/kern/kern_intr.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_linker.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_malloc.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_time.c#15 integrate .. //depot/projects/arm/src/sys/kern/kern_uuid.c#5 integrate .. //depot/projects/arm/src/sys/kern/sched_ule.c#17 integrate .. //depot/projects/arm/src/sys/kern/subr_rman.c#14 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#18 integrate .. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#22 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#19 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#29 integrate .. //depot/projects/arm/src/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_ppp.c#5 integrate .. //depot/projects/arm/src/sys/netinet/sctp.h#3 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#11 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.h#3 integrate .. //depot/projects/arm/src/sys/netinet/sctp_input.c#11 integrate .. //depot/projects/arm/src/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#11 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.h#6 integrate .. //depot/projects/arm/src/sys/netinet/sctp_structs.h#11 integrate .. //depot/projects/arm/src/sys/netinet/sctp_uio.h#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/arm/src/sys/netinet/sctp_var.h#7 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#11 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.h#9 integrate .. //depot/projects/arm/src/sys/netinet/tcp.h#7 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#27 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#15 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#22 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#19 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#16 integrate .. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#11 integrate .. //depot/projects/arm/src/sys/netinet6/route6.c#3 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_bio.c#9 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_lock.c#5 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vnops.c#17 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_syscalls.c#10 integrate .. //depot/projects/arm/src/sys/pci/if_rlreg.h#11 integrate .. //depot/projects/arm/src/sys/pci/if_vr.c#8 integrate .. //depot/projects/arm/src/sys/pci/if_vrreg.h#6 integrate .. //depot/projects/arm/src/sys/pci/intpm.c#8 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/nexus.c#3 integrate .. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#11 integrate .. //depot/projects/arm/src/sys/security/mac/mac_audit.c#1 branch .. //depot/projects/arm/src/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/arm/src/sys/security/mac/mac_inet.c#7 integrate .. //depot/projects/arm/src/sys/security/mac/mac_net.c#7 integrate .. //depot/projects/arm/src/sys/security/mac/mac_pipe.c#6 integrate .. //depot/projects/arm/src/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/arm/src/sys/security/mac/mac_process.c#7 integrate .. //depot/projects/arm/src/sys/security/mac/mac_socket.c#6 integrate .. //depot/projects/arm/src/sys/security/mac/mac_system.c#7 integrate .. //depot/projects/arm/src/sys/security/mac/mac_vfs.c#9 integrate .. //depot/projects/arm/src/sys/security/mac_biba/mac_biba.c#10 integrate .. //depot/projects/arm/src/sys/security/mac_bsdextended/mac_bsdextended.c#9 integrate .. //depot/projects/arm/src/sys/security/mac_ifoff/mac_ifoff.c#4 integrate .. //depot/projects/arm/src/sys/security/mac_lomac/mac_lomac.c#8 integrate .. //depot/projects/arm/src/sys/security/mac_mls/mac_mls.c#8 integrate .. //depot/projects/arm/src/sys/security/mac_partition/mac_partition.c#6 integrate .. //depot/projects/arm/src/sys/security/mac_portacl/mac_portacl.c#7 integrate .. //depot/projects/arm/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 integrate .. //depot/projects/arm/src/sys/security/mac_stub/mac_stub.c#7 integrate .. //depot/projects/arm/src/sys/security/mac_test/mac_test.c#6 integrate .. //depot/projects/arm/src/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/vmparam.h#2 integrate .. //depot/projects/arm/src/sys/sys/interrupt.h#5 integrate .. //depot/projects/arm/src/sys/sys/ioctl_compat.h#3 integrate .. //depot/projects/arm/src/sys/sys/mount.h#19 integrate .. //depot/projects/arm/src/sys/sys/priv.h#5 integrate .. //depot/projects/arm/src/sys/sys/proc.h#24 integrate .. //depot/projects/arm/src/sys/sys/socket.h#6 integrate .. //depot/projects/arm/src/sys/vm/swap_pager.c#12 integrate .. //depot/projects/arm/src/sys/vm/vm_contig.c#13 integrate .. //depot/projects/arm/src/sys/vm/vm_map.c#14 integrate .. //depot/projects/arm/src/sys/vm/vm_param.h#2 integrate .. //depot/projects/arm/src/tools/regression/netinet6/inet6_rth/Makefile#1 branch .. //depot/projects/arm/src/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c#1 branch .. //depot/projects/arm/src/tools/regression/netinet6/inet6_rth/test_subr.c#1 branch .. //depot/projects/arm/src/tools/regression/netinet6/inet6_rth/test_subr.h#1 branch .. //depot/projects/arm/src/tools/regression/sockets/sendfile/Makefile#2 integrate .. //depot/projects/arm/src/tools/regression/sockets/sendfile/sendfile.c#2 integrate .. //depot/projects/arm/src/tools/regression/usr.bin/sed/regress.sh#4 integrate .. //depot/projects/arm/src/tools/sched/schedgraph.py#4 integrate .. //depot/projects/arm/src/tools/tools/nanobsd/nanobsd.sh#6 integrate .. //depot/projects/arm/src/tools/tools/net80211/wesside/wesside/wesside.c#3 integrate .. //depot/projects/arm/src/tools/tools/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.freebsd#12 integrate .. //depot/projects/arm/src/usr.bin/lastcomm/lastcomm.1#3 integrate .. //depot/projects/arm/src/usr.bin/lastcomm/lastcomm.c#3 integrate .. //depot/projects/arm/src/usr.bin/make/GNode.h#2 integrate .. //depot/projects/arm/src/usr.bin/make/main.c#3 integrate .. //depot/projects/arm/src/usr.bin/make/make.c#2 integrate .. //depot/projects/arm/src/usr.bin/make/targ.c#2 integrate .. //depot/projects/arm/src/usr.bin/quota/quota.c#6 integrate .. //depot/projects/arm/src/usr.bin/sed/extern.h#2 integrate .. //depot/projects/arm/src/usr.bin/sed/main.c#2 integrate .. //depot/projects/arm/src/usr.bin/sed/process.c#3 integrate .. //depot/projects/arm/src/usr.bin/sed/sed.1#2 integrate .. //depot/projects/arm/src/usr.bin/tar/test/test-basic.sh#3 integrate .. //depot/projects/arm/src/usr.bin/tar/util.c#4 integrate .. //depot/projects/arm/src/usr.sbin/daemon/daemon.c#4 integrate .. //depot/projects/arm/src/usr.sbin/pciconf/cap.c#2 integrate .. //depot/projects/arm/src/usr.sbin/pmcstat/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/pmcstat/pmcstat.8#3 integrate .. //depot/projects/arm/src/usr.sbin/pmcstat/pmcstat.c#3 integrate .. //depot/projects/arm/src/usr.sbin/pmcstat/pmcstat.h#2 integrate .. //depot/projects/arm/src/usr.sbin/rpcbind/rpcbind.8#3 integrate .. //depot/projects/arm/src/usr.sbin/rpcbind/rpcbind.c#2 integrate .. //depot/projects/arm/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate Differences ... ==== //depot/projects/arm/src/MAINTAINERS#6 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.143 2007/04/06 10:57:15 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.144 2007/04/26 21:30:16 imp Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -128,6 +128,7 @@ usr.sbin/bluetooth emax Pre-commit review preferred. gnu/usr.bin/send-pr bugmaster Pre-commit review requested. BSD.{local,x11*}.dist portmgr Pre-commit review requested, since these files interface with ports. +usb core Please contact core@ before any major changes 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/arm/src/ObsoleteFiles.inc#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.79 2007/04/17 01:02:55 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.81 2007/04/24 16:58:54 emax Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070423: rc.bluetooth (examples) removed +OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth +# 20070421: worm.4 removed +OLD_FILES+=usr/share/man/man4/worm.4.gz # 20070417: trunk(4) renamed to lagg(4) OLD_FILES+=usr/include/net/if_trunk.h # 20070409: uuidgen moved to /bin/ ==== //depot/projects/arm/src/UPDATING#14 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20070423: + The ABI breakage in sendmail(8)'s libmilter has been repaired + so it is no longer necessary to recompile mail filters (aka, + milters). If you recompiled mail filters after the 20070408 + note, it is not necessary to recompile them again. + 20070417: The new trunk(4) driver has been renamed to lagg(4) as it better reflects its purpose. ifconfig will need to be recompiled. @@ -767,4 +773,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.486 2007/04/17 00:41:59 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.489 2007/04/23 22:15:07 gshapiro Exp $ ==== //depot/projects/arm/src/compat/opensolaris/misc/fsshare.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/compat/opensolaris/misc/fsshare.c,v 1.1 2007/04/06 01:08:59 pjd Exp $"); +__FBSDID("$FreeBSD: src/compat/opensolaris/misc/fsshare.c,v 1.2 2007/04/21 13:17:23 pjd Exp $"); #include <sys/param.h> #include <stdio.h> @@ -99,21 +99,30 @@ /* * Function translate options to a format acceptable by exports(5), eg. * - * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0 + * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0 freefall.freebsd.org 69.147.83.54 * * Accepted input formats: * - * ro,network=192.168.0.0,mask=255.255.255.0,maproot=0 - * ro network=192.168.0.0 mask=255.255.255.0 maproot=0 - * -ro,-network=192.168.0.0,-mask=255.255.255.0,-maproot=0 - * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0 + * ro,network=192.168.0.0,mask=255.255.255.0,maproot=0,freefall.freebsd.org + * ro network=192.168.0.0 mask=255.255.255.0 maproot=0 freefall.freebsd.org + * -ro,-network=192.168.0.0,-mask=255.255.255.0,-maproot=0,freefall.freebsd.org + * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0 freefall.freebsd.org + * + * Recognized keywords: + * + * ro, maproot, mapall, mask, network, alldirs, public, webnfs, index, quiet + * */ +static const char *known_opts[] = { "ro", "maproot", "mapall", "mask", + "network", "alldirs", "public", "webnfs", "index", "quiet", NULL }; static char * translate_opts(const char *shareopts) { static char newopts[OPTSSIZE]; - char oldopts[OPTSSIZE], opt[64]; + char oldopts[OPTSSIZE]; char *o, *s = NULL; + unsigned int i; + size_t len; strlcpy(oldopts, shareopts, sizeof(oldopts)); newopts[0] = '\0'; @@ -121,8 +130,16 @@ while ((o = strsep(&s, "-, ")) != NULL) { if (o[0] == '\0') continue; - snprintf(opt, sizeof(opt), "-%s ", o); - strlcat(newopts, opt, sizeof(newopts)); + for (i = 0; known_opts[i] != NULL; i++) { + len = strlen(known_opts[i]); + if (strncmp(known_opts[i], o, len) == 0 && + (o[len] == '\0' || o[len] == '=')) { + strlcat(newopts, "-", sizeof(newopts)); + break; + } + } + strlcat(newopts, o, sizeof(newopts)); + strlcat(newopts, " ", sizeof(newopts)); } return (newopts); } ==== //depot/projects/arm/src/contrib/opensolaris/cmd/zdb/zdb.c#2 (text+ko) ==== @@ -932,11 +932,11 @@ if (doi.doi_checksum != ZIO_CHECKSUM_INHERIT || verbosity >= 6) (void) snprintf(aux + strlen(aux), sizeof (aux), " (K=%s)", - zio_checksum_table[doi.doi_checksum].ci_name); + zio_checksum_table[doi.doi_checksum].ci_name); if (doi.doi_compress != ZIO_COMPRESS_INHERIT || verbosity >= 6) (void) snprintf(aux + strlen(aux), sizeof (aux), " (Z=%s)", - zio_compress_table[doi.doi_compress].ci_name); + zio_compress_table[doi.doi_compress].ci_name); (void) printf("%10lld %3u %5s %5s %5s %5s %s%s\n", (u_longlong_t)object, doi.doi_indirection, iblk, dblk, lsize, @@ -1441,7 +1441,7 @@ (u_longlong_t)zb->zb_objset, (u_longlong_t)zb->zb_object, (u_longlong_t)blkid2offset(bc->bc_dnode, - zb->zb_level, zb->zb_blkid), + zb->zb_level, zb->zb_blkid), blkbuf); } @@ -1951,8 +1951,8 @@ spa_close(spa, (void *)zdb_read_block); error = spa_open(spa_name, spap, (void *)zdb_read_block); if (error) - fatal("Failed to open pool '%s': errno = %d\n", - spa_name, error); + fatal("Failed to open pool '%s': %s", + spa_name, strerror(error)); spa = *spap; } @@ -2156,7 +2156,7 @@ } if (error) - fatal("can't open %s: error %d", argv[0], error); + fatal("can't open %s: %s", argv[0], strerror(error)); argv++; if (--argc > 0) { ==== //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 (text+ko) ==== @@ -339,22 +339,15 @@ changelist_free(prop_changelist_t *clp) { prop_changenode_t *cn; - uu_list_walk_t *walk; + void *cookie; if (clp->cl_list) { - verify((walk = uu_list_walk_start(clp->cl_list, - UU_WALK_ROBUST)) != NULL); - - while ((cn = uu_list_walk_next(walk)) != NULL) { - - uu_list_remove(clp->cl_list, cn); - + cookie = NULL; + while ((cn = uu_list_teardown(clp->cl_list, &cookie)) != NULL) { zfs_close(cn->cn_handle); free(cn); } - uu_list_walk_end(walk); - uu_list_destroy(clp->cl_list); } if (clp->cl_pool) @@ -418,7 +411,7 @@ } else { ASSERT(!clp->cl_alldependents); verify(uu_list_insert_before(clp->cl_list, - uu_list_first(clp->cl_list), cn) == 0); + uu_list_first(clp->cl_list), cn) == 0); } if (!clp->cl_alldependents) ==== //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 (text+ko) ==== @@ -74,22 +74,16 @@ namespace_clear(libzfs_handle_t *hdl) { if (hdl->libzfs_ns_avl) { - uu_avl_walk_t *walk; config_node_t *cn; + void *cookie = NULL; - if ((walk = uu_avl_walk_start(hdl->libzfs_ns_avl, - UU_WALK_ROBUST)) == NULL) - return; - - while ((cn = uu_avl_walk_next(walk)) != NULL) { - uu_avl_remove(hdl->libzfs_ns_avl, cn); + while ((cn = uu_avl_teardown(hdl->libzfs_ns_avl, + &cookie)) != NULL) { nvlist_free(cn->cn_config); free(cn->cn_name); free(cn); } - uu_avl_walk_end(walk); - uu_avl_destroy(hdl->libzfs_ns_avl); hdl->libzfs_ns_avl = NULL; } @@ -110,7 +104,7 @@ config_node_t *cn; nvpair_t *elem; zfs_cmd_t zc = { 0 }; - uu_avl_walk_t *walk; + void *cookie; if (hdl->libzfs_ns_gen == 0) { /* @@ -172,21 +166,13 @@ /* * Clear out any existing configuration information. */ - if ((walk = uu_avl_walk_start(hdl->libzfs_ns_avl, - UU_WALK_ROBUST)) == NULL) { - nvlist_free(config); - return (no_memory(hdl)); - } - - while ((cn = uu_avl_walk_next(walk)) != NULL) { - uu_avl_remove(hdl->libzfs_ns_avl, cn); + cookie = NULL; + while ((cn = uu_avl_teardown(hdl->libzfs_ns_avl, &cookie)) != NULL) { nvlist_free(cn->cn_config); free(cn->cn_name); free(cn); } - uu_avl_walk_end(walk); - elem = NULL; while ((elem = nvlist_next_nvpair(config, elem)) != NULL) { nvlist_t *child; @@ -222,7 +208,7 @@ } /* - * Retrive the configuration for the given pool. The configuration is a nvlist + * Retrieve the configuration for the given pool. The configuration is a nvlist * describing the vdevs, as well as the statistics associated with each one. */ nvlist_t * ==== //depot/projects/arm/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 (text+ko) ==== @@ -220,7 +220,7 @@ &state) == 0 && state == POOL_STATE_SPARE && nvlist_lookup_uint64(config, ZPOOL_CONFIG_GUID, &vdev_guid) == 0) { if ((ne = zfs_alloc(hdl, sizeof (name_entry_t))) == NULL) - return (-1); + return (-1); if ((ne->ne_name = zfs_strdup(hdl, path)) == NULL) { free(ne); @@ -748,7 +748,6 @@ zpool_find_import(libzfs_handle_t *hdl, int argc, char **argv) { int i; - DIR *dirp; char path[MAXPATHLEN]; nvlist_t *ret = NULL, *config; int fd; @@ -824,7 +823,6 @@ free(ne); } - return (ret); } ==== //depot/projects/arm/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 (text+ko) ==== @@ -480,6 +480,7 @@ #define readdir64(d) readdir(d) #define SIGPENDING(td) (0) #define root_mount_wait() do { } while (0) +#define root_mounted() (1) struct file { void *dummy; ==== //depot/projects/arm/src/contrib/sendmail/libmilter/engine.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2004, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2004, 2006, 2007 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -855,6 +855,7 @@ ; if (g->a_ctx->ctx_smfi != NULL && + g->a_ctx->ctx_smfi->xxfi_version > 4 && (fi_negotiate = g->a_ctx->ctx_smfi->xxfi_negotiate) != NULL) { int r; @@ -1177,6 +1178,7 @@ if (g == NULL) return _SMFIS_ABORT; if (g->a_ctx->ctx_smfi != NULL && + g->a_ctx->ctx_smfi->xxfi_version > 3 && (fi_data = g->a_ctx->ctx_smfi->xxfi_data) != NULL) return (*fi_data)(g->a_ctx); return SMFIS_CONTINUE; @@ -1310,6 +1312,7 @@ if (g == NULL) return _SMFIS_ABORT; if (g->a_ctx->ctx_smfi != NULL && + g->a_ctx->ctx_smfi->xxfi_version > 2 && (fi_unknown = g->a_ctx->ctx_smfi->xxfi_unknown) != NULL) return (*fi_unknown)(g->a_ctx, (const char *) g->a_buf); return SMFIS_CONTINUE; ==== //depot/projects/arm/src/contrib/sendmail/libmilter/listener.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2007 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -927,9 +927,9 @@ ctx->ctx_pflags |= SMFIP_NOEOH; if (smfi->xxfi_body == NULL) ctx->ctx_pflags |= SMFIP_NOBODY; - if (smfi->xxfi_data == NULL) + if (smfi->xxfi_version <= 3 || smfi->xxfi_data == NULL) ctx->ctx_pflags |= SMFIP_NODATA; - if (smfi->xxfi_unknown == NULL) + if (smfi->xxfi_version <= 2 || smfi->xxfi_unknown == NULL) ctx->ctx_pflags |= SMFIP_NOUNKNOWN; #if _FFR_WORKERS_POOL ==== //depot/projects/arm/src/contrib/sendmail/libmilter/main.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2003, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2003, 2006, 2007 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -52,7 +52,10 @@ (void) sm_strlcpy(smfi->xxfi_name, smfilter.xxfi_name, len); /* compare milter version with hard coded version */ - if (smfi->xxfi_version != SMFI_VERSION) + if (smfi->xxfi_version != SMFI_VERSION && + smfi->xxfi_version != 2 && + smfi->xxfi_version != 3 && + smfi->xxfi_version != 4) { /* hard failure for now! */ smi_log(SMI_LOG_ERR, ==== //depot/projects/arm/src/contrib/top/top.c#3 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.21 2007/04/17 03:12:39 rafan Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.22 2007/04/19 14:24:54 rafan Exp $ */ /* @@ -410,7 +410,7 @@ default: fprintf(stderr, "Top version %s\n" -"Usage: %s [-bCHIinqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n" +"Usage: %s [-abCHIijnqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n" " [-U username] [number]\n", version_string(), myname); exit(1); ==== //depot/projects/arm/src/etc/mtree/BSD.include.dist#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.111 2007/02/27 04:01:57 mjacob Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.112 2007/04/18 10:16:42 trhodes Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -209,8 +209,6 @@ .. pccard .. - posix4 - .. protocols .. readline ==== //depot/projects/arm/src/etc/rc.d/zfs#3 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/zfs,v 1.4 2007/04/15 18:07:14 pjd Exp $ +# $FreeBSD: src/etc/rc.d/zfs,v 1.5 2007/04/22 20:55:08 pjd Exp $ # # PROVIDE: zfs # REQUIRE: mountcritlocal -# KEYWORD: nojail . /etc/rc.subr @@ -15,7 +14,14 @@ stop_cmd="zfs_stop" required_modules="zfs" -zfs_start() +zfs_start_jail() +{ + if [ `$SYSCTL_N security.jail.mount_allowed` -eq 1 ]; then + zfs mount -a + fi +} + +zfs_start_main() { zfs volinit zfs mount -a @@ -34,7 +40,23 @@ done } -zfs_stop() +zfs_start() +{ + if [ `$SYSCTL_N security.jail.jailed` -eq 1 ]; then + zfs_start_jail + else + zfs_start_main + fi +} + +zfs_stop_jail() +{ + if [ `$SYSCTL_N security.jail.mount_allowed` -eq 1 ]; then + zfs unmount -a + fi +} + +zfs_stop_main() { # Disable swap on ZVOLs with property org.freebsd:swap=on. zfs list -H -o org.freebsd:swap,name -t volume | \ @@ -50,5 +72,14 @@ zfs volfini } +zfs_stop() +{ + if [ `$SYSCTL_N security.jail.jailed` -eq 1 ]; then + zfs_stop_jail + else + zfs_stop_main + fi +} + load_rc_config $name run_rc_command "$1" ==== //depot/projects/arm/src/etc/sendmail/freebsd.mc#3 (text+ko) ==== @@ -44,7 +44,7 @@ # divert(0) -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.33 2006/08/17 05:12:07 gshapiro Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.34 2007/04/23 22:23:54 gshapiro Exp $') OSTYPE(freebsd6) DOMAIN(generic) ==== //depot/projects/arm/src/etc/sendmail/freebsd.submit.mc#3 (text+ko) ==== @@ -16,7 +16,7 @@ # divert(0)dnl -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.4 2006/08/17 05:12:07 gshapiro Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.5 2007/04/23 22:23:54 gshapiro Exp $') define(`confCF_VERSION', `Submit')dnl define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet ==== //depot/projects/arm/src/lib/libarchive/archive_write_disk_set_standard_lookup.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk_set_standard_lookup.c,v 1.1 2007/03/03 07:37:36 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk_set_standard_lookup.c,v 1.2 2007/04/20 15:32:13 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -72,6 +72,7 @@ id_t id; }; +static const size_t cache_size = 127; static unsigned int hash(const char *); static gid_t lookup_gid(void *, const char *uname, gid_t); static uid_t lookup_uid(void *, const char *uname, uid_t); @@ -99,10 +100,10 @@ int archive_write_disk_set_standard_lookup(struct archive *a) { - struct bucket *ucache = malloc(sizeof(struct bucket[127])); - struct bucket *gcache = malloc(sizeof(struct bucket[127])); - memset(ucache, 0, sizeof(struct bucket[127])); - memset(gcache, 0, sizeof(struct bucket[127])); + struct bucket *ucache = malloc(sizeof(struct bucket[cache_size])); + struct bucket *gcache = malloc(sizeof(struct bucket[cache_size])); + memset(ucache, 0, sizeof(struct bucket[cache_size])); + memset(gcache, 0, sizeof(struct bucket[cache_size])); archive_write_disk_set_group_lookup(a, gcache, lookup_gid, cleanup); archive_write_disk_set_user_lookup(a, ucache, lookup_uid, cleanup); return (ARCHIVE_OK); @@ -113,11 +114,8 @@ { int h; struct bucket *b; - int cache_size; struct bucket *gcache = (struct bucket *)private_data; - cache_size = 127; - /* If no gname, just use the gid provided. */ if (gname == NULL || *gname == '\0') return (gid); @@ -153,11 +151,8 @@ { int h; struct bucket *b; - int cache_size; struct bucket *ucache = (struct bucket *)private_data; - cache_size = 127; - /* If no uname, just use the uid provided. */ if (uname == NULL || *uname == '\0') return (uid); @@ -191,7 +186,12 @@ static void cleanup(void *private) { - free(private); + size_t i; + struct bucket *cache = (struct bucket *)private; + + for (i = 0; i < cache_size; i++) + free(cache[i].name); + free(cache); } ==== //depot/projects/arm/src/lib/libbsm/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libbsm/Makefile,v 1.5 2006/09/25 11:53:58 rwatson Exp $ +# $FreeBSD: src/lib/libbsm/Makefile,v 1.6 2007/04/23 14:46:59 rwatson Exp $ # OPENBSMDIR= ${.CURDIR}/../../contrib/openbsm @@ -143,6 +143,7 @@ au_token.3 au_to_header32.3 \ au_token.3 au_to_header64.3 \ au_token.3 au_to_trailer.3 \ + au_token.3 au_to_zonename.3 \ au_user.3 setauuser.3 \ au_user.3 endauuser.3 \ au_user.3 getauuserent.3 \ ==== //depot/projects/arm/src/lib/libc/net/rthdr.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/rthdr.c,v 1.8 2005/07/19 18:13:58 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/rthdr.c,v 1.9 2007/04/19 15:48:16 mtm Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -292,7 +292,9 @@ { switch (type) { case IPV6_RTHDR_TYPE_0: - return (((segments * 2) + 1) << 3); + if ((segments >= 0) && (segments <= 127)) + return (((segments * 2) + 1) << 3); + /* FALLTHROUGH */ default: return (0); /* type not suppported */ } @@ -309,6 +311,9 @@ /* length validation */ if (bp_len < inet6_rth_space(IPV6_RTHDR_TYPE_0, segments)) return (NULL); + /* segment validation */ + if ((segments < 0) || (segments > 127)) + return (NULL); memset(bp, 0, bp_len); rth0 = (struct ip6_rthdr0 *)rth; @@ -334,6 +339,9 @@ switch (rth->ip6r_type) { case IPV6_RTHDR_TYPE_0: rth0 = (struct ip6_rthdr0 *)rth; + /* Don't exceed the number of stated segments */ + if (rth0->ip6r0_segleft == (rth0->ip6r0_len / 2)) + return (-1); nextaddr = (struct in6_addr *)(rth0 + 1) + rth0->ip6r0_segleft; *nextaddr = *addr; rth0->ip6r0_segleft++; ==== //depot/projects/arm/src/lib/libc/stdio/fputs.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fputs.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/fputs.3,v 1.12 2007/01/09 00:28:06 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fputs.3,v 1.14 2007/04/19 14:01:04 phk Exp $ .\" .Dd June 4, 1993 .Dt FPUTS 3 @@ -66,14 +66,11 @@ to the stream .Dv stdout . .Sh RETURN VALUES -The +The functions .Fn fputs -function -returns 0 on success and -.Dv EOF -on error; +and .Fn puts -returns a nonnegative integer on success and +return a nonnegative integer on success and .Dv EOF on error. .Sh ERRORS ==== //depot/projects/arm/src/lib/libc/sys/send.2#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704290832.l3T8WAP4079006>