Date: Wed, 9 Aug 2006 18:26:34 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 103525 for review Message-ID: <200608091826.k79IQYRs091777@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=103525 Change 103525 by imp@imp_harmony on 2006/08/09 18:26:27 IFC @103520 Affected files ... .. //depot/projects/arm/src/Makefile.inc1#2 integrate .. //depot/projects/arm/src/ObsoleteFiles.inc#2 integrate .. //depot/projects/arm/src/bin/sh/histedit.c#2 integrate .. //depot/projects/arm/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/arm/src/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/arm/src/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/arm/src/etc/rc.d/Makefile#2 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/arm/src/lib/Makefile#2 integrate .. //depot/projects/arm/src/lib/libc/gen/syslog.c#2 integrate .. //depot/projects/arm/src/lib/libc/resolv/res_init.c#2 integrate .. //depot/projects/arm/src/lib/libc/resolv/res_send.c#2 integrate .. //depot/projects/arm/src/lib/libc/sys/kse.2#2 integrate .. //depot/projects/arm/src/lib/libc/uuid/uuid_compare.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_pspinlock.c#2 integrate .. //depot/projects/arm/src/lib/libthread_db/arch/powerpc/libc_r_md.c#1 branch .. //depot/projects/arm/src/lib/libthread_db/arch/powerpc/libpthread_md.c#1 branch .. //depot/projects/arm/src/libexec/rtld-elf/rtld.c#2 integrate .. //depot/projects/arm/src/libexec/tftpd/tftpd.8#2 integrate .. //depot/projects/arm/src/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate .. //depot/projects/arm/src/sbin/dump/optr.c#2 integrate .. //depot/projects/arm/src/sbin/geom/class/eli/geom_eli.c#2 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/arm/src/sbin/reboot/reboot.c#2 integrate .. //depot/projects/arm/src/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/arm/src/share/doc/papers/timecounter/timecounter.ms#2 integrate .. //depot/projects/arm/src/share/examples/drivers/make_device_driver.sh#2 integrate .. //depot/projects/arm/src/share/man/man4/acpi.4#3 integrate .. //depot/projects/arm/src/share/man/man4/devctl.4#2 integrate .. //depot/projects/arm/src/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/arm/src/share/man/man4/man4.powerpc/powermac_nvram.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ng_ether.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ng_pppoe.4#2 integrate .. //depot/projects/arm/src/share/man/man4/uscanner.4#2 integrate .. //depot/projects/arm/src/share/man/man7/hier.7#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#22 integrate .. //depot/projects/arm/src/sys/amd64/amd64/trap.c#11 integrate .. //depot/projects/arm/src/sys/amd64/include/pmap.h#7 integrate .. //depot/projects/arm/src/sys/arm/arm/mem.c#3 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#24 integrate .. //depot/projects/arm/src/sys/arm/arm/vm_machdep.c#8 integrate .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#34 integrate .. //depot/projects/arm/src/sys/arm/include/pmap.h#11 integrate .. //depot/projects/arm/src/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/iq31244_machdep.c#10 integrate .. //depot/projects/arm/src/sys/boot/i386/loader/main.c#5 integrate .. //depot/projects/arm/src/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_stream.c#7 integrate .. //depot/projects/arm/src/sys/conf/files#41 integrate .. //depot/projects/arm/src/sys/conf/options#28 integrate .. //depot/projects/arm/src/sys/conf/options.arm#15 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pci_link.c#7 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#21 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#16 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athioctl.h#6 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#18 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bgereg.h#13 integrate .. //depot/projects/arm/src/sys/dev/bktr/CHANGELOG.TXT#3 integrate .. //depot/projects/arm/src/sys/dev/dc/dcphy.c#3 integrate .. //depot/projects/arm/src/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_scsi.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/README#5 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#21 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.h#8 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_hw.c#7 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_hw.h#6 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_osdep.h#5 integrate .. //depot/projects/arm/src/sys/dev/fe/if_fe.c#4 integrate .. //depot/projects/arm/src/sys/dev/isp/isp.c#9 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#13 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_ioctl.h#6 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_library.c#5 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_target.c#7 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_target.h#5 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_tpublic.h#6 integrate .. //depot/projects/arm/src/sys/dev/ixgb/if_ixgb.c#5 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/arm/src/sys/dev/patm/if_patm_intr.c#3 integrate .. //depot/projects/arm/src/sys/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/arm/src/sys/dev/pci/pcivar.h#5 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2560.c#6 integrate .. //depot/projects/arm/src/sys/dev/re/if_re.c#15 integrate .. //depot/projects/arm/src/sys/dev/sk/if_sk.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10k1.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/arm/src/sys/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/arm/src/sys/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/arm/src/sys/dev/ubsec/ubsec.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#13 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#19 integrate .. //depot/projects/arm/src/sys/dev/usb/uscanner.c#6 integrate .. //depot/projects/arm/src/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/arm/src/sys/dev/wi/if_wi.c#7 integrate .. //depot/projects/arm/src/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/arm/src/sys/fs/hpfs/hpfs.h#5 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate .. //depot/projects/arm/src/sys/fs/nwfs/nwfs_io.c#5 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/arm/src/sys/geom/bde/g_bde_work.c#4 integrate .. //depot/projects/arm/src/sys/geom/geom_gpt.c#7 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#16 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#19 integrate .. //depot/projects/arm/src/sys/i386/acpica/acpi_wakeup.c#7 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#16 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#19 integrate .. //depot/projects/arm/src/sys/i386/i386/tsc.c#3 integrate .. //depot/projects/arm/src/sys/kern/Makefile#3 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#13 integrate .. //depot/projects/arm/src/sys/kern/kern_resource.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_tc.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_time.c#7 integrate .. //depot/projects/arm/src/sys/kern/makesyscalls.sh#4 integrate .. //depot/projects/arm/src/sys/kern/subr_bus.c#16 integrate .. //depot/projects/arm/src/sys/kern/subr_rman.c#9 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#13 integrate .. //depot/projects/arm/src/sys/kern/systrace_args.c#1 branch .. //depot/projects/arm/src/sys/kern/uipc_proto.c#4 delete .. //depot/projects/arm/src/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#19 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket2.c#14 integrate .. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#15 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#17 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#9 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#22 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#18 integrate .. //depot/projects/arm/src/sys/net/bpf.c#13 integrate .. //depot/projects/arm/src/sys/net/bridgestp.c#7 integrate .. //depot/projects/arm/src/sys/net/bridgestp.h#3 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#20 integrate .. //depot/projects/arm/src/sys/net/if_faith.c#6 integrate .. //depot/projects/arm/src/sys/net/if_gif.c#10 integrate .. //depot/projects/arm/src/sys/net/if_gre.c#8 integrate .. //depot/projects/arm/src/sys/net/if_stf.c#7 integrate .. //depot/projects/arm/src/sys/net/if_tun.c#5 integrate .. //depot/projects/arm/src/sys/net/if_var.h#6 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#14 integrate .. //depot/projects/arm/src/sys/net/net_osdep.h#3 delete .. //depot/projects/arm/src/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/arm/src/sys/netatalk/ddp_usrreq.c#5 integrate .. //depot/projects/arm/src/sys/netgraph/ng_ether.c#6 integrate .. //depot/projects/arm/src/sys/netgraph/ng_pppoe.c#5 integrate .. //depot/projects/arm/src/sys/netgraph/ng_pppoe.h#4 integrate .. //depot/projects/arm/src/sys/netinet/in_gif.c#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_encap.c#3 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#16 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/arm/src/sys/netinet6/ah_aesxcbcmac.c#3 integrate .. //depot/projects/arm/src/sys/netinet6/ah_core.c#3 integrate .. //depot/projects/arm/src/sys/netinet6/ah_input.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/ah_output.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/esp_aesctr.c#3 integrate .. //depot/projects/arm/src/sys/netinet6/esp_core.c#3 integrate .. //depot/projects/arm/src/sys/netinet6/esp_input.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/esp_output.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/esp_rijndael.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/frag6.c#4 integrate .. //depot/projects/arm/src/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/arm/src/sys/netinet6/in6.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/in6_cksum.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/in6_gif.c#6 integrate .. //depot/projects/arm/src/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/arm/src/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_forward.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_input.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_mroute.c#6 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_output.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/ipcomp_core.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/ipcomp_input.c#3 integrate .. //depot/projects/arm/src/sys/netinet6/ipcomp_output.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/ipsec.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/mld6.c#4 integrate .. //depot/projects/arm/src/sys/netinet6/nd6.c#7 integrate .. //depot/projects/arm/src/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/arm/src/sys/netinet6/udp6_output.c#4 integrate .. //depot/projects/arm/src/sys/netkey/key.c#3 integrate .. //depot/projects/arm/src/sys/netkey/keydb.c#3 integrate .. //depot/projects/arm/src/sys/netncp/ncp_sock.c#3 integrate .. //depot/projects/arm/src/sys/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_bio.c#8 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/arm/src/sys/pci/ncr.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/machdep.c#8 integrate .. //depot/projects/arm/src/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/pmap.c#11 integrate .. //depot/projects/arm/src/sys/sys/domain.h#2 integrate .. //depot/projects/arm/src/sys/sys/mac_policy.h#5 integrate .. //depot/projects/arm/src/sys/sys/param.h#15 integrate .. //depot/projects/arm/src/sys/sys/stat.h#3 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#13 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#13 integrate .. //depot/projects/arm/src/sys/sys/sysent.h#5 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#14 integrate .. //depot/projects/arm/src/sys/sys/systm.h#12 integrate .. //depot/projects/arm/src/sys/sys/time.h#5 integrate .. //depot/projects/arm/src/sys/sys/types.h#4 integrate .. //depot/projects/arm/src/sys/vm/swap_pager.c#7 integrate .. //depot/projects/arm/src/sys/vm/vm_fault.c#12 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#12 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#15 integrate .. //depot/projects/arm/src/sys/vm/vm_page.h#5 integrate .. //depot/projects/arm/src/sys/vm/vnode_pager.c#8 integrate .. //depot/projects/arm/src/tools/kerneldoc/subsys/Makefile#2 integrate .. //depot/projects/arm/src/tools/regression/fsx/fsx.c#2 integrate .. //depot/projects/arm/src/tools/tools/ath/athstats/athstats.c#2 integrate .. //depot/projects/arm/src/tools/tools/net80211/Makefile#2 integrate .. //depot/projects/arm/src/tools/tools/net80211/README#1 branch .. //depot/projects/arm/src/tools/tools/net80211/stumbler/Makefile#1 branch .. //depot/projects/arm/src/tools/tools/net80211/stumbler/stumbler.c#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/Makefile#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/Makefile.inc#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/README#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/ap/Makefile#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/ap/ap.c#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/assoc/Makefile#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/assoc/assoc.c#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/expand/Makefile#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/expand/expand.c#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/libw00t/Makefile#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/libw00t/w00t.c#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/libw00t/w00t.h#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/prga/Makefile#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/prga/prga.c#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/redir/Makefile#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/redir/buddy.c#1 branch .. //depot/projects/arm/src/tools/tools/net80211/w00t/redir/redir.c#1 branch .. //depot/projects/arm/src/tools/tools/net80211/wesside/Makefile#1 branch .. //depot/projects/arm/src/tools/tools/net80211/wesside/README#1 branch .. //depot/projects/arm/src/tools/tools/net80211/wesside/dics/Makefile#1 branch .. //depot/projects/arm/src/tools/tools/net80211/wesside/dics/dics.c#1 branch .. //depot/projects/arm/src/tools/tools/net80211/wesside/udps/Makefile#1 branch .. //depot/projects/arm/src/tools/tools/net80211/wesside/udps/udps.c#1 branch .. //depot/projects/arm/src/tools/tools/net80211/wesside/wesside/Makefile#1 branch .. //depot/projects/arm/src/tools/tools/net80211/wesside/wesside/wesside.c#1 branch .. //depot/projects/arm/src/tools/tools/net80211/wlaninject/Makefile#1 branch .. //depot/projects/arm/src/tools/tools/net80211/wlaninject/README#1 branch .. //depot/projects/arm/src/tools/tools/net80211/wlaninject/wlaninject.c#1 branch .. //depot/projects/arm/src/usr.bin/logger/logger.1#2 integrate .. //depot/projects/arm/src/usr.bin/logger/logger.c#2 integrate .. //depot/projects/arm/src/usr.bin/split/split.1#2 integrate .. //depot/projects/arm/src/usr.bin/split/split.c#2 integrate .. //depot/projects/arm/src/usr.sbin/Makefile#4 integrate .. //depot/projects/arm/src/usr.sbin/elf2exe/Makefile#2 delete .. //depot/projects/arm/src/usr.sbin/elf2exe/elf2exe.8#2 delete .. //depot/projects/arm/src/usr.sbin/elf2exe/elf2exe.c#2 delete .. //depot/projects/arm/src/usr.sbin/kldxref/Makefile#4 integrate .. //depot/projects/arm/src/usr.sbin/kldxref/kldxref.c#3 integrate .. //depot/projects/arm/src/usr.sbin/mailwrapper/mailwrapper.8#2 integrate .. //depot/projects/arm/src/usr.sbin/mailwrapper/mailwrapper.c#2 integrate .. //depot/projects/arm/src/usr.sbin/ngctl/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/ngctl/main.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/command.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/config.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/devices.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/disks.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/dispatch.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/dmenu.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/globals.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/install.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/keymap.c#2 delete .. //depot/projects/arm/src/usr.sbin/sade/label.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/list.h#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/main.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/menus.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/misc.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/msg.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/rtermcap.c#2 delete .. //depot/projects/arm/src/usr.sbin/sade/sade.8#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/sade.h#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/system.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/termcap.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/usb.c#2 delete .. //depot/projects/arm/src/usr.sbin/sade/variable.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sade/wizard.c#2 integrate Differences ... ==== //depot/projects/arm/src/Makefile.inc1#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.549 2006/06/06 18:07:58 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.552 2006/08/09 11:03:06 netchild Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -731,7 +731,7 @@ echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \ exit 1; \ fi - cd ${.CURDIR}/sys/doc/subsys && ${MAKE} obj all + cd ${.CURDIR}/tools/kerneldoc/subsys && ${MAKE} obj all # # update ==== //depot/projects/arm/src/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.41 2006/07/08 03:22:44 avatar Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.42 2006/08/04 21:29:22 brooks 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,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20060704: KAME compat file net_osdep.h removed +OLD_FILES+=usr/include/net/net_osdep.h # 20060517: pcvt removed OLD_FILES+=usr/share/pcvt/README.FIRST OLD_FILES+=usr/share/pcvt/Etc/xmodmap-german ==== //depot/projects/arm/src/bin/sh/histedit.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.28 2005/10/19 15:37:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.29 2006/08/04 07:56:31 yar Exp $"); #include <sys/param.h> #include <limits.h> @@ -370,7 +370,7 @@ fputs(s, efp); } /* - * At end? (if we were to loose last, we'd sure be + * At end? (if we were to lose last, we'd sure be * messed up). */ if (he.num == last) ==== //depot/projects/arm/src/etc/defaults/rc.conf#2 (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.290 2006/07/21 15:55:18 yar Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.291 2006/08/05 20:28:50 njl Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -516,9 +516,9 @@ devfs_system_ruleset="" # The name of a ruleset to apply to /dev devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) -performance_cx_lowest="LOW" # Online CPU idle state +performance_cx_lowest="HIGH" # Online CPU idle state performance_cpu_freq="NONE" # Online CPU frequency -economy_cx_lowest="LOW" # Offline CPU idle state +economy_cx_lowest="HIGH" # Offline CPU idle state economy_cpu_freq="NONE" # Offline CPU frequency virecover_enable="YES" # Perform housekeeping for the vi(1) editor ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot ==== //depot/projects/arm/src/etc/mtree/BSD.local.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.118 2006/01/08 10:15:30 dougb Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.119 2006/08/02 17:22:30 marcel Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -111,8 +111,6 @@ cat3 .. cat4 - alpha - .. i386 .. .. @@ -123,8 +121,6 @@ cat7 .. cat8 - alpha - .. i386 .. .. ==== //depot/projects/arm/src/etc/mtree/BSD.usr.dist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.315 2006/07/29 19:47:09 simon Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.319 2006/08/03 05:44:51 jb Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -18,6 +18,8 @@ aout .. .. + dtrace + .. engines .. .. @@ -655,8 +657,6 @@ cat3 .. cat4 - alpha - .. amd64 .. i386 @@ -671,8 +671,6 @@ cat7 .. cat8 - alpha - .. amd64 .. i386 @@ -692,8 +690,6 @@ cat3 .. cat4 - alpha - .. amd64 .. i386 @@ -708,8 +704,6 @@ cat7 .. cat8 - alpha - .. amd64 .. i386 @@ -768,8 +762,6 @@ man3 .. man4 - alpha - .. amd64 .. i386 @@ -784,8 +776,6 @@ man7 .. man8 - alpha - .. amd64 .. i386 ==== //depot/projects/arm/src/etc/rc.d/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.73 2006/06/01 11:01:54 thompsa Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.74 2006/08/04 18:37:03 des Exp $ .include <bsd.own.mk> @@ -21,7 +21,7 @@ jail \ kadmind kerberos kernel keyserv kldxref kpasswdd \ ldconfig local localpkg lpd \ - mixer motd mountcritlocal mountcritremote \ + mixer motd mountcritlocal mountcritremote mountlate \ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 newsyslog nfsclient nfsd \ ==== //depot/projects/arm/src/games/fortune/datfiles/fortunes#2 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.223 2006/07/10 16:53:32 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.224 2006/08/04 07:56:31 yar Exp $ % ======================================================================= @@ -5459,7 +5459,7 @@ Most of us just sit back and marvel at such a story; how could that terminal know whether the poor guy was sitting or standing? Good debuggers, though, know that there has to be a reason. Electrical theories are the easiest to -hypothesize: was there a loose with under the carpet, or problems with static +hypothesize: was there a loose wire under the carpet, or problems with static electricity? But electrical problems are rarely consistently reproducible. An alert IBMer finally noticed that the problem was in the terminal's keyboard: the tops of two keys were switched. When the programmer was seated he was a ==== //depot/projects/arm/src/gnu/usr.bin/groff/tmac/mdoc.local#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.52 2006/01/12 15:33:18 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.54 2006/08/08 19:47:10 ru Exp $ .\" .\" %beginstrip% . @@ -34,6 +34,7 @@ .\" FreeBSD .Lb values .ds doc-str-Lb-libarchive Streaming Archive Library (libarchive, \-larchive) .ds doc-str-Lb-libbluetooth Bluetooth User Library (libbluetooth, \-lbluetooth) +.ds doc-str-Lb-libbsm Basic Security Module User Library (libbsm, \-lbsm) .ds doc-str-Lb-libc_r Reentrant C\~Library (libc_r, \-lc_r) .ds doc-str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar) .ds doc-str-Lb-libcam Common Access Method User Library (libcam, \-lcam) @@ -62,6 +63,7 @@ . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-5.5 5.5 +.ds doc-operating-system-FreeBSD-6.2 6.2 .ds doc-operating-system-FreeBSD-7.0 7.0 . .ec ==== //depot/projects/arm/src/lib/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.214 2006/03/20 14:24:57 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.215 2006/08/04 17:56:31 marcel Exp $ .include <bsd.own.mk> @@ -111,7 +111,7 @@ _libthr= libthr .endif -.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "powerpc" +.if ${MACHINE_ARCH} != "arm" _libthread_db= libthread_db .endif ==== //depot/projects/arm/src/lib/libc/gen/syslog.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/29/95"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.37 2006/05/11 09:10:33 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.38 2006/08/07 20:12:18 phk Exp $"); #include "namespace.h" #include <sys/types.h> @@ -116,7 +116,7 @@ h->base += len; h->left -= len; } - return 0; + return len; } /* ==== //depot/projects/arm/src/lib/libc/resolv/res_init.c#2 (text) ==== @@ -73,10 +73,12 @@ static const char rcsid[] = "$Id: res_init.c,v 1.9.2.5.4.5 2005/11/03 00:00:52 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.2 2006/03/21 15:37:16 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.3 2006/08/04 10:21:11 ume Exp $"); #include "port_before.h" +#include "namespace.h" + #include <sys/types.h> #include <sys/param.h> #include <sys/socket.h> @@ -93,6 +95,8 @@ #include <unistd.h> #include <netdb.h> +#include "un-namespace.h" + #include "port_after.h" /* ensure that sockaddr_in6 and IN6ADDR_ANY_INIT are declared / defined */ @@ -735,13 +739,13 @@ int ns; if (statp->_vcsock >= 0) { - (void) close(statp->_vcsock); + (void) _close(statp->_vcsock); statp->_vcsock = -1; statp->_flags &= ~(RES_F_VC | RES_F_CONN); } for (ns = 0; ns < statp->_u._ext.nscount; ns++) { if (statp->_u._ext.nssocks[ns] != -1) { - (void) close(statp->_u._ext.nssocks[ns]); + (void) _close(statp->_u._ext.nssocks[ns]); statp->_u._ext.nssocks[ns] = -1; } } ==== //depot/projects/arm/src/lib/libc/resolv/res_send.c#2 (text) ==== @@ -73,7 +73,7 @@ static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.7 2005/08/15 02:04:41 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.2 2006/03/21 15:37:16 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.3 2006/08/04 12:26:07 ume Exp $"); /* * Send query to name server and wait for reply. @@ -970,6 +970,10 @@ res_nclose(statp); return (0); } +#ifdef USE_KQUEUE + if (kv.ident != s) + goto wait; +#endif errno = 0; fromlen = sizeof(from); resplen = _recvfrom(s, (char*)ans, anssiz,0, ==== //depot/projects/arm/src/lib/libc/sys/kse.2#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.17 2005/11/24 07:33:35 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.18 2006/08/04 07:56:31 yar Exp $ .\" .Dd July 12, 2004 .Dt KSE 2 @@ -267,7 +267,7 @@ .Pp As a special case, if the last remaining KSE in the last remaining KSE group invokes this system call, then the KSE is not destroyed; -instead, the KSE just looses the association with its mailbox and +instead, the KSE just loses the association with its mailbox and .Fn kse_exit returns normally. This returns the process to its original, unthreaded state. ==== //depot/projects/arm/src/lib/libc/uuid/uuid_compare.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/uuid/uuid_compare.c,v 1.4 2005/01/03 02:56:15 marcel Exp $ + * $FreeBSD: src/lib/libc/uuid/uuid_compare.c,v 1.5 2006/08/03 03:34:36 delphij Exp $ */ #include <string.h> @@ -41,7 +41,8 @@ int32_t uuid_compare(const uuid_t *a, const uuid_t *b, uint32_t *status) { - int res; + int res; + int64_t res64; if (status != NULL) *status = uuid_s_ok; @@ -54,10 +55,19 @@ if (b == NULL) return ((uuid_is_nil(a, NULL)) ? 0 : 1); - /* We have to compare the hard way. */ - res = (int)((int64_t)a->time_low - (int64_t)b->time_low); - if (res) - return ((res < 0) ? -1 : 1); + /* + * We have to compare the hard way. + * + * Note that time_low is defined as unsigned 32-bit + * integer, therefore, with a significantly large + * a->time_low and a small b->time_low, we will end + * up with a value which is larger than 0x7fffffff + * which is negative if casted to signed 32-bit + * integer. + */ + res64 = (int64_t)a->time_low - (int64_t)b->time_low; + if (res64) + return ((res64 < 0) ? -1 : 1); res = (int)a->time_mid - (int)b->time_mid; if (res) return ((res < 0) ? -1 : 1); ==== //depot/projects/arm/src/lib/libthr/thread/thr_init.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.37 2006/07/25 12:50:05 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.38 2006/08/08 04:42:41 davidxu Exp $ */ #include "namespace.h" @@ -99,6 +99,7 @@ }; pid_t _thr_pid; +int _thr_smp_cpus = 1; size_t _thr_guard_default; size_t _thr_stack_default = THR_STACK_DEFAULT; size_t _thr_stack_initial = THR_STACK_INITIAL; @@ -443,6 +444,8 @@ len = sizeof (_usrstack); if (sysctl(mib, 2, &_usrstack, &len, NULL, 0) == -1) PANIC("Cannot get kern.usrstack from sysctl"); + len = sizeof(_thr_smp_cpus); + sysctlbyname("kern.smp.cpus", &_thr_smp_cpus, &len, NULL, 0); _thr_page_size = getpagesize(); _thr_guard_default = _thr_page_size; _pthread_attr_default.guardsize_attr = _thr_guard_default; ==== //depot/projects/arm/src/lib/libthr/thread/thr_mutex.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.44 2006/07/17 09:23:44 delphij Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.45 2006/08/08 05:04:43 davidxu Exp $ */ #include "namespace.h" @@ -128,7 +128,6 @@ pmutex->m_prio = attr->m_ceiling; else pmutex->m_prio = -1; - pmutex->m_saved_prio = 0; MUTEX_INIT_LINK(pmutex); *mutex = pmutex; return (0); @@ -191,7 +190,6 @@ (*mutex)->m_count = 0; (*mutex)->m_refcount = 0; (*mutex)->m_prio = 0; - (*mutex)->m_saved_prio = 0; return (0); } ==== //depot/projects/arm/src/lib/libthr/thread/thr_private.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.66 2006/07/12 06:13:18 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.68 2006/08/08 05:04:43 davidxu Exp $ */ #ifndef _THR_PRIVATE_H @@ -121,18 +121,10 @@ int m_refcount; /* - * Used for priority inheritence and protection. - * - * m_prio - For priority inheritence, the highest active - * priority (threads locking the mutex inherit - * this priority). For priority protection, the - * ceiling priority of this mutex. - * m_saved_prio - mutex owners inherited priority before - * taking the mutex, restored when the owner - * unlocks the mutex. + * Used for priority protection, the ceiling priority of + * this mutex. */ int m_prio; - int m_saved_prio; /* * Link for list of all mutexes a thread currently owns. @@ -588,6 +580,8 @@ extern struct pthread_prio _thr_priorities[] __hidden; extern pid_t _thr_pid __hidden; +extern int _thr_smp_cpus __hidden; + extern size_t _thr_guard_default __hidden; extern size_t _thr_stack_default __hidden; extern size_t _thr_stack_initial __hidden; ==== //depot/projects/arm/src/lib/libthr/thread/thr_pspinlock.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_pspinlock.c,v 1.2 2006/04/04 02:57:49 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_pspinlock.c,v 1.3 2006/08/08 04:42:41 davidxu Exp $ */ #include "namespace.h" @@ -104,13 +104,17 @@ count = SPIN_COUNT; while ((ret = THR_UMTX_TRYLOCK(curthread, &lck->s_lock)) != 0) { while (lck->s_lock) { -#ifdef __i386__ - /* tell cpu we are spinning */ - __asm __volatile("pause"); + if (_thr_smp_cpus <= 1) { + _pthread_yield(); + } else { +#if defined(__i386__) || defined(__x86_64__) + /* tell cpu we are spinning */ + __asm __volatile("pause"); #endif - if (--count <= 0) { - count = SPIN_COUNT; - _pthread_yield(); + if (--count <= 0) { + count = SPIN_COUNT; + _pthread_yield(); + } } } } ==== //depot/projects/arm/src/libexec/rtld-elf/rtld.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.114 2006/03/28 06:14:22 davidxu Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.115 2006/08/04 13:37:54 delphij Exp $ */ /* @@ -2451,8 +2451,8 @@ } else { if (obj->versyms == NULL) { if (object_match_name(obj, ventry->name)) { - _rtld_error("%s: object %s should provide version %s for ", - "symbol %s", obj->path, ventry->name, + _rtld_error("%s: object %s should provide version %s for " + "symbol %s", obj_rtld.path, obj->path, ventry->name, obj->strtab + symnum); continue; } ==== //depot/projects/arm/src/libexec/tftpd/tftpd.8#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)tftpd.8 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/libexec/tftpd/tftpd.8,v 1.18 2004/07/07 19:57:14 ru Exp $ +.\" $FreeBSD: src/libexec/tftpd/tftpd.8,v 1.19 2006/08/07 16:05:55 yar Exp $ .\" .Dd September 14, 2000 .Dt TFTPD 8 @@ -39,7 +39,7 @@ .Nm tftpd .Nd Internet Trivial File Transfer Protocol server .Sh SYNOPSIS -.Nm /usr/libexec/tftpd +.Nm tftpd .Op Fl cClnw .Op Fl s Ar directory .Op Fl u Ar user @@ -70,8 +70,11 @@ .Nm will allow only publicly readable files to be accessed. -Files containing the string ``/\|\fB.\|.\fP\|/'' or starting with -``\|\fB.\|.\fP\|/'' are not allowed. +Files containing the string +.Dq Li "/../" +or starting with +.Dq Li "../" +are not allowed. Files may be written only if they already exist and are publicly writable. Note that this extends the concept of .Dq public @@ -85,7 +88,7 @@ .Nm with a list of directories by including up to 20 pathnames as server program arguments in -.Pa /etc/inetd.conf . +.Xr inetd.conf 5 . In this case access is restricted to files whose names are prefixed by the one of the given directories. The given directories are also treated as a search path for @@ -94,21 +97,24 @@ The .Fl s option provides additional security by changing -.Nm Ns No 's -root directory, thereby prohibiting accesses outside of the specified +the root directory of +.Nm , +thereby prohibiting accesses to outside of the specified .Ar directory . Because .Xr chroot 2 requires super-user privileges, .Nm -must be run as root. +must be run as +.Li root . However, after performing the -.Fn chroot , +.Xr chroot 2 +call, .Nm -will set its user id to that of the specified +will set its user ID to that of the specified .Ar user , or -.Dq nobody +.Dq Li nobody if no .Fl u option is specified. @@ -116,8 +122,9 @@ The options are: .Bl -tag -width Ds .It Fl c -Changes the default root directory of a connecting host via chroot based on the -connecting IP address. +Changes the default root directory of a connecting host via +.Xr chroot 2 +based on the connecting IP address. This prevents multiple clients from writing to the same file at the same time. If the directory does not exist, the client connection is refused. The @@ -131,15 +138,17 @@ Operates the same as .Fl c except it falls back to -.Fl s Ns No 's .Ar directory +specified via +.Fl s if a directory does not exist for the client's IP. .It Fl l Log all requests using .Xr syslog 3 with the facility of .Dv LOG_FTP . -Note: Logging of +.Sy Note : +Logging of .Dv LOG_FTP messages must also be enabled in the syslog configuration file, @@ -151,15 +160,15 @@ Cause .Nm to change its root directory to -.Pa directory . -After changing roots but before accepting commands, +.Ar directory . +After doing that but before accepting commands, .Nm will switch credentials to an unprivileged user. .It Fl u Ar user Switch credentials to .Ar user (default -.Dq nobody ) +.Dq Li nobody ) when the >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608091826.k79IQYRs091777>