PERFORCE change 75527 for review
Peter Wemm
peter at FreeBSD.org
Mon Apr 18 15:40:09 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=75527
Change 75527 by peter at peter_daintree on 2005/04/18 22:39:43
IFC @75526
Affected files ...
.. //depot/projects/hammer/UPDATING#75 integrate
.. //depot/projects/hammer/bin/hostname/hostname.1#5 integrate
.. //depot/projects/hammer/etc/Makefile#38 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#53 integrate
.. //depot/projects/hammer/etc/rc.d/Makefile#34 integrate
.. //depot/projects/hammer/etc/rc.d/bsnmpd#1 branch
.. //depot/projects/hammer/etc/snmpd.config#1 branch
.. //depot/projects/hammer/kerberos5/Makefile.inc#12 integrate
.. //depot/projects/hammer/lib/libarchive/Makefile#20 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#21 integrate
.. //depot/projects/hammer/lib/libc/gen/sysctl.3#8 integrate
.. //depot/projects/hammer/lib/libc/net/getnameinfo.c#4 integrate
.. //depot/projects/hammer/lib/libc/net/getservbyname.c#3 integrate
.. //depot/projects/hammer/lib/libc/net/getservbyport.c#3 integrate
.. //depot/projects/hammer/lib/libc/net/getservent.c#5 integrate
.. //depot/projects/hammer/lib/libc/net/netdb_private.h#2 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#17 integrate
.. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#16 integrate
.. //depot/projects/hammer/lib/libugidfw/libugidfw.3#5 integrate
.. //depot/projects/hammer/lib/libugidfw/ugidfw.c#9 integrate
.. //depot/projects/hammer/lib/msun/Makefile#27 integrate
.. //depot/projects/hammer/lib/msun/amd64/Makefile.inc#4 integrate
.. //depot/projects/hammer/lib/msun/amd64/e_sqrtf.S#1 branch
.. //depot/projects/hammer/lib/msun/amd64/s_llrintf.S#1 branch
.. //depot/projects/hammer/lib/msun/amd64/s_lrintf.S#1 branch
.. //depot/projects/hammer/lib/msun/amd64/s_scalbn.S#1 branch
.. //depot/projects/hammer/lib/msun/amd64/s_scalbnf.S#1 branch
.. //depot/projects/hammer/lib/msun/amd64/s_scalbnl.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/Makefile.inc#5 integrate
.. //depot/projects/hammer/lib/msun/i387/s_ceill.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_copysignl.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_floorl.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_llrintf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_lrintf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_trunc.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_truncf.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_truncl.S#1 branch
.. //depot/projects/hammer/lib/msun/man/trunc.3#2 integrate
.. //depot/projects/hammer/lib/msun/src/math.h#30 integrate
.. //depot/projects/hammer/lib/msun/src/s_truncl.c#1 branch
.. //depot/projects/hammer/libexec/rexecd/rexecd.c#8 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#92 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#13 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#4 integrate
.. //depot/projects/hammer/release/scripts/package-split.py#3 integrate
.. //depot/projects/hammer/sbin/devd/devd.cc#10 integrate
.. //depot/projects/hammer/sbin/dump/main.c#15 integrate
.. //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#9 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#40 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#40 integrate
.. //depot/projects/hammer/share/examples/ppi/ppilcd.c#3 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#69 integrate
.. //depot/projects/hammer/share/man/man4/amr.4#12 integrate
.. //depot/projects/hammer/share/man/man4/ata.4#14 integrate
.. //depot/projects/hammer/share/man/man4/ataraid.4#1 branch
.. //depot/projects/hammer/share/man/man4/ipw.4#1 branch
.. //depot/projects/hammer/share/man/man4/iwi.4#1 branch
.. //depot/projects/hammer/share/man/man4/polling.4#15 integrate
.. //depot/projects/hammer/share/man/man4/ral.4#1 branch
.. //depot/projects/hammer/share/man/man4/ucom.4#5 integrate
.. //depot/projects/hammer/share/man/man4/ural.4#1 branch
.. //depot/projects/hammer/share/man/man5/rc.conf.5#53 integrate
.. //depot/projects/hammer/share/man/man9/alq.9#6 integrate
.. //depot/projects/hammer/sys/alpha/include/_bus.h#1 branch
.. //depot/projects/hammer/sys/alpha/include/bus.h#17 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#64 integrate
.. //depot/projects/hammer/sys/amd64/include/_bus.h#1 branch
.. //depot/projects/hammer/sys/amd64/include/bus.h#10 integrate
.. //depot/projects/hammer/sys/arm/include/_bus.h#1 branch
.. //depot/projects/hammer/sys/arm/include/bus.h#8 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/biosacpi.c#7 integrate
.. //depot/projects/hammer/sys/boot/i386/libi386/pxe.c#5 integrate
.. //depot/projects/hammer/sys/compat/ndis/kern_windrv.c#5 integrate
.. //depot/projects/hammer/sys/compat/ndis/winx64_wrap.S#3 integrate
.. //depot/projects/hammer/sys/conf/NOTES#87 integrate
.. //depot/projects/hammer/sys/conf/files#111 integrate
.. //depot/projects/hammer/sys/conf/kmod.mk#47 integrate
.. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_osdep.c#6 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#48 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#28 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#54 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#29 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-raid.c#22 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-raid.h#12 integrate
.. //depot/projects/hammer/sys/dev/drm/ati_pcigart.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/ati_pcigart.h#5 delete
.. //depot/projects/hammer/sys/dev/drm/drm.h#8 integrate
.. //depot/projects/hammer/sys/dev/drm/drmP.h#11 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_agpsupport.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_agpsupport.h#5 delete
.. //depot/projects/hammer/sys/dev/drm/drm_atomic.h#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_auth.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_auth.h#6 delete
.. //depot/projects/hammer/sys/dev/drm/drm_bufs.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_bufs.h#12 delete
.. //depot/projects/hammer/sys/dev/drm/drm_context.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_context.h#7 delete
.. //depot/projects/hammer/sys/dev/drm/drm_dma.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_dma.h#8 delete
.. //depot/projects/hammer/sys/dev/drm/drm_drawable.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_drawable.h#5 delete
.. //depot/projects/hammer/sys/dev/drm/drm_drv.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_drv.h#18 delete
.. //depot/projects/hammer/sys/dev/drm/drm_fops.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_fops.h#10 delete
.. //depot/projects/hammer/sys/dev/drm/drm_ioctl.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_ioctl.h#8 delete
.. //depot/projects/hammer/sys/dev/drm/drm_irq.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_irq.h#5 delete
.. //depot/projects/hammer/sys/dev/drm/drm_linux_list.h#3 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_lock.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_lock.h#6 delete
.. //depot/projects/hammer/sys/dev/drm/drm_memory.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_memory.h#7 delete
.. //depot/projects/hammer/sys/dev/drm/drm_memory_debug.h#4 delete
.. //depot/projects/hammer/sys/dev/drm/drm_os_freebsd.h#16 delete
.. //depot/projects/hammer/sys/dev/drm/drm_pci.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_pci.h#4 delete
.. //depot/projects/hammer/sys/dev/drm/drm_pciids.h#2 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_sarea.h#5 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_scatter.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_scatter.h#5 delete
.. //depot/projects/hammer/sys/dev/drm/drm_sysctl.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_sysctl.h#9 delete
.. //depot/projects/hammer/sys/dev/drm/drm_vm.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/drm_vm.h#11 delete
.. //depot/projects/hammer/sys/dev/drm/i915_dma.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/i915_drm.h#1 branch
.. //depot/projects/hammer/sys/dev/drm/i915_drv.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/i915_drv.h#1 branch
.. //depot/projects/hammer/sys/dev/drm/i915_irq.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/i915_mem.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/mach64_dma.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/mach64_drm.h#1 branch
.. //depot/projects/hammer/sys/dev/drm/mach64_drv.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/mach64_drv.h#1 branch
.. //depot/projects/hammer/sys/dev/drm/mach64_irq.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/mach64_state.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/mga.h#7 delete
.. //depot/projects/hammer/sys/dev/drm/mga_dma.c#9 integrate
.. //depot/projects/hammer/sys/dev/drm/mga_drm.h#5 integrate
.. //depot/projects/hammer/sys/dev/drm/mga_drv.c#7 integrate
.. //depot/projects/hammer/sys/dev/drm/mga_drv.h#7 integrate
.. //depot/projects/hammer/sys/dev/drm/mga_irq.c#5 integrate
.. //depot/projects/hammer/sys/dev/drm/mga_state.c#6 integrate
.. //depot/projects/hammer/sys/dev/drm/mga_ucode.h#3 integrate
.. //depot/projects/hammer/sys/dev/drm/mga_warp.c#5 integrate
.. //depot/projects/hammer/sys/dev/drm/r128.h#8 delete
.. //depot/projects/hammer/sys/dev/drm/r128_cce.c#9 integrate
.. //depot/projects/hammer/sys/dev/drm/r128_drm.h#6 integrate
.. //depot/projects/hammer/sys/dev/drm/r128_drv.c#7 integrate
.. //depot/projects/hammer/sys/dev/drm/r128_drv.h#8 integrate
.. //depot/projects/hammer/sys/dev/drm/r128_irq.c#5 integrate
.. //depot/projects/hammer/sys/dev/drm/r128_state.c#9 integrate
.. //depot/projects/hammer/sys/dev/drm/radeon.h#10 delete
.. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#9 integrate
.. //depot/projects/hammer/sys/dev/drm/radeon_drm.h#8 integrate
.. //depot/projects/hammer/sys/dev/drm/radeon_drv.c#8 integrate
.. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#9 integrate
.. //depot/projects/hammer/sys/dev/drm/radeon_irq.c#6 integrate
.. //depot/projects/hammer/sys/dev/drm/radeon_mem.c#6 integrate
.. //depot/projects/hammer/sys/dev/drm/radeon_state.c#10 integrate
.. //depot/projects/hammer/sys/dev/drm/savage_bci.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/savage_drm.h#1 branch
.. //depot/projects/hammer/sys/dev/drm/savage_drv.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/savage_drv.h#1 branch
.. //depot/projects/hammer/sys/dev/drm/savage_state.c#1 branch
.. //depot/projects/hammer/sys/dev/drm/sis.h#5 delete
.. //depot/projects/hammer/sys/dev/drm/sis_drm.h#4 integrate
.. //depot/projects/hammer/sys/dev/drm/sis_drv.c#5 integrate
.. //depot/projects/hammer/sys/dev/drm/sis_drv.h#3 integrate
.. //depot/projects/hammer/sys/dev/drm/sis_ds.c#3 integrate
.. //depot/projects/hammer/sys/dev/drm/sis_ds.h#4 integrate
.. //depot/projects/hammer/sys/dev/drm/sis_mm.c#6 integrate
.. //depot/projects/hammer/sys/dev/drm/tdfx.h#6 delete
.. //depot/projects/hammer/sys/dev/drm/tdfx_drv.c#7 integrate
.. //depot/projects/hammer/sys/dev/drm/tdfx_drv.h#1 branch
.. //depot/projects/hammer/sys/dev/esp/esp_sbus.c#8 integrate
.. //depot/projects/hammer/sys/dev/esp/ncr53c9x.c#6 integrate
.. //depot/projects/hammer/sys/dev/esp/ncr53c9xreg.h#4 integrate
.. //depot/projects/hammer/sys/dev/esp/ncr53c9xvar.h#5 integrate
.. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#1 branch
.. //depot/projects/hammer/sys/dev/ipw/if_ipwreg.h#1 branch
.. //depot/projects/hammer/sys/dev/ipw/if_ipwvar.h#1 branch
.. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#1 branch
.. //depot/projects/hammer/sys/dev/iwi/if_iwireg.h#1 branch
.. //depot/projects/hammer/sys/dev/iwi/if_iwivar.h#1 branch
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs#33 integrate
.. //depot/projects/hammer/sys/dev/ral/if_ral.c#1 branch
.. //depot/projects/hammer/sys/dev/ral/if_ral_pccard.c#1 branch
.. //depot/projects/hammer/sys/dev/ral/if_ral_pci.c#1 branch
.. //depot/projects/hammer/sys/dev/ral/if_ralrate.c#1 branch
.. //depot/projects/hammer/sys/dev/ral/if_ralrate.h#1 branch
.. //depot/projects/hammer/sys/dev/ral/if_ralreg.h#1 branch
.. //depot/projects/hammer/sys/dev/ral/if_ralvar.h#1 branch
.. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/if_ural.c#1 branch
.. //depot/projects/hammer/sys/dev/usb/if_uralreg.h#1 branch
.. //depot/projects/hammer/sys/dev/usb/if_uralvar.h#1 branch
.. //depot/projects/hammer/sys/dev/usb/usbdevs#59 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_conv.c#11 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#9 integrate
.. //depot/projects/hammer/sys/geom/geom_kern.c#18 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#67 integrate
.. //depot/projects/hammer/sys/i386/include/_bus.h#1 branch
.. //depot/projects/hammer/sys/i386/include/bus.h#3 integrate
.. //depot/projects/hammer/sys/ia64/ia64/db_trace.c#13 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#43 integrate
.. //depot/projects/hammer/sys/ia64/ia64/unwind.c#11 integrate
.. //depot/projects/hammer/sys/ia64/include/_bus.h#1 branch
.. //depot/projects/hammer/sys/ia64/include/bus.h#15 integrate
.. //depot/projects/hammer/sys/kern/kern_alq.c#10 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#43 integrate
.. //depot/projects/hammer/sys/kern/kern_ktr.c#14 integrate
.. //depot/projects/hammer/sys/kern/kern_mac.c#31 integrate
.. //depot/projects/hammer/sys/kern/kern_proc.c#46 integrate
.. //depot/projects/hammer/sys/kern/kern_prot.c#24 integrate
.. //depot/projects/hammer/sys/kern/subr_param.c#14 integrate
.. //depot/projects/hammer/sys/kern/sys_socket.c#17 integrate
.. //depot/projects/hammer/sys/kern/sysv_sem.c#21 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#48 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#54 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#81 integrate
.. //depot/projects/hammer/sys/modules/Makefile#74 integrate
.. //depot/projects/hammer/sys/modules/apm/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/drm/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/drm/drm/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/drm/mach64/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ipw/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/iwi/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ral/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/ural/Makefile#1 branch
.. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#17 integrate
.. //depot/projects/hammer/sys/netinet/ip_dummynet.c#29 integrate
.. //depot/projects/hammer/sys/netinet/ip_dummynet.h#11 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw.h#21 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#53 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#13 integrate
.. //depot/projects/hammer/sys/netinet/tcp_sack.c#13 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_output.c#29 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#25 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs.h#10 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#23 integrate
.. //depot/projects/hammer/sys/pc98/apm/apm_bioscall.s#3 integrate
.. //depot/projects/hammer/sys/pc98/conf/NOTES#41 integrate
.. //depot/projects/hammer/sys/pc98/include/_bus.h#1 branch
.. //depot/projects/hammer/sys/pc98/include/bus.h#2 integrate
.. //depot/projects/hammer/sys/pci/if_dc.c#43 integrate
.. //depot/projects/hammer/sys/powerpc/include/_bus.h#1 branch
.. //depot/projects/hammer/sys/powerpc/include/bus.h#12 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#8 integrate
.. //depot/projects/hammer/sys/powerpc/powermac/ata_macio.c#12 integrate
.. //depot/projects/hammer/sys/security/mac/mac_process.c#6 integrate
.. //depot/projects/hammer/sys/security/mac/mac_socket.c#3 integrate
.. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#13 integrate
.. //depot/projects/hammer/sys/security/mac_test/mac_test.c#31 integrate
.. //depot/projects/hammer/sys/sparc64/include/_bus.h#1 branch
.. //depot/projects/hammer/sys/sparc64/include/bus.h#19 integrate
.. //depot/projects/hammer/sys/sparc64/include/cpufunc.h#6 integrate
.. //depot/projects/hammer/sys/sparc64/include/pcpu.h#5 integrate
.. //depot/projects/hammer/sys/sparc64/include/tick.h#3 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/lsi64854.c#3 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/lsi64854reg.h#2 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/lsi64854var.h#2 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#17 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/exception.S#15 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/genassym.c#11 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/interrupt.S#6 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/intr_machdep.c#11 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#41 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#15 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/tick.c#8 integrate
.. //depot/projects/hammer/sys/sys/alq.h#5 integrate
.. //depot/projects/hammer/sys/sys/kernel.h#16 integrate
.. //depot/projects/hammer/sys/sys/mac.h#23 integrate
.. //depot/projects/hammer/sys/sys/mac_policy.h#25 integrate
.. //depot/projects/hammer/sys/sys/proc.h#79 integrate
.. //depot/projects/hammer/sys/sys/sysctl.h#26 integrate
.. //depot/projects/hammer/sys/sys/systm.h#35 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#34 integrate
.. //depot/projects/hammer/sys/vm/vm_pageq.c#9 integrate
.. //depot/projects/hammer/tools/regression/mac/mac_bsdextended/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/mac/mac_bsdextended/test_ugidfw.c#1 branch
.. //depot/projects/hammer/tools/regression/msdosfs/msdosfstest-2.sh#1 branch
.. //depot/projects/hammer/tools/regression/msdosfs/msdosfstest-3.sh#1 branch
.. //depot/projects/hammer/tools/regression/msdosfs/msdosfstest.sh#2 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#35 integrate
.. //depot/projects/hammer/usr.bin/tar/Makefile#12 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar.c#23 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar.h#13 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#8 integrate
.. //depot/projects/hammer/usr.bin/tar/configure.ac.in#4 integrate
.. //depot/projects/hammer/usr.bin/tar/fts.c#4 integrate
.. //depot/projects/hammer/usr.bin/tar/read.c#14 integrate
.. //depot/projects/hammer/usr.bin/tar/util.c#8 integrate
.. //depot/projects/hammer/usr.bin/tar/write.c#14 integrate
.. //depot/projects/hammer/usr.bin/top/machine.c#13 integrate
Differences ...
==== //depot/projects/hammer/UPDATING#75 (text+ko) ====
@@ -21,6 +21,12 @@
developers choose to disable these features on build machines
to maximize performance.
+20050415:
+ The NO_MIXED_MODE kernel option has been removed from the i386
+ amd64 platforms as its use has been superceded by the new local
+ APIC timer code. Any kernel config files containing this option
+ should be updated.
+
20050227:
The on-disk format of LC_CTYPE files was changed to be machine
independent. Please make sure NOT to use NO_CLEAN buildworld
@@ -325,4 +331,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.400 2005/03/03 08:44:33 imp Exp $
+$FreeBSD: src/UPDATING,v 1.401 2005/04/18 14:33:18 scottl Exp $
==== //depot/projects/hammer/bin/hostname/hostname.1#5 (text+ko) ====
@@ -27,9 +27,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)hostname.1 8.2 (Berkeley) 4/28/95
-.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.17 2005/01/10 08:39:22 imp Exp $
+.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.18 2005/04/17 23:22:22 keramida Exp $
.\"
-.Dd April 28, 1995
+.Dd April 18, 2005
.Dt HOSTNAME 1
.Os
.Sh NAME
@@ -46,7 +46,7 @@
The super-user can
set the hostname by supplying an argument; this is usually done in the
network initialization script
-.Pa /etc/rc.network ,
+.Pa /etc/rc.d/hostname ,
normally run at boot
time.
This script uses the
==== //depot/projects/hammer/etc/Makefile#38 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.341 2005/03/02 00:44:39 brooks Exp $
+# $FreeBSD: src/etc/Makefile,v 1.342 2005/04/17 10:47:57 glebius Exp $
.if !defined(NO_SENDMAIL)
SUBDIR= sendmail
@@ -13,8 +13,8 @@
mac.conf motd netconfig network.subr networks newsyslog.conf \
pf.conf pf.os phones profile protocols \
rc rc.bsdextended rc.firewall rc.firewall6 rc.sendmail rc.shutdown \
- rc.subr remote rpc services \
- shells sysctl.conf syslog.conf usbd.conf \
+ rc.subr remote rpc services shells \
+ snmpd.config sysctl.conf syslog.conf usbd.conf \
etc.${MACHINE_ARCH}/ttys \
${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
${.CURDIR}/../usr.bin/mail/misc/mail.rc \
==== //depot/projects/hammer/etc/defaults/rc.conf#53 (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.247 2005/04/12 15:21:51 thomas Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.248 2005/04/17 10:47:58 glebius Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -247,6 +247,12 @@
nis_yppasswdd_enable="NO" # Run rpc.yppasswdd at boot time (or NO).
nis_yppasswdd_flags="" # Flags to rpc.yppasswdd (if enabled).
+### SNMP daemon ###
+# Be sure to understand the security implications of running SNMP v1/v2
+# in your network.
+bsnmpd_enable="NO" # Run the SNMP daemon (or NO).
+bsnmpd_flags="" # Flags for bsnmpd.
+
### Network routing options: ###
defaultrouter="NO" # Set to default gateway (or NO).
static_routes="" # Set to static route list (or leave empty).
==== //depot/projects/hammer/etc/rc.d/Makefile#34 (text+ko) ====
@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.50 2005/03/13 08:07:11 dougb Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.51 2005/04/17 10:47:58 glebius Exp $
FILES= DAEMON LOGIN NETWORKING SERVERS \
abi accounting addswap adjkerntz amd \
apm apmd archdep atm1 atm2 atm3 \
- bgfsck bootparams \
+ bgfsck bootparams bsnmpd \
ccd cleanvar cleartmp cron \
devd devfs dhclient \
dmesg dumpon \
==== //depot/projects/hammer/kerberos5/Makefile.inc#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/kerberos5/Makefile.inc,v 1.24 2004/12/21 09:33:44 ru Exp $
+# $FreeBSD: src/kerberos5/Makefile.inc,v 1.25 2005/04/18 22:03:21 imp Exp $
NO_LINT=
@@ -48,4 +48,4 @@
.endfor
.endfor
-.endif defined(SRCS)
+.endif # defined(SRCS)
==== //depot/projects/hammer/lib/libarchive/Makefile#20 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.32 2005/03/29 05:24:08 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.33 2005/04/17 17:48:50 kientzle Exp $
#
# Use "make distfile" to build a conventional tar.gz archive
@@ -7,7 +7,7 @@
LIB= archive
-VERSION= 1.02.016
+VERSION= 1.02.017
ARCHIVE_API_FEATURE= 2
ARCHIVE_API_VERSION= 1
SHLIB_MAJOR= ${ARCHIVE_API_VERSION}
@@ -204,7 +204,7 @@
cat ${.CURDIR}/configure.ac.in | \
sed 's/@VERSION@/${VERSION}/' | \
cat > ${DIST_WORK_DIR}/configure.ac
- (cd ${DIST_WORK_DIR} && aclocal && autoheader && autoconf && automake -a --foreign)
+ (cd ${DIST_WORK_DIR} && aclocal19 && autoheader259 && autoconf259 && automake19 -a --foreign)
(cd ${DIST_WORK_DIR} && ./configure && make distcheck && make dist)
mv ${DIST_WORK_DIR}/${DISTFILE} ${.OBJDIR}
@echo ==================================================
==== //depot/projects/hammer/lib/libarchive/archive_read_extract.c#21 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.38 2005/03/29 05:24:08 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.39 2005/04/17 22:49:00 kientzle Exp $");
#include <sys/types.h>
#ifdef HAVE_SYS_ACL_H
@@ -482,9 +482,9 @@
return (ARCHIVE_WARN);
}
r = archive_read_data_into_fd(a, fd);
+ close(fd);
extract->pst = NULL; /* Cached stat data no longer valid. */
r2 = restore_metadata(a, entry, flags);
- close(fd);
return (err_combine(r, r2));
}
==== //depot/projects/hammer/lib/libc/gen/sysctl.3#8 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95
-.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.64 2005/01/20 09:17:02 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.65 2005/04/18 02:10:37 das Exp $
.\"
.Dd January 23, 2001
.Dt SYSCTL 3
@@ -436,14 +436,14 @@
with which the system
attempts to comply.
.It Li KERN_PROC
-Return the entire process table, or a subset of it.
-An array of pairs of
+Return selected information about specific running processes.
+.Pp
+For the following names, an array of pairs of
.Va struct proc
followed by corresponding
.Va struct eproc
structures is returned,
whose size depends on the current number of such objects in the system.
-The third and fourth level names are as follows:
.Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent
.It "Third level name Fourth level is:"
.It "KERN_PROC_ALL None"
@@ -459,9 +459,15 @@
follow each other.
The total size of array is returned.
It is also possible for a process to set its own process title this way.
+If the third level name is KERN_PROC_PATHNAME, the path of the
+process' text file is stored.
+For KERN_PROC_PATHNAME, a process ID of
+.Li -1
+implies the current process.
.Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent
.It Sy "Third level name Fourth level is:"
.It "KERN_PROC_ARGS A process ID"
+.It "KERN_PROC_PATHNAME A process ID"
.El
.It Li KERN_PROF
Return profiling information about the kernel.
==== //depot/projects/hammer/lib/libc/net/getnameinfo.c#4 (text+ko) ====
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.14 2003/05/01 19:03:14 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.16 2005/04/17 04:00:55 delphij Exp $");
#include <sys/types.h>
#include <sys/socket.h>
@@ -109,9 +109,6 @@
if (sa == NULL)
return EAI_FAIL;
- if (sa->sa_len != salen)
- return EAI_FAIL;
-
family = sa->sa_family;
for (i = 0; afdl[i].a_af; i++)
if (afdl[i].a_af == family) {
==== //depot/projects/hammer/lib/libc/net/getservbyname.c#3 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)getservbyname.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getservbyname.c,v 1.5 2005/04/15 18:09:39 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getservbyname.c,v 1.7 2005/04/18 18:34:58 ume Exp $");
#include <netdb.h>
#include <string.h>
@@ -49,8 +49,8 @@
int error;
#ifdef YP
- sed->getservbyname_yp = (char *)name;
- sed->getservbyproto_yp = (char *)proto;
+ sed->yp_name = (char *)name;
+ sed->yp_proto = (char *)proto;
#endif
setservent_r(sed->stayopen, sed);
@@ -69,8 +69,8 @@
endservent_r(sed);
#ifdef YP
- sed->getservbyname_yp = NULL;
- sed->getservbyproto_yp = NULL;
+ sed->yp_name = NULL;
+ sed->yp_proto = NULL;
#endif
return (error);
@@ -81,7 +81,7 @@
{
struct servdata *sd;
- if ((sd = _servdata_init()) == NULL)
+ if ((sd = __servdata_init()) == NULL)
return (NULL);
if (getservbyname_r(name, proto, &sd->serv, &sd->data) != 0)
return (NULL);
==== //depot/projects/hammer/lib/libc/net/getservbyport.c#3 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)getservbyport.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getservbyport.c,v 1.5 2005/04/15 18:09:39 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getservbyport.c,v 1.7 2005/04/18 18:34:58 ume Exp $");
#include <netdb.h>
#include <string.h>
@@ -48,8 +48,8 @@
int error;
#ifdef YP
- sed->getservbyport_yp = port;
- sed->getservbyproto_yp = (char *)proto;
+ sed->yp_port = port;
+ sed->yp_proto = (char *)proto;
#endif
setservent_r(sed->stayopen, sed);
@@ -63,8 +63,8 @@
endservent_r(sed);
#ifdef YP
- sed->getservbyport_yp = 0;
- sed->getservbyproto_yp = NULL;
+ sed->yp_port = 0;
+ sed->yp_proto = NULL;
#endif
return (error);
@@ -75,7 +75,7 @@
{
struct servdata *sd;
- if ((sd = _servdata_init()) == NULL)
+ if ((sd = __servdata_init()) == NULL)
return (NULL);
if (getservbyport_r(port, proto, &sd->serv, &sd->data) != 0)
return (NULL);
==== //depot/projects/hammer/lib/libc/net/getservent.c#5 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)getservent.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.14 2005/04/15 18:09:39 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.18 2005/04/18 18:34:58 ume Exp $");
#include <sys/types.h>
#include <sys/socket.h>
@@ -66,10 +66,10 @@
fclose(sed->fp);
sed->fp = NULL;
}
- if (sed->key) {
- free(sed->key);
- sed->key = NULL;
- }
+#ifdef YP
+ free(sed->yp_key);
+ sed->yp_key = NULL;
+#endif
}
static void
@@ -91,7 +91,7 @@
}
struct servdata *
-_servdata_init(void)
+__servdata_init(void)
{
struct servdata *sd;
@@ -119,11 +119,11 @@
char buf[YPMAXRECORD + 2];
int rv;
- snprintf(buf, sizeof(buf), "%d/%s",
- ntohs(sed->getservbyport_yp), sed->getservbyproto_yp);
+ snprintf(buf, sizeof(buf), "%d/%s", ntohs(sed->yp_port),
+ sed->yp_proto);
- sed->getservbyport_yp = 0;
- sed->getservbyproto_yp = NULL;
+ sed->yp_port = 0;
+ sed->yp_proto = NULL;
if (!sed->yp_domain) {
if (yp_get_default_domain(&sed->yp_domain))
@@ -168,11 +168,10 @@
return (0);
}
- snprintf(buf, sizeof(buf), "%s/%s", sed->getservbyname_yp,
- sed->getservbyproto_yp);
+ snprintf(buf, sizeof(buf), "%s/%s", sed->yp_name, sed->yp_proto);
- sed->getservbyname_yp = 0;
- sed->getservbyproto_yp = NULL;
+ sed->yp_name = 0;
+ sed->yp_proto = NULL;
if (yp_match(sed->yp_domain, "services.byname", buf, strlen(buf),
&result, &resultlen)) {
@@ -198,23 +197,23 @@
return (0);
}
- if (!sed->stepping_yp) {
- if (sed->key)
- free(sed->key);
- rv = yp_first(sed->yp_domain, "services.byname", &sed->key,
- &sed->keylen, &result, &resultlen);
+ if (!sed->yp_stepping) {
+ free(sed->yp_key);
+ rv = yp_first(sed->yp_domain, "services.byname", &sed->yp_key,
+ &sed->yp_keylen, &result, &resultlen);
if (rv) {
- sed->stepping_yp = 0;
+ sed->yp_stepping = 0;
return(0);
}
- sed->stepping_yp = 1;
+ sed->yp_stepping = 1;
} else {
- lastkey = sed->key;
- rv = yp_next(sed->yp_domain, "services.byname", sed->key,
- sed->keylen, &sed->key, &sed->keylen, &result, &resultlen);
+ lastkey = sed->yp_key;
+ rv = yp_next(sed->yp_domain, "services.byname", sed->yp_key,
+ sed->yp_keylen, &sed->yp_key, &sed->yp_keylen, &result,
+ &resultlen);
free(lastkey);
if (rv) {
- sed->stepping_yp = 0;
+ sed->yp_stepping = 0;
return (0);
}
}
@@ -243,8 +242,10 @@
{
servent_data_clear(sed);
sed->stayopen = 0;
- sed->stepping_yp = 0;
+#ifdef YP
+ sed->yp_stepping = 0;
sed->yp_domain = NULL;
+#endif
}
int
@@ -255,7 +256,7 @@
long l;
#ifdef YP
- if (sed->stepping_yp && _getservent_yp(sed)) {
+ if (sed->yp_stepping && _getservent_yp(sed)) {
p = sed->line;
goto unpack;
}
@@ -268,11 +269,11 @@
return (-1);
#ifdef YP
if (*p == '+' && _yp_check(NULL)) {
- if (sed->getservbyname_yp != NULL) {
+ if (sed->yp_name != NULL) {
if (!_getservbyname_yp(sed))
goto tryagain;
}
- else if (sed->getservbyport_yp != 0) {
+ else if (sed->yp_port != 0) {
if (!_getservbyport_yp(sed))
goto tryagain;
}
@@ -326,7 +327,7 @@
{
struct servdata *sd;
- if ((sd = _servdata_init()) == NULL)
+ if ((sd = __servdata_init()) == NULL)
return;
setservent_r(f, &sd->data);
}
@@ -336,7 +337,7 @@
{
struct servdata *sd;
- if ((sd = _servdata_init()) == NULL)
+ if ((sd = __servdata_init()) == NULL)
return;
endservent_r(&sd->data);
}
@@ -346,7 +347,7 @@
{
struct servdata *sd;
- if ((sd = _servdata_init()) == NULL)
+ if ((sd = __servdata_init()) == NULL)
return (NULL);
if (getservent_r(&sd->serv, &sd->data) != 0)
return (NULL);
==== //depot/projects/hammer/lib/libc/net/netdb_private.h#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/lib/libc/net/netdb_private.h,v 1.1 2005/04/15 18:09:39 ume Exp $
+ * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.3 2005/04/18 18:34:58 ume Exp $
*/
#ifndef _NETDB_PRIVATE_H_
@@ -38,13 +38,13 @@
int stayopen;
char line[BUFSIZ + 1];
#ifdef YP
- int stepping_yp;
- char *getservbyname_yp;
- char *getservbyproto_yp;
- int getservbyport_yp;
+ int yp_stepping;
+ char *yp_name;
+ char *yp_proto;
+ int yp_port;
char *yp_domain;
- char *key;
- int keylen;
+ char *yp_key;
+ int yp_keylen;
#endif
};
@@ -53,13 +53,13 @@
struct servent_data data;
};
-#define endservent_r _endservent_r
-#define getservbyname_r _getservbyname_r
-#define getservbyport_r _getservbyport_r
-#define getservent_r _getservent_r
-#define setservent_r _setservent_r
+#define endservent_r __endservent_r
+#define getservbyname_r __getservbyname_r
+#define getservbyport_r __getservbyport_r
+#define getservent_r __getservent_r
+#define setservent_r __setservent_r
-struct servdata *_servdata_init(void);
+struct servdata *__servdata_init(void);
void endservent_r(struct servent_data *);
int getservbyname_r(const char *, const char *, struct servent *,
struct servent_data *);
==== //depot/projects/hammer/lib/libc/stdio/vfprintf.c#17 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.68 2004/08/26 06:25:28 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.69 2005/04/16 22:36:51 das Exp $");
/*
* Actual printf innards.
@@ -1093,16 +1093,22 @@
* ``The result of converting a zero value with an
* explicit precision of zero is no characters.''
* -- ANSI X3J11
+ *
+ * ``The C Standard is clear enough as is. The call
+ * printf("%#.0o", 0) should print 0.''
+ * -- Defect Report #151
*/
cp = buf + BUF;
if (flags & INTMAX_SIZE) {
- if (ujval != 0 || prec != 0)
+ if (ujval != 0 || prec != 0 ||
+ (flags & ALT && base == 8))
cp = __ujtoa(ujval, cp, base,
flags & ALT, xdigs,
flags & GROUPING, thousands_sep,
grouping);
} else {
- if (ulval != 0 || prec != 0)
+ if (ulval != 0 || prec != 0 ||
+ (flags & ALT && base == 8))
cp = __ultoa(ulval, cp, base,
flags & ALT, xdigs,
flags & GROUPING, thousands_sep,
==== //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#16 (text+ko) ====
@@ -40,7 +40,7 @@
#endif /* LIBC_SCCS and not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.23 2004/08/26 06:25:28 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.24 2005/04/16 22:36:51 das Exp $");
/*
* Actual wprintf innards.
@@ -1092,16 +1092,22 @@
* ``The result of converting a zero value with an
* explicit precision of zero is no characters.''
* -- ANSI X3J11
+ *
+ * ``The C Standard is clear enough as is. The call
+ * printf("%#.0o", 0) should print 0.''
+ * -- Defect Report #151
*/
cp = buf + BUF;
if (flags & INTMAX_SIZE) {
- if (ujval != 0 || prec != 0)
+ if (ujval != 0 || prec != 0 ||
+ (flags & ALT && base == 8))
cp = __ujtoa(ujval, cp, base,
flags & ALT, xdigs,
flags & GROUPING, thousands_sep,
grouping);
} else {
- if (ulval != 0 || prec != 0)
+ if (ulval != 0 || prec != 0 ||
+ (flags & ALT && base == 8))
cp = __ultoa(ulval, cp, base,
flags & ALT, xdigs,
flags & GROUPING, thousands_sep,
==== //depot/projects/hammer/lib/libugidfw/libugidfw.3#5 (text+ko) ====
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libugidfw/libugidfw.3,v 1.6 2004/07/02 23:52:19 ru Exp $
+.\" $FreeBSD: src/lib/libugidfw/libugidfw.3,v 1.7 2005/04/16 11:32:46 rwatson Exp $
.\"
.Dd February 25, 2004
.Os
@@ -39,6 +39,8 @@
.Sh LIBRARY
.Lb libugidfw
.Sh SYNOPSIS
+.In sys/types.h
+.In security/mac_bsdextended/mac_bsdextended.h
.In ugidfw.h
.Sh DESCRIPTION
The
==== //depot/projects/hammer/lib/libugidfw/ugidfw.c#9 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2002, 2004 Networks Associates Technology, Inc.
+ * Copyright (c) 2002-2005 Networks Associates Technology, Inc.
* All rights reserved.
*
* This software was developed for the FreeBSD Project by Network Associates
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.8 2005/03/28 09:37:44 pjd Exp $
+ * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.9 2005/04/16 11:58:55 rwatson Exp $
*/
#include <sys/param.h>
#include <sys/errno.h>
@@ -341,13 +341,19 @@
len = snprintf(errstr, buflen, "uid short");
return (-1);
}
- value = strtol(argv[current+1], &endp, 10);
- if (*endp != '\0') {
- len = snprintf(errstr, buflen, "invalid uid: '%s'",
- argv[current+1]);
- return (-1);
+ pwd = getpwnam(argv[current+1]);
+ if (pwd != NULL)
+ uid = pwd->pw_uid;
+ else {
+ value = strtol(argv[current+1], &endp, 10);
+ if (*endp != '\0') {
+ len = snprintf(errstr, buflen,
+ "invalid uid: '%s'",
+ argv[current+1]);
+ return (-1);
+ }
+ uid = value;
}
- uid = value;
uid_seen = 1;
current += 2;
} else if (strcmp("gid", argv[current]) == 0) {
@@ -360,13 +366,19 @@
len = snprintf(errstr, buflen, "gid short");
return (-1);
}
- value = strtol(argv[current+1], &endp, 10);
- if (*endp != '\0') {
- len = snprintf(errstr, buflen, "invalid gid: '%s'",
- argv[current+1]);
- return (-1);
+ grp = getgrnam(argv[current+1]);
+ if (grp != NULL)
+ gid = grp->gr_gid;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list