From owner-p4-projects@FreeBSD.ORG Sun Jul 23 20:47:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C05E16A4DF; Sun, 23 Jul 2006 20:47:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 092E716A4DA for ; Sun, 23 Jul 2006 20:47:06 +0000 (UTC) (envelope-from tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 928BA43D46 for ; Sun, 23 Jul 2006 20:47:05 +0000 (GMT) (envelope-from tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6NKl5sJ053264 for ; Sun, 23 Jul 2006 20:47:05 GMT (envelope-from tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6NKkvdu049954 for perforce@freebsd.org; Sun, 23 Jul 2006 20:46:57 GMT (envelope-from tyler@freebsd.org) Date: Sun, 23 Jul 2006 20:46:57 GMT Message-Id: <200607232046.k6NKkvdu049954@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tyler@freebsd.org using -f From: "R. Tyler Ballance" To: Perforce Change Reviews Cc: Subject: PERFORCE change 102218 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jul 2006 20:47:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=102218 Change 102218 by tyler@orange on 2006/07/23 20:46:49 Integrate -CURRENT tree before following Warner's steps for 'building a sandboxed kernel' (http://lists.freebsd.org/pipermail/freebsd-hackers/2006-July/017344.html) Affected files ... .. //depot/projects/l4bsd/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/l4bsd/src/etc/rc.d/archdep#2 integrate .. //depot/projects/l4bsd/src/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/l4bsd/src/etc/rc.d/mountlate#1 branch .. //depot/projects/l4bsd/src/etc/rc.d/ntpdate#2 integrate .. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/ld/Makefile.alpha#2 integrate .. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/ld/Makefile.amd64#2 integrate .. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/ld/Makefile.arm#1 branch .. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/ld/Makefile.i386#2 integrate .. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/ld/Makefile.ia64#2 integrate .. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/libbfd/Makefile.arm#1 branch .. //depot/projects/l4bsd/src/gnu/usr.bin/binutils/libopcodes/Makefile.arm#1 branch .. //depot/projects/l4bsd/src/gnu/usr.bin/cc/cc_tools/auto-host.h#2 integrate .. //depot/projects/l4bsd/src/gnu/usr.bin/gdb/kgdb/trgt_arm.c#1 branch .. //depot/projects/l4bsd/src/gnu/usr.bin/send-pr/categories#2 integrate .. //depot/projects/l4bsd/src/lib/libc/gen/getgrent.c#3 integrate .. //depot/projects/l4bsd/src/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/l4bsd/src/lib/libc/net/name6.c#2 integrate .. //depot/projects/l4bsd/src/lib/libc/net/resolver.3#2 integrate .. //depot/projects/l4bsd/src/lib/libc/sys/Symbol.map#2 integrate .. //depot/projects/l4bsd/src/lib/libdevinfo/devinfo.c#2 integrate .. //depot/projects/l4bsd/src/lib/libpam/libpam/security/pam_mod_misc.h#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/sys/thr_error.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_attr.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_getschedparam.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_list.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_mutex.c#3 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_setprio.c#2 integrate .. //depot/projects/l4bsd/src/lib/libthr/thread/thr_setschedparam.c#2 integrate .. //depot/projects/l4bsd/src/lib/libutil/humanize_number.3#2 integrate .. //depot/projects/l4bsd/src/lib/libutil/kld.3#2 integrate .. //depot/projects/l4bsd/src/lib/libypclnt/ypclnt.h#2 integrate .. //depot/projects/l4bsd/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/l4bsd/src/sbin/growfs/growfs.c#2 integrate .. //depot/projects/l4bsd/src/sbin/mount/mount.8#2 integrate .. //depot/projects/l4bsd/src/sbin/mount/mount.c#3 integrate .. //depot/projects/l4bsd/src/sbin/mount_udf/Makefile#2 integrate .. //depot/projects/l4bsd/src/secure/lib/libcrypto/Makefile.inc#2 integrate .. //depot/projects/l4bsd/src/share/examples/etc/make.conf#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/Makefile#3 integrate .. //depot/projects/l4bsd/src/share/man/man4/ipw.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/iwi.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/man4.i386/padlock.4#3 integrate .. //depot/projects/l4bsd/src/share/man/man4/pcn.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/random.4#2 integrate .. //depot/projects/l4bsd/src/share/man/man4/snd_emu10kx.4#1 branch .. //depot/projects/l4bsd/src/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/l4bsd/src/share/man/man7/security.7#2 integrate .. //depot/projects/l4bsd/src/share/man/man9/Makefile#3 integrate .. //depot/projects/l4bsd/src/share/man/man9/mac.9#3 integrate .. //depot/projects/l4bsd/src/share/man/man9/rwlock.9#2 integrate .. //depot/projects/l4bsd/src/share/man/man9/sx.9#2 integrate .. //depot/projects/l4bsd/src/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/l4bsd/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/l4bsd/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/l4bsd/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/l4bsd/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/l4bsd/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/l4bsd/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/l4bsd/src/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/l4bsd/src/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/l4bsd/src/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/l4bsd/src/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/l4bsd/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/l4bsd/src/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/l4bsd/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/files.at91#3 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/l4bsd/src/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/l4bsd/src/sys/arm/conf/KB920X#3 integrate .. //depot/projects/l4bsd/src/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/l4bsd/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/l4bsd/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/l4bsd/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/l4bsd/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/l4bsd/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/l4bsd/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/l4bsd/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_syscall.h#3 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_syscallnames.c#3 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/l4bsd/src/sys/compat/svr4/syscalls.master#3 integrate .. //depot/projects/l4bsd/src/sys/conf/Makefile.arm#3 integrate .. //depot/projects/l4bsd/src/sys/conf/NOTES#3 integrate .. //depot/projects/l4bsd/src/sys/conf/files#3 integrate .. //depot/projects/l4bsd/src/sys/conf/files.arm#3 integrate .. //depot/projects/l4bsd/src/sys/conf/files.i386#3 integrate .. //depot/projects/l4bsd/src/sys/conf/files.ia64#3 integrate .. //depot/projects/l4bsd/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/l4bsd/src/sys/conf/options#3 integrate .. //depot/projects/l4bsd/src/sys/conf/options.arm#3 integrate .. //depot/projects/l4bsd/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/l4bsd/src/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/l4bsd/src/sys/crypto/via/padlock.h#1 branch .. //depot/projects/l4bsd/src/sys/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/l4bsd/src/sys/crypto/via/padlock_hash.c#1 branch .. //depot/projects/l4bsd/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/l4bsd/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/l4bsd/src/sys/ddb/db_output.h#2 integrate .. //depot/projects/l4bsd/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/l4bsd/src/sys/ddb/db_thread.c#2 integrate .. //depot/projects/l4bsd/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/em/if_em.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/l4bsd/src/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mpt/mpt_raid.h#3 integrate .. //depot/projects/l4bsd/src/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/l4bsd/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/random/probe.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/sio/sio.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/driver.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/l4bsd/src/sys/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/l4bsd/src/sys/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/l4bsd/src/sys/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/l4bsd/src/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/l4bsd/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/l4bsd/src/sys/dev/spibus/spi.h#1 branch .. //depot/projects/l4bsd/src/sys/dev/spibus/spibus.c#1 branch .. //depot/projects/l4bsd/src/sys/dev/spibus/spibus_if.m#1 branch .. //depot/projects/l4bsd/src/sys/dev/spibus/spibusvar.h#1 branch .. //depot/projects/l4bsd/src/sys/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/l4bsd/src/sys/dev/streams/streams.c#2 integrate .. //depot/projects/l4bsd/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/l4bsd/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/l4bsd/src/sys/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/l4bsd/src/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/l4bsd/src/sys/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/l4bsd/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/l4bsd/src/sys/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/l4bsd/src/sys/geom/geom.h#3 integrate .. //depot/projects/l4bsd/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/l4bsd/src/sys/geom/raid3/g_raid3_ctl.c#3 integrate .. //depot/projects/l4bsd/src/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate .. //depot/projects/l4bsd/src/sys/gnu/dev/sound/pci/p16v-alsa.h#1 branch .. //depot/projects/l4bsd/src/sys/gnu/dev/sound/pci/p17v-alsa.h#1 branch .. //depot/projects/l4bsd/src/sys/i386/i386/db_trace.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/l4bsd/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/l4bsd/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/ibcs2_syscall.h#3 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/l4bsd/src/sys/i386/ibcs2/syscalls.master#3 integrate .. //depot/projects/l4bsd/src/sys/i386/include/md_var.h#3 integrate .. //depot/projects/l4bsd/src/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/l4bsd/src/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/l4bsd/src/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/l4bsd/src/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/l4bsd/src/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/l4bsd/src/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/l4bsd/src/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_mac.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/l4bsd/src/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/l4bsd/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/l4bsd/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/l4bsd/src/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/l4bsd/src/sys/modules/sound/driver/Makefile#3 integrate .. //depot/projects/l4bsd/src/sys/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/l4bsd/src/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/l4bsd/src/sys/net/if_tap.c#3 integrate .. //depot/projects/l4bsd/src/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/l4bsd/src/sys/net/rtsock.c#3 integrate .. //depot/projects/l4bsd/src/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/l4bsd/src/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/l4bsd/src/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/l4bsd/src/sys/netatm/atm_aal5.c#2 integrate .. //depot/projects/l4bsd/src/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/l4bsd/src/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/l4bsd/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/l4bsd/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/l4bsd/src/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/l4bsd/src/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/l4bsd/src/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/l4bsd/src/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/l4bsd/src/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/l4bsd/src/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/l4bsd/src/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/l4bsd/src/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/l4bsd/src/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/l4bsd/src/sys/netipsec/keysock.c#2 integrate .. //depot/projects/l4bsd/src/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/l4bsd/src/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/l4bsd/src/sys/netkey/keysock.c#2 integrate .. //depot/projects/l4bsd/src/sys/netnatm/natm.c#2 integrate .. //depot/projects/l4bsd/src/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/l4bsd/src/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/l4bsd/src/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/l4bsd/src/sys/posix4/ksched.c#3 integrate .. //depot/projects/l4bsd/src/sys/posix4/p1003_1b.c#3 integrate .. //depot/projects/l4bsd/src/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/l4bsd/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/l4bsd/src/sys/sparc64/include/pmap.h#3 integrate .. //depot/projects/l4bsd/src/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/l4bsd/src/sys/sys/_label.h#2 integrate .. //depot/projects/l4bsd/src/sys/sys/extattr.h#2 integrate .. //depot/projects/l4bsd/src/sys/sys/libkern.h#2 integrate .. //depot/projects/l4bsd/src/sys/sys/mbuf.h#2 integrate .. //depot/projects/l4bsd/src/sys/sys/param.h#2 integrate .. //depot/projects/l4bsd/src/sys/sys/protosw.h#3 integrate .. //depot/projects/l4bsd/src/sys/sys/syscall.h#3 integrate .. //depot/projects/l4bsd/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/l4bsd/src/sys/sys/sysctl.h#3 integrate .. //depot/projects/l4bsd/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/l4bsd/src/sys/sys/thr.h#3 integrate .. //depot/projects/l4bsd/src/sys/sys/unpcb.h#2 integrate .. //depot/projects/l4bsd/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/l4bsd/src/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/l4bsd/src/sys/vm/pmap.h#3 integrate .. //depot/projects/l4bsd/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/l4bsd/src/sys/vm/vm.h#2 integrate .. //depot/projects/l4bsd/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/l4bsd/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/l4bsd/src/sys/vm/vm_meter.c#3 integrate .. //depot/projects/l4bsd/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/l4bsd/src/sys/vm/vm_object.h#2 integrate .. //depot/projects/l4bsd/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/l4bsd/src/tools/regression/ia64/emulated/brl.t#1 branch .. //depot/projects/l4bsd/src/tools/regression/ia64/emulated/test.c#1 branch .. //depot/projects/l4bsd/src/tools/regression/netinet6/ip6_sockets/Makefile#1 branch .. //depot/projects/l4bsd/src/tools/regression/netinet6/ip6_sockets/ip6_sockets.c#1 branch .. //depot/projects/l4bsd/src/tools/tools/nanobsd/nanobsd.sh#2 integrate .. //depot/projects/l4bsd/src/usr.bin/calendar/day.c#3 integrate .. //depot/projects/l4bsd/src/usr.bin/col/col.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/ctags/ctags.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/find/find.1#3 integrate .. //depot/projects/l4bsd/src/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/kdump/mksubr#2 integrate .. //depot/projects/l4bsd/src/usr.bin/look/look.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/make/main.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/make/parse.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/make/var.c#2 integrate .. //depot/projects/l4bsd/src/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/config/config.y#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/config/mkmakefile.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/fdread/fdread.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/moused/moused.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/newsyslog/newsyslog.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/ngctl/config.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/ngctl/debug.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/ngctl/mkpeer.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/ngctl/name.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/ngctl/status.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/ngctl/types.c#3 integrate .. //depot/projects/l4bsd/src/usr.sbin/sysinstall/install.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/sysinstall/misc.c#2 integrate .. //depot/projects/l4bsd/src/usr.sbin/sysinstall/sysinstall.h#2 integrate Differences ... ==== //depot/projects/l4bsd/src/etc/defaults/rc.conf#3 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.288 2006/06/07 17:14:27 brueffer Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.290 2006/07/21 15:55:18 yar Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -261,6 +261,8 @@ ntpdate_enable="NO" # Run ntpdate to sync time on boot (or NO). ntpdate_program="/usr/sbin/ntpdate" # path to ntpdate, if you want a different one. ntpdate_flags="-b" # Flags to ntpdate (if enabled). +ntpdate_config="/etc/ntp.conf" # ntpdate(8) configuration file +ntpdate_hosts="" # Whitespace-separated list of ntpdate(8) servers. ntpd_enable="NO" # Run ntpd Network Time Protocol (or NO). ntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one. ntpd_config="/etc/ntp.conf" # ntpd(8) configuration file @@ -480,7 +482,6 @@ linux_enable="NO" # Linux binary compatibility loaded at startup (or NO). svr4_enable="NO" # SysVR4 emulation loaded at startup (or NO). -osf1_enable="NO" # Alpha OSF/1 emulation loaded at startup (or NO). clear_tmp_enable="NO" # Clear /tmp at startup. clear_tmp_X="YES" # Clear and recreate X11-related directories in /tmp ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks @@ -500,7 +501,6 @@ # in the system booting with securelevel set to 1, as # init(8) will raise the level when rc(8) completes. update_motd="YES" # update version info in /etc/motd (or NO) -unaligned_print="YES" # print unaligned access warnings on the alpha (or NO). entropy_file="/entropy" # Set to NO to disable caching entropy through reboots. # /var/db/entropy-file is preferred if / is not avail. entropy_dir="/var/db/entropy" # Set to NO to disable caching entropy via cron. ==== //depot/projects/l4bsd/src/etc/rc.d/archdep#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.11 2006/02/19 08:18:48 dougb Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.12 2006/07/21 15:55:18 yar Exp $ # # PROVIDE: archdep @@ -13,27 +13,6 @@ start_cmd="archdep_start" stop_cmd=":" -# should we print out unaligned access warnings? -# -unaligned_warnings() -{ - if ! checkyesno unaligned_print; then - sysctl machdep.unaligned_print=0 - fi -} - -# Alpha OSF/1 binary emulation -# -osf1_compat() -{ - if checkyesno osf1_enable; then - echo -n ' OSF/1' - if ! kldstat -v | grep osf1_ecoff > /dev/null; then - kldload osf1 > /dev/null 2>&1 - fi - fi -} - # SCO binary emulation # ibcs2_compat() @@ -61,10 +40,6 @@ i386) ibcs2_compat ;; - alpha) - osf1_compat - unaligned_warnings - ;; esac echo '.' } ==== //depot/projects/l4bsd/src/etc/rc.d/mountcritlocal#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.12 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.13 2006/07/12 16:05:51 des Exp $ # # PROVIDE: mountcritlocal @@ -27,6 +27,7 @@ esac # Mount everything except nfs filesystems. + echo -n 'Mounting local file systems:' mount_excludes='no' for i in ${netfs_types}; do fstype=${i%:*} @@ -34,6 +35,7 @@ done mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} + echo '.' case $? in 0) ==== //depot/projects/l4bsd/src/etc/rc.d/ntpdate#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ntpdate,v 1.15 2006/01/16 06:03:42 dougb Exp $ +# $FreeBSD: src/etc/rc.d/ntpdate,v 1.16 2006/07/20 10:07:34 flz Exp $ # # PROVIDE: ntpdate @@ -16,11 +16,11 @@ ntpdate_start() { - if [ -z "$ntpdate_hosts" -a -f /etc/ntp.conf ]; then + if [ -z "$ntpdate_hosts" -a -f ${ntpdate_config} ]; then ntpdate_hosts=`awk ' /^server[ \t]*127.127/ {next} /^(server|peer)/ {print $2} - ' @@ -523,7 +523,7 @@ /* The number of bytes in type int */ #define SIZEOF_INT 4 -#if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__) +#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) /* The number of bytes in type long */ # define SIZEOF_LONG SIZEOF_INT #elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__) ==== //depot/projects/l4bsd/src/gnu/usr.bin/send-pr/categories#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.17 2005/01/05 12:13:10 ceri Exp $ +# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.18 2006/07/17 10:36:56 ceri Exp $ advocacy alpha amd64 @@ -15,6 +15,7 @@ powerpc sparc64 standards +sun4v threads usb www ==== //depot/projects/l4bsd/src/lib/libc/gen/getgrent.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.34 2006/06/01 15:45:06 maxim Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.35 2006/07/14 17:45:33 maxim Exp $"); #include "namespace.h" #include @@ -770,18 +770,17 @@ * pointer for the member list terminator. */ if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) { - fseeko(st->fp, pos, SEEK_SET); *errnop = ERANGE; rv = NS_RETURN; break; } - pos = ftello(st->fp); memcpy(buffer, line, linesize); buffer[linesize] = '\0'; rv = __gr_parse_entry(buffer, linesize, grp, &buffer[linesize + 1], bufsize - linesize - 1, errnop); if (rv & NS_TERMINATE) break; + pos = ftello(st->fp); } if (!stayopen && st->fp != NULL) { fclose(st->fp); @@ -789,6 +788,8 @@ } if (rv == NS_SUCCESS && retval != NULL) *(struct group **)retval = grp; + else if (*errnop == ERANGE) + fseeko(st->fp, pos, SEEK_SET); return (rv); } @@ -1322,18 +1323,17 @@ * pointer for the member list terminator. */ if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) { - fseeko(st->fp, pos, SEEK_SET); *errnop = ERANGE; rv = NS_RETURN; break; } - pos = ftello(st->fp); memcpy(buffer, line, linesize); buffer[linesize] = '\0'; rv = __gr_parse_entry(buffer, linesize, grp, &buffer[linesize + 1], bufsize - linesize - 1, errnop); if (rv & NS_TERMINATE) break; + pos = ftello(st->fp); } fin: if (!stayopen && st->fp != NULL) { @@ -1342,6 +1342,8 @@ } if (rv == NS_SUCCESS && retval != NULL) *(struct group **)retval = grp; + else if (*errnop == ERANGE) + fseeko(st->fp, pos, SEEK_SET); return (rv); #undef set_lookup_type } ==== //depot/projects/l4bsd/src/lib/libc/net/getaddrinfo.c#2 (text+ko) ==== @@ -33,7 +33,6 @@ * "#ifdef FAITH" part is local hack for supporting IPv4-v6 translator. * * Issues to be discussed: - * - Thread safe-ness must be checked. * - Return values. There are nonstandard return values defined and used * in the source code. This is because RFC2553 is silent about which error * code must be returned for which situation. @@ -50,20 +49,12 @@ * against NULL hostname (3) what is AI_ADDRCONFIG itself. AF not ready? * non-loopback address configured? global address configured? * - * OS specific notes for netbsd/openbsd/freebsd4/bsdi4: - * - To avoid search order issue, we have a big amount of code duplicate - * from gethnamaddr.c and some other places. The issues that there's no - * lower layer function to lookup "IPv4 or IPv6" record. Calling - * gethostbyname2 from getaddrinfo will end up in wrong search order, as - * presented above. - * * OS specific notes for freebsd4: * - FreeBSD supported $GAI. The code does not. - * - FreeBSD allowed classful IPv4 numeric (127.1), the code does not. */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.80 2006/04/28 12:03:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.85 2006/07/23 15:31:03 ume Exp $"); #include "namespace.h" #include @@ -235,7 +226,7 @@ u_char buf[MAXPACKET]; } querybuf; -static int str2number(const char *); +static int str2number(const char *, int *); static int explore_null(const struct addrinfo *, const char *, struct addrinfo **); static int explore_numeric(const struct addrinfo *, const char *, @@ -350,7 +341,7 @@ } static int -str2number(const char *p) +str2number(const char *p, int *portp) { char *ep; unsigned long v; @@ -360,9 +351,10 @@ ep = NULL; errno = 0; v = strtoul(p, &ep, 10); - if (errno == 0 && ep && *ep == '\0' && v <= UINT_MAX) - return v; - else + if (errno == 0 && ep && *ep == '\0' && v <= UINT_MAX) { + *portp = v; + return 0; + } else return -1; } @@ -1062,13 +1054,11 @@ { int s; const struct afd *afd; - struct addrinfo *cur; - struct addrinfo sentinel; + struct addrinfo *ai; int error; *res = NULL; - sentinel.ai_next = NULL; - cur = &sentinel; + ai = NULL; /* * filter out AFs that are not supported by the kernel @@ -1092,26 +1082,19 @@ return 0; if (pai->ai_flags & AI_PASSIVE) { - GET_AI(cur->ai_next, afd, afd->a_addrany); - /* xxx meaningless? - * GET_CANONNAME(cur->ai_next, "anyaddr"); - */ - GET_PORT(cur->ai_next, servname); + GET_AI(ai, afd, afd->a_addrany); + GET_PORT(ai, servname); } else { - GET_AI(cur->ai_next, afd, afd->a_loopback); - /* xxx meaningless? - * GET_CANONNAME(cur->ai_next, "localhost"); - */ - GET_PORT(cur->ai_next, servname); + GET_AI(ai, afd, afd->a_loopback); + GET_PORT(ai, servname); } - cur = cur->ai_next; - *res = sentinel.ai_next; + *res = ai; return 0; free: - if (sentinel.ai_next) - freeaddrinfo(sentinel.ai_next); + if (ai != NULL) + freeaddrinfo(ai); return error; } @@ -1123,14 +1106,12 @@ const char *servname, struct addrinfo **res, const char *canonname) { const struct afd *afd; - struct addrinfo *cur; - struct addrinfo sentinel; + struct addrinfo *ai; int error; char pton[PTON_MAX]; *res = NULL; - sentinel.ai_next = NULL; - cur = &sentinel; + ai = NULL; /* * if the servname does not match socktype/protocol, ignore it. @@ -1143,57 +1124,48 @@ return 0; switch (afd->a_af) { -#if 1 /*X/Open spec*/ case AF_INET: - if (inet_aton(hostname, (struct in_addr *)pton) == 1) { - if (pai->ai_family == afd->a_af || - pai->ai_family == PF_UNSPEC /*?*/) { - GET_AI(cur->ai_next, afd, pton); - GET_PORT(cur->ai_next, servname); - if ((pai->ai_flags & AI_CANONNAME)) { - /* - * Set the numeric address itself as - * the canonical name, based on a - * clarification in rfc3493. - */ - GET_CANONNAME(cur->ai_next, canonname); - } - while (cur && cur->ai_next) - cur = cur->ai_next; - } else - ERR(EAI_FAMILY); /*xxx*/ - } + /* + * RFC3493 requires getaddrinfo() to accept AF_INET formats + * that are accepted by inet_addr() and its family. The + * accepted forms includes the "classful" one, which inet_pton + * does not accept. So we need to separate the case for + * AF_INET. + */ + if (inet_aton(hostname, (struct in_addr *)pton) != 1) + return 0; break; -#endif default: - if (inet_pton(afd->a_af, hostname, pton) == 1) { - if (pai->ai_family == afd->a_af || - pai->ai_family == PF_UNSPEC /*?*/) { - GET_AI(cur->ai_next, afd, pton); - GET_PORT(cur->ai_next, servname); - if ((pai->ai_flags & AI_CANONNAME)) { - /* - * Set the numeric address itself as - * the canonical name, based on a - * clarification in rfc3493. - */ - GET_CANONNAME(cur->ai_next, canonname); - } - while (cur && cur->ai_next) - cur = cur->ai_next; - } else - ERR(EAI_FAMILY); /* XXX */ + if (inet_pton(afd->a_af, hostname, pton) != 1) + return 0; + break; + } + + if (pai->ai_family == afd->a_af) { + GET_AI(ai, afd, pton); + GET_PORT(ai, servname); + if ((pai->ai_flags & AI_CANONNAME)) { + /* + * Set the numeric address itself as the canonical + * name, based on a clarification in RFC3493. + */ + GET_CANONNAME(ai, canonname); } - break; + } else { + /* + * XXX: This should not happen since we already matched the AF + * by find_afd. + */ + ERR(EAI_FAMILY); } - *res = sentinel.ai_next; + *res = ai; return 0; free: bad: - if (sentinel.ai_next) - freeaddrinfo(sentinel.ai_next); + if (ai != NULL) + freeaddrinfo(ai); return error; } @@ -1356,7 +1328,7 @@ { const char *proto; struct servent *sp; - int port; + int port, error; int allownumeric; if (servname == NULL) @@ -1385,8 +1357,8 @@ return EAI_SOCKTYPE; } - port = str2number(servname); - if (port >= 0) { + error = str2number(servname, &port); + if (error == 0) { if (!allownumeric) return EAI_SERVICE; if (port < 0 || port > 65535) ==== //depot/projects/l4bsd/src/lib/libc/net/name6.c#2 (text+ko) ==== @@ -88,12 +88,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.58 2006/04/28 12:03:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.60 2006/07/23 07:07:49 ume Exp $"); #include "namespace.h" -#ifdef ICMPNL -#include "reentrant.h" -#endif #include #include #include @@ -244,12 +241,6 @@ static int ipnode_unmarshal_func(char *, size_t, void *, va_list, void *); #endif -#ifdef ICMPNL -static mutex_t _getipnodeby_thread_lock = MUTEX_INITIALIZER; -#define THREAD_LOCK() mutex_lock(&_getipnodeby_thread_lock); -#define THREAD_UNLOCK() mutex_unlock(&_getipnodeby_thread_lock); -#endif - /* Host lookup order if nsswitch.conf is broken or nonexistant */ static const ns_src default_src[] = { { NSSRC_FILES, NS_SUCCESS }, @@ -2178,67 +2169,119 @@ /* * experimental: - * draft-ietf-ipngwg-icmp-namelookups-02.txt + * draft-ietf-ipngwg-icmp-namelookups-09.txt * ifindex is assumed to be encoded in addr. */ #include #include #include +#include + +#ifndef NI_QTYPE_NODENAME +#define NI_QTYPE_NODENAME NI_QTYPE_DNSNAME +#endif + +static char * +dnsdecode(sp, ep, base, buf, bufsiz) + const u_char **sp; + const u_char *ep; + const u_char *base; /*base for compressed name*/ >>> TRUNCATED FOR MAIL (1000 lines) <<<