Date: Wed, 24 Mar 2004 16:04:26 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 49643 for review Message-ID: <200403250004.i2P04Q3t021924@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=49643 Change 49643 by peter@peter_daintree on 2004/03/24 16:03:39 IFC @49641 Affected files ... .. //depot/projects/hammer/MAINTAINERS#16 integrate .. //depot/projects/hammer/Makefile#17 integrate .. //depot/projects/hammer/Makefile.inc1#47 integrate .. //depot/projects/hammer/UPDATING#36 integrate .. //depot/projects/hammer/bin/cat/cat.1#2 integrate .. //depot/projects/hammer/bin/ls/ls.1#10 integrate .. //depot/projects/hammer/bin/mv/mv.c#4 integrate .. //depot/projects/hammer/bin/ps/ps.1#11 integrate .. //depot/projects/hammer/bin/rmail/Makefile#4 integrate .. //depot/projects/hammer/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/hammer/bin/rmdir/rmdir.c#3 integrate .. //depot/projects/hammer/contrib/amd/scripts/amd.conf.5#4 integrate .. //depot/projects/hammer/etc/Makefile#25 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#23 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#17 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#21 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#20 integrate .. //depot/projects/hammer/etc/rc.d/cleanvar#6 integrate .. //depot/projects/hammer/etc/rc.d/cleartmp#8 integrate .. //depot/projects/hammer/etc/rc.d/diskless#10 delete .. //depot/projects/hammer/etc/rc.d/hostname#5 integrate .. //depot/projects/hammer/etc/rc.d/mixer#2 integrate .. //depot/projects/hammer/etc/rc.d/ntpdate#6 integrate .. //depot/projects/hammer/etc/rc.d/pf#1 branch .. //depot/projects/hammer/etc/rc.d/resolv#1 branch .. //depot/projects/hammer/etc/rc.d/tmp#1 branch .. //depot/projects/hammer/etc/rc.d/var#1 branch .. //depot/projects/hammer/etc/rc.subr#14 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#19 integrate .. //depot/projects/hammer/gnu/lib/libregex/Makefile#4 integrate .. //depot/projects/hammer/gnu/lib/libregex/regex.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.c#4 integrate .. //depot/projects/hammer/lib/libarchive/tar.5#3 integrate .. //depot/projects/hammer/lib/libc/gen/arc4random.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/vis.3#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#62 integrate .. //depot/projects/hammer/release/picobsd/README.html#2 delete .. //depot/projects/hammer/release/picobsd/bridge/crunch.conf#4 integrate .. //depot/projects/hammer/release/picobsd/build/picobsd#3 integrate .. //depot/projects/hammer/release/picobsd/dial/PICOBSD#2 delete .. //depot/projects/hammer/release/picobsd/dial/PICOBSD.hints#2 delete .. //depot/projects/hammer/release/picobsd/dial/config#3 delete .. //depot/projects/hammer/release/picobsd/dial/crunch.conf#3 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree.exclude#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/master.passwd#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/mfs.rc#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/ppp/ppp.conf.template#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/ppp/ppp.linkup#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/rc#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/rc.conf#2 delete .. //depot/projects/hammer/release/picobsd/dial/floppy.tree/etc/ttys#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/LICENCE.ssh#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/README.en#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/README.pl#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/boot.help.en#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/boot.help.pl#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/dialup.en#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/dialup.pl#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/hosts.en#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/hosts.pl#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/login.en#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/login.pl#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/motd.en#2 delete .. //depot/projects/hammer/release/picobsd/dial/lang/motd.pl#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/Makefile#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/TODO.html#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/UCI.html#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/bugs.html#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/faq.html#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/hardware.html#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/how2build.html#3 delete .. //depot/projects/hammer/release/picobsd/doc/src/installflp.html#2 delete .. //depot/projects/hammer/release/picobsd/doc/src/intrinsics.html#3 delete .. //depot/projects/hammer/release/picobsd/doc/src/intro.html#3 delete .. //depot/projects/hammer/release/picobsd/help/README#2 delete .. //depot/projects/hammer/release/picobsd/help/cat.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/cat.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/chmod.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/chmod.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/chown.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/chown.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/cp.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/cp.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/df.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/df.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/dialup.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/dialup.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/dmesg.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/dmesg.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/echo.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/echo.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ee.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ee.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/fsck.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/fsck.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ftp.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ftp.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/gzip.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/gzip.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/help.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/help.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/hostname.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/hostname.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ifconfig.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ifconfig.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/kbdcontrol.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/kbdcontrol.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/kget.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/kget.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/kill.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/kill.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ln.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ln.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ls.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ls.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/mkdir.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/mkdir.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/more.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/more.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/mount.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/mount.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/mount_cd9660.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/mount_cd9660.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/mount_ext2fs.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/mount_ext2fs.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/mount_msdosfs.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/mount_msdosfs.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/moused.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/moused.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/mv.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/mv.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ping.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ping.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ppp.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ppp.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ps.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ps.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/pwd.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/pwd.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/reboot.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/reboot.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/rm.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/rm.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/route.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/route.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/sh.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/sh.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/shutdown.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/shutdown.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/ssh.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/ssh.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/sysctl.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/sysctl.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/telnet.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/telnet.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/test.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/test.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/traceroute.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/traceroute.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/umount.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/umount.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/vidcontrol.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/vidcontrol.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/help/vm.hlp.en#2 delete .. //depot/projects/hammer/release/picobsd/help/vm.hlp.pl#2 delete .. //depot/projects/hammer/release/picobsd/isp/PICOBSD#2 delete .. //depot/projects/hammer/release/picobsd/isp/PICOBSD.hints#2 delete .. //depot/projects/hammer/release/picobsd/isp/config#2 delete .. //depot/projects/hammer/release/picobsd/isp/crunch.conf#2 delete .. //depot/projects/hammer/release/picobsd/isp/floppy.tree.exclude#2 delete .. //depot/projects/hammer/release/picobsd/isp/lang/README.en#2 delete .. //depot/projects/hammer/release/picobsd/isp/lang/README.pl#2 delete .. //depot/projects/hammer/release/picobsd/isp/lang/boot.help.en#2 delete .. //depot/projects/hammer/release/picobsd/isp/lang/boot.help.pl#2 delete .. //depot/projects/hammer/release/picobsd/isp/lang/motd.en#2 delete .. //depot/projects/hammer/release/picobsd/isp/lang/motd.pl#2 delete .. //depot/projects/hammer/release/picobsd/isp/mfs.mtree#2 delete .. //depot/projects/hammer/release/picobsd/net/PICOBSD#2 delete .. //depot/projects/hammer/release/picobsd/net/PICOBSD.hints#2 delete .. //depot/projects/hammer/release/picobsd/net/config#2 delete .. //depot/projects/hammer/release/picobsd/net/crunch.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/boot.config#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/disktab#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/fstab#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/gettytab#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/group#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/host.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/inetd.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/login.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/master.passwd#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/mfs.rc#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/ppp/ppp.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/ppp/ppp.deny#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/ppp/ppp.linkup#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/ppp/ppp.secret.sample#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/profile#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/protocols#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/rc#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/rc.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/rc.firewall#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/rc.network#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/rc.serial#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/remote#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/resolv.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/services#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/shells#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/snmpd.conf#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/termcap#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/etc/ttys#2 delete .. //depot/projects/hammer/release/picobsd/net/floppy.tree/kernel.config#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/README.en#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/README.pl#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/boot.help.en#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/boot.help.pl#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/hosts.en#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/hosts.pl#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/motd.en#2 delete .. //depot/projects/hammer/release/picobsd/net/lang/motd.pl#2 delete .. //depot/projects/hammer/release/picobsd/router/PICOBSD#2 delete .. //depot/projects/hammer/release/picobsd/router/PICOBSD.hints#2 delete .. //depot/projects/hammer/release/picobsd/router/config#2 delete .. //depot/projects/hammer/release/picobsd/router/crunch.conf#2 delete .. //depot/projects/hammer/release/picobsd/router/floppy.tree.exclude#2 delete .. //depot/projects/hammer/release/picobsd/router/floppy.tree/etc/mfs.rc#2 delete .. //depot/projects/hammer/release/picobsd/router/floppy.tree/etc/rc#2 delete .. //depot/projects/hammer/release/picobsd/router/floppy.tree/etc/rc.firewall#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/BAD_DOCS!!!#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/README.en#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/README.pl#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/boot.help.en#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/boot.help.pl#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/hosts.en#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/hosts.pl#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/motd.en#2 delete .. //depot/projects/hammer/release/picobsd/router/lang/motd.pl#2 delete .. //depot/projects/hammer/sbin/ipfw/ipfw.8#19 integrate .. //depot/projects/hammer/sbin/reboot/Makefile#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile#8 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile.asm#4 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/bf-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/bf-686.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/bn-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/cast-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/co-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/crypt586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/des-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/md5-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/rc4-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/rc5-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/rmd-586.s#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/i386/sha1-586.s#2 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#18 integrate .. //depot/projects/hammer/share/man/man4/aac.4#5 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#17 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ctau.4#1 branch .. //depot/projects/hammer/share/man/man4/smp.4#5 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#18 integrate .. //depot/projects/hammer/share/man/man5/passwd.5#4 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#22 integrate .. //depot/projects/hammer/share/man/man7/hier.7#12 integrate .. //depot/projects/hammer/share/man/man9/g_access.9#2 integrate .. //depot/projects/hammer/share/man/man9/g_attach.9#3 integrate .. //depot/projects/hammer/share/man/man9/g_consumer.9#3 integrate .. //depot/projects/hammer/share/man/man9/g_geom.9#3 integrate .. //depot/projects/hammer/share/man/man9/g_provider.9#3 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#15 integrate .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#11 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#11 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#7 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#11 integrate .. //depot/projects/hammer/sys/conf/files.i386#25 integrate .. //depot/projects/hammer/sys/conf/files.pc98#25 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#8 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#15 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#21 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#22 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#15 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdev.c#11 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#4 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#7 integrate .. //depot/projects/hammer/sys/dev/ispfw/ispfw.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/uio_machdep.c#1 branch .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#25 integrate .. //depot/projects/hammer/sys/kern/init_main.c#21 edit .. //depot/projects/hammer/sys/kern/kern_thread.c#45 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#26 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#15 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#26 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#13 integrate .. //depot/projects/hammer/sys/modules/netgraph/sppp/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_arcsubr.c#8 integrate .. //depot/projects/hammer/sys/net/if_gif.c#10 integrate .. //depot/projects/hammer/sys/net/if_gre.c#13 integrate .. //depot/projects/hammer/sys/net/if_gre.h#6 integrate .. //depot/projects/hammer/sys/netatalk/aarp.c#9 integrate .. //depot/projects/hammer/sys/netatalk/at_control.c#4 integrate .. //depot/projects/hammer/sys/netatalk/at_rmx.c#2 integrate .. //depot/projects/hammer/sys/netatalk/at_var.h#3 integrate .. //depot/projects/hammer/sys/netatalk/ddp_input.c#5 integrate .. //depot/projects/hammer/sys/netatalk/ddp_output.c#6 integrate .. //depot/projects/hammer/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#9 integrate .. //depot/projects/hammer/sys/netatalk/ddp_var.h#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_sppp.c#1 branch .. //depot/projects/hammer/sys/netgraph/ng_sppp.h#1 branch .. //depot/projects/hammer/sys/netgraph/ng_tee.c#5 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#9 integrate .. //depot/projects/hammer/sys/netinet/ip_gre.c#10 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#19 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/uio_machdep.c#1 branch .. //depot/projects/hammer/sys/sparc64/sparc64/iommu.c#12 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/uio_machdep.c#1 branch .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#13 integrate .. //depot/projects/hammer/sys/sys/param.h#29 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#32 integrate .. //depot/projects/hammer/usr.bin/Makefile#27 integrate .. //depot/projects/hammer/usr.bin/csplit/csplit.c#2 integrate .. //depot/projects/hammer/usr.bin/doscmd/AsyncIO.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/AsyncIO.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/Makefile#4 delete .. //depot/projects/hammer/usr.bin/doscmd/Makefile.dos#2 delete .. //depot/projects/hammer/usr.bin/doscmd/PROBLEMS#2 delete .. //depot/projects/hammer/usr.bin/doscmd/ParseBuffer.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/README#2 delete .. //depot/projects/hammer/usr.bin/doscmd/README.booting_dos#2 delete .. //depot/projects/hammer/usr.bin/doscmd/bios.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/callback.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/callback.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/cmos.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/com.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/config.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/cp437-8x14.pcf.gz.uu#2 delete .. //depot/projects/hammer/usr.bin/doscmd/cp437-8x16.pcf.gz.uu#2 delete .. //depot/projects/hammer/usr.bin/doscmd/cp437-8x8.pcf.gz.uu#2 delete .. //depot/projects/hammer/usr.bin/doscmd/cpu.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/crt0.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/cwd.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/cwd.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/debug.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/disktab.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/dispatch.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/dos.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/dos.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/doscmd.1#4 delete .. //depot/projects/hammer/usr.bin/doscmd/doscmd.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/doscmd.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/doscmd_loader.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/ems.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/ems.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/emsdriv.S#2 delete .. //depot/projects/hammer/usr.bin/doscmd/emsdriv.sys.uu#2 delete .. //depot/projects/hammer/usr.bin/doscmd/emuint.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/emuint.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/exe.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/fonts.dir#2 delete .. //depot/projects/hammer/usr.bin/doscmd/i386-pinsn.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int10.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int13.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int14.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int16.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int17.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int1a.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/int2f.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/intff.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/mem.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/mouse.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/mouse.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/net.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/port.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/redir.S#2 delete .. //depot/projects/hammer/usr.bin/doscmd/redir.com.uu#2 delete .. //depot/projects/hammer/usr.bin/doscmd/register.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/setver.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/signal.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/timer.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/trace.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/trap.c#3 delete .. //depot/projects/hammer/usr.bin/doscmd/trap.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/tty.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/tty.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/video.c#2 delete .. //depot/projects/hammer/usr.bin/doscmd/video.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/vparams.h#2 delete .. //depot/projects/hammer/usr.bin/doscmd/xms.c#3 delete .. //depot/projects/hammer/usr.bin/doscmd/xms.h#2 delete .. //depot/projects/hammer/usr.bin/indent/args.c#4 integrate .. //depot/projects/hammer/usr.bin/ipcs/ipcs.1#4 integrate .. //depot/projects/hammer/usr.bin/ipcs/ipcs.c#4 integrate .. //depot/projects/hammer/usr.bin/talk/ctl.c#3 integrate .. //depot/projects/hammer/usr.bin/truss/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/truss/syscall.h#3 integrate .. //depot/projects/hammer/usr.bin/truss/syscalls.c#10 integrate .. //depot/projects/hammer/usr.sbin/inetd/inetd.c#8 integrate .. //depot/projects/hammer/usr.sbin/mountd/exports.5#5 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#16 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.82 2004/03/01 16:34:39 obrien Exp $ +$FreeBSD: src/MAINTAINERS,v 1.83 2004/03/23 21:22:24 mlaier Exp $ subsystem login notes ----------------------------- @@ -90,6 +90,7 @@ requested. contrib/smbfs bp Open for in-tree committs. In case of functional changes pre-commit review requested. +contrib/pf mlaier Pre-commit review requested. binutils obrien Insists on BU blocked from unapproved commits ==== //depot/projects/hammer/Makefile#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.297 2004/03/02 14:32:23 ru Exp $ +# $FreeBSD: src/Makefile,v 1.298 2004/03/24 08:26:22 ru Exp $ # # The user-driven targets are: # @@ -67,7 +67,7 @@ hierarchy install installcheck installkernel installkernel.debug\ reinstallkernel reinstallkernel.debug installworld \ libraries lint maninstall \ - obj objlink regress rerelease tags update \ + obj objlink regress rerelease tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend ==== //depot/projects/hammer/Makefile.inc1#47 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.420 2004/03/19 17:57:07 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.421 2004/03/24 08:26:22 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -343,6 +343,8 @@ buildworld: ${WMAKE_TGTS} .ORDER: ${WMAKE_TGTS} +toolchain: ${WMAKE_TGTS:N_depend:Neverything} + # # Use this to add checks to installworld/installkernel targets. # ==== //depot/projects/hammer/UPDATING#36 (text+ko) ==== @@ -17,6 +17,17 @@ developers choose to disable these features on build machines to maximize performance. +20040322: + The debug.mpsafenet tunable controls whether the kernel Giant + lock is held across the lower levels of the network stack, and + by default is turned off. In the few days following 20040322, + the behavior of debug.mpsafenet will change such that this + tunable controls Giant over all levels of the network stack. + If you are currently setting debug.mpsafenet to 1, you should + set it back to 0 (the default) again during the change-over. + An additional note will be added to UPDATING when sufficient + locking is merged to permit this to take place. + 20040310: The FreeBSD/sparc64 platform is changing time_t from 32-bits to 64-bits. This is a very major incompatible change, so people @@ -1548,4 +1559,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.300 2004/03/18 00:50:40 obrien Exp $ +$FreeBSD: src/UPDATING,v 1.301 2004/03/22 16:37:32 rwatson Exp $ ==== //depot/projects/hammer/bin/cat/cat.1#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cat.1 8.3 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/cat/cat.1,v 1.19 2001/09/25 18:10:18 ru Exp $ +.\" $FreeBSD: src/bin/cat/cat.1,v 1.21 2004/03/21 11:04:59 tjr Exp $ .\" -.Dd September 15, 2001 +.Dd March 21, 2004 .Dt CAT 1 .Os .Sh NAME @@ -93,9 +93,7 @@ option), and display tab characters as .Ql ^I . .It Fl u -The -.Fl u -option guarantees that the output is unbuffered. +Disable output buffering. .It Fl v Display non-printing characters so they are visible. Control characters print as @@ -199,3 +197,11 @@ redirection, the command .Dq Li cat file1 file2 > file1 will cause the original data in file1 to be destroyed! +.Pp +The +.Nm +utility does not recognize multibyte characters when the +.Fl t +or +.Fl v +option is in effect. ==== //depot/projects/hammer/bin/ls/ls.1#10 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.77 2003/12/01 19:10:29 obrien Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.78 2004/03/21 11:16:24 tjr Exp $ .\" -.Dd May 19, 2002 +.Dd March 21, 2004 .Dt LS 1 .Os .Sh NAME @@ -677,3 +677,7 @@ .Sh BUGS To maintain backward compatibility, the relationships between the many options are quite complex. +.Pp +The +.Nm +utility does not recognize multibyte characters in filenames. ==== //depot/projects/hammer/bin/mv/mv.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.42 2004/03/21 13:38:37 pjd Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -210,14 +210,25 @@ struct statfs sfs; char path[PATH_MAX]; - /* Can't mv(1) a mount point. */ - if (realpath(from, path) == NULL) { - warnx("cannot resolve %s: %s", from, path); + /* + * If the source is a symbolic link and is on another + * filesystem, it can be recreated at the destination. + */ + if (lstat(from, &sb) == -1) { + warn("%s", from); return (1); } - if (!statfs(path, &sfs) && !strcmp(path, sfs.f_mntonname)) { - warnx("cannot rename a mount point"); - return (1); + if (!S_ISLNK(sb.st_mode)) { + /* Can't mv(1) a mount point. */ + if (realpath(from, path) == NULL) { + warnx("cannot resolve %s: %s", from, path); + return (1); + } + if (!statfs(path, &sfs) && + !strcmp(path, sfs.f_mntonname)) { + warnx("cannot rename a mount point"); + return (1); + } } } else { warn("rename %s to %s", from, to); ==== //depot/projects/hammer/bin/ps/ps.1#11 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.67 2004/03/17 22:46:58 gad Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.68 2004/03/21 11:24:06 tjr Exp $ .\" -.Dd April 18, 1994 +.Dd March 21, 2004 .Dt PS 1 .Os .Sh NAME @@ -559,3 +559,8 @@ .Nm cannot run faster than the system and is run as any other scheduled process, the information it displays can never be exact. +.Pp +The +.Nm +utility does not correctly display argument lists containing multibyte +characters. ==== //depot/projects/hammer/bin/rmail/Makefile#4 (text+ko) ==== @@ -1,15 +1,18 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/rmail/Makefile,v 1.19 2004/02/23 20:05:14 johan Exp $ +# $FreeBSD: src/bin/rmail/Makefile,v 1.20 2004/03/22 03:17:36 obrien Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/rmail +# Not much point this being static. It calls a shared sendmail... +NOSHARED?= NO + PROG= rmail SRCS= rmail.c MAN= rmail.8 + +WARNS?= 0 CFLAGS+=-I${SENDMAIL_DIR}/include -I. -WARNS?= 0 -WFORMAT=0 .if exists(${.OBJDIR}/../../lib/libsm) LIBSMDIR:= ${.OBJDIR}/../../lib/libsm @@ -34,9 +37,6 @@ # following: # CFLAGS+= -DQUEUE_ONLY -# Not much point this being static. It calls a shared sendmail... -NOSHARED?= NO - sm_os.h: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h ==== //depot/projects/hammer/bin/rmdir/rmdir.1#2 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rmdir.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.9 2000/11/20 11:39:40 ru Exp $ +.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.10 2004/03/21 04:56:06 des Exp $ .\" -.Dd May 31, 1993 +.Dd March 21, 2004 .Dt RMDIR 1 .Os .Sh NAME @@ -43,7 +43,7 @@ .Nd remove directories .Sh SYNOPSIS .Nm -.Op Fl p +.Op Fl pv .Ar directory ... .Sh DESCRIPTION The @@ -72,6 +72,8 @@ (See .Xr rm 1 for fully non-discriminant recursive removal.) +.It Fl v +Be verbose, listing each directory as it is removed. .El .Pp The ==== //depot/projects/hammer/bin/rmdir/rmdir.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.14 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.15 2004/03/21 04:56:06 des Exp $"); #include <err.h> #include <errno.h> @@ -52,21 +52,25 @@ #include <string.h> #include <unistd.h> -int rm_path(char *); -void usage(void); +static int rm_path(char *); +static void usage(void); + +static int pflag; +static int vflag; int main(int argc, char *argv[]) { int ch, errors; - int pflag; - pflag = 0; - while ((ch = getopt(argc, argv, "p")) != -1) + while ((ch = getopt(argc, argv, "pv")) != -1) switch(ch) { case 'p': pflag = 1; break; + case 'v': + vflag = 1; + break; case '?': default: usage(); @@ -78,17 +82,22 @@ usage(); for (errors = 0; *argv; argv++) { - if (rmdir(*argv) < 0) { - warn("%s", *argv); - errors = 1; - } else if (pflag) + if (pflag) { errors |= rm_path(*argv); + } else { + if (rmdir(*argv) < 0) { + warn("%s", *argv); + errors = 1; + } + if (vflag) + printf("%s\n", *argv); + } } exit(errors); } -int +static int rm_path(char *path) { char *p; @@ -107,12 +116,14 @@ warn("%s", path); return (1); } + if (vflag) + printf("%s\n", path); } return (0); } -void +static void usage(void) { ==== //depot/projects/hammer/contrib/amd/scripts/amd.conf.5#4 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amd.conf.5,v 1.7.2.8 2003/03/16 01:47:00 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.14 2003/09/02 15:42:57 mbr Exp $ +.\" $FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.15 2004/03/24 10:25:24 se Exp $ .\" .Dd April 7, 1997 .Dt AMD.CONF 5 @@ -121,62 +121,94 @@ calls. This means you could run for example .Xr ls 1 and see what keys are available to mount in that directory. Not all entries -are made visible to readdir(3): the "/default" entry, wildcard -entries, and those with a "/" in them are not included. If you specify -"full" to this option, all but "/default" will be visible. -Note that if you run a command which will attempt to -.BR stat (2) -the entries, such as often done by "ls -l" or "ls -F", amd will attempt to -mount -.I every -entry in that map. This is often called a ``mount storm''. - -.TP -.BR map_options " (string, default no options)" -This option is the same as specifying map options on the command line to -amd, such as "cache:=all". - -.TP -.BR map_type " (string, default search all map types)" -If specified, amd will initialize the map only for the type given. This is -useful to avoid the default map search type used by amd which takes longer -and can have undesired side-effects such as initializing NIS even if not -used. Possible values are - -.nf -\fBfile\fR plain files -\fBhesiod\fR Hesiod name service from MIT -\fBldap\fR Lightweight Directory Access Protocol -\fBndbm\fR (New) dbm style hash files -\fBnis\fR Network Information Services (version 2) -\fBnisplus\fR Network Information Services Plus (version 3) -\fBpasswd\fR local password files -\fBunion\fR union maps -.fi - -.TP -.BR mount_type " (string, default=nfs)" -All amd mount types must be NFS. That is, amd is an NFS server on the -map mount points, for the local host it is running on. If "autofs" is -specified, amd will log an error and convert it to NFS. - -.TP -.BR search_path " (string, default no search path)" -This provides a (colon-delimited) search path for file maps. Using a search -path, sites can allow for local map customizations and overrides, and can -distributed maps in several locations as needed. - -.\" ************************************************************************** -.SS Parameters applicable to the global section only - -.TP -.BR arch " (string, default to compiled in value)" +are made visible to +.Xr readdir 3 : +the +.Qq Pa /default +entry, wildcard entries, and those with a +.Qq Pa / +in them are not included. If you specify +.Qq full +to this option, all but +.Qq Pa /default +will be visible. Note that if you run a command which will attempt to +.Xr stat 2 +the entries, such as often done by +.Qq ls -l +or +.Qq ls -F , +.Nm amd +will attempt to mount +.Em every +entry in that map. This is often called a +.Dq mount storm . +.It Ic map_options Xo +(string, default no options) +.Xc +This option is the same as specifying map options on the command line to +.Nm amd , +such as +.Ql cache\&:\&=all . +.It Ic map_type Xo +(string, default search all map types) +.Xc +If specified, amd will initialize the map only for the type given. +This is useful to avoid the default map search type used by +.Nm amd +which takes longer and can have undesired side-effects such as initializing +.Tn NIS +even if not used. Possible values are: +.Pp +.Bl -tag -width "nisplus" -compact +.It Ic file +plain files +.It Ic hesiod +Hesiod name service from MIT +.It Ic ldap +Lightweight Directory Access Protocol +.It Ic ndbm +(New) dbm style hash files +.It Ic nis +Network Information Services (version 2) +.It Ic nisplus +Network Information Services Plus (version 3) +.It Ic passwd +local password files +.It Ic union +union maps +.El +.It Ic mount_type Xo +(string, default=nfs) +.Xc +All amd mount types must be +.Tn NFS . +That is, +.Nm amd +is an +.Tn NFS +server on the map mount points, for the local host it is running on. If +.Qq autofs +is specified, amd will log an error and convert it to +.Tn NFS . +.It Ic search_path Xo +(string, default no search path) +.Xc +This provides a +(colon-delimited) +search path for file maps. Using a search path, sites can allow for +local map customizations and overrides, and can query distributed maps in +several locations as needed. +.El +.Ss "Parameters applicable to the global section only" +.Bl -tag -width 4n +.It Ic arch Xo +(string, default to compiled in value) +.Xc Allows you to override the value of the .Va arch .Nm amd variable. -.It Ic auto_dir Xo -(string, default=/a) +.It Ic auto_dir Xo (string, default= Ns Pa /a ) .Xc Same as the .Fl a @@ -241,7 +273,7 @@ .It Ic info info service specific debugging (hesiod, nis, etc.) -.It mem +.It Ic mem trace memory allocations .It Ic mtab use local @@ -268,7 +300,7 @@ .Xc If .Qq yes , -.Nm Amd +.Nm amd will perform RPC authentication using fully-qualified host names. This is necessary for some systems, and especially when performing cross-domain mounting. For this function to work, the @@ -331,8 +363,7 @@ Specify the local domain name. If this option is not given the domain name is determined from the hostname by removing the first component of the fully-qualified host name. -.It Ic log_file Xo -(string, default=/dev/stderr) +.It Ic log_file Xo (string, default= Ns Pa /dev/stderr ) .Xc Same as the .Fl l @@ -380,8 +411,8 @@ .Dq debug logging option is only available if am-utils was configured with .Fl -enable-debug . -You can get the list of supported debugging options by running -.Nm amd Fl v . +You can get the list of supported debugging and logging options by running +.Nm amd Fl H . Possible values are: .Pp .Bl -tag -width "warning" -compact @@ -406,6 +437,16 @@ .It Ic warning warnings .El +.It Ic nfs_proto Xo +(string, default to trying version tcp then udp) +.Xc +By default, amd tries TCP and then UDP. This option forces the overall +.Tn NFS +protocol used to TCP or UDP. It overrides what is in the amd maps, and is +useful when amd is compiled with NFSv3 support that may not be stable. With +this option you can turn off the complete usage of NFSv3 dynamically +(without having to recompile amd) until such time as NFSv3 support is +desired again. .It Ic nfs_retransmit_counter Xo (numeric, default=110) .Xc @@ -420,95 +461,75 @@ (numeric, default=8) .Xc Same as the -.B \-x -option to amd. Specify any logging options for amd. Options are comma -delimited, and can be preceded by the string "no" to negate their meaning. -The "debug" logging option is only available if am-utils was configured with ---enable-debug. You can get the list of supported debugging and logging -options by running amd \-H. Possible values are: >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403250004.i2P04Q3t021924>