PERFORCE change 168570 for review
Alexander Motin
mav at FreeBSD.org
Tue Sep 15 17:44:06 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=168570
Change 168570 by mav at mav_mavbook on 2009/09/15 17:43:45
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/Makefile.inc1#7 integrate
.. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#15 integrate
.. //depot/projects/scottl-camlock/src/UPDATING#16 integrate
.. //depot/projects/scottl-camlock/src/bin/setfacl/mask.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/setfacl/merge.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/setfacl/remove.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.1#3 integrate
.. //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/setfacl/setfacl.h#2 integrate
.. //depot/projects/scottl-camlock/src/cddl/compat/opensolaris/include/assert.h#1 branch
.. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate
.. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/head/assert.h#2 delete
.. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/gdtoa/gdtoaimp.h#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/gdtoa/misc.c#2 integrate
.. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#7 integrate
.. //depot/projects/scottl-camlock/src/etc/network.subr#7 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#8 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/NETWORKING#5 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/addswap#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/auto_linklocal#3 delete
.. //depot/projects/scottl-camlock/src/etc/rc.d/defaultroute#2 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/devd#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/faith#1 branch
.. //depot/projects/scottl-camlock/src/etc/rc.d/ip6addrctl#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/mroute6d#2 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/netif#6 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/netoptions#4 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/network_ipv6#3 delete
.. //depot/projects/scottl-camlock/src/etc/rc.d/ppp#4 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/route6d#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/routed#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/routing#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/rtadvd#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/stf#1 branch
.. //depot/projects/scottl-camlock/src/etc/rc.d/sysctl#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.subr#4 integrate
.. //depot/projects/scottl-camlock/src/lib/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read.c#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_compat_zip.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isojoliet_bz2.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/test/test_read_format_isorr_bz2.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/Versions.def#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/getifaddrs.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdio/fopen.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdtime/localtime.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libkvm/kvm_proc.c#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libradius/libradius.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libradius/radlib.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libradius/radlib.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libradius/radlib_private.h#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libstand/net.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libstand/nfs.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libstand/rpc.c#3 integrate
.. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate
.. //depot/projects/scottl-camlock/src/release/picobsd/bridge/crunch.conf#3 integrate
.. //depot/projects/scottl-camlock/src/release/scripts/package-split.py#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/mirror/gmirror.8#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/Makefile#6 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/af_inet6.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/af_nd6.c#1 branch
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#7 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifgif.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/mount/mount.8#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/mount/mount.c#5 integrate
.. //depot/projects/scottl-camlock/src/share/examples/scsi_target/scsi_target.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/examples/scsi_target/scsi_target.h#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#11 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/dpms.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man4/ed.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/inet6.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ips.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/man4.i386/dpms.4#2 delete
.. //depot/projects/scottl-camlock/src/share/man/man4/syscons.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/textdump.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/device.hints.5#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#6 integrate
.. //depot/projects/scottl-camlock/src/share/monetdef/zh_CN.GB18030.src#2 integrate
.. //depot/projects/scottl-camlock/src/share/monetdef/zh_CN.GB2312.src#2 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/asia#6 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/australasia#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/msi.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#19 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/_align.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/amd64/include/param.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_proto.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/_align.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/include/param.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/pxe.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/Makefile.inc#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#103 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/proc.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/vfs.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#23 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_proto.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#35 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#46 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#22 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.i386#22 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#32 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options.amd64#11 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpica_prep.sh#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/changes.txt#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtable.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#8 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asldefine.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslfiles.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslglobal.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslload.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllookup.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslmain.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslmap.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslstubs.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltypes.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evgpe.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exfield.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exutils.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acconfig.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acdebug.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/achware.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acinterp.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acmacros.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acobject.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acparser.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpredef.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actbl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actbl1.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actbl2.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actypes.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/amlcode.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psloop.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psxface.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utids.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/x86emu/x86emu.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/x86emu/x86emu.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/x86emu/x86emu_regs.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/contrib/x86emu/x86emu_util.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_acpi.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ae/if_ae.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_i810.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#62 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/amdtemp/amdtemp.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/asmc/asmc.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/asmc/asmcvar.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acerlabs.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ah_osdep.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dpms/dpms.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_pciids.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/r600_blit.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ep/if_epreg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/s3_pci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vga.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwcrom.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwdev.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hptiop/hptiop.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ichwd/ichwd.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iir/iir.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_user.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pcireg.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pcivar.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/daemon/daemon_saver.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scterm-teken.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scvesactl.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rumreg.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wi/if_wi.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/fifofs/fifo_vnops.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_conv.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clnode.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clport.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vncache.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_dev.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_vfs.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/acpica/acpi_machdep.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#23 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/cpufreq/hwpstate.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/msi.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#34 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/ibcs2/ibcs2_proto.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/_align.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/i386/include/param.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/pc/vesa.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/i386/include/specialreg.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/xen/xen-os.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/isa/dpms.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/i386/isa/vesa.c#10 delete
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_proto.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/locore.s#3 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/_align.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/ia64/include/param.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_exec.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_linker.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_shutdown.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_timeout.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sys_generic.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sys_pipe.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_mqueue.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_aio.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/_align.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/mips/include/param.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#35 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/acpi/acpi/Makefile#13 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/dpms/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/dtrace/lockstat/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/vesa/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/x86emu/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/net/bpf.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/net/route.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_action.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_mcast.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in_pcb.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6_proto.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_nbr.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_rtr.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/netsmb/smb_dev.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_node.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_serv.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/include/_align.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/pc98/include/pc/vesa.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/pci/intpm.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/intpmreg.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#22 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/_align.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/param.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/security/audit/audit_bsm_token.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/_align.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/param.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/ofw_pci.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psycho.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizo.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/jbusppm.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/_align.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/param.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/_sockaddr_storage.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/sys/bus.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/imgact_aout.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/param.h#31 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/socket.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/syscallsubr.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#20 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken_demo.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken_subr.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken_subr_compat.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_acl.c#6 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/acltools/00.t#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/acltools/01.t#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/acltools/tools-nfs4.test#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/acltools/tools-posix.test#4 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/fstest/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/fstest/fstest.c#4 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/chmod/12.t#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/granular/00.t#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/granular/01.t#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/granular/02.t#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/granular/03.t#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/granular/04.t#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/granular/05.t#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/tar/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/unzip/unzip.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/unzip/unzip.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/w/pr_time.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidb/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/btxld/btxld.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ndp/ndp.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ndp/ndp.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rtsold/if.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rtsold/rtsold.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rtsold/rtsold.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rtsold/rtsold.h#3 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/Makefile.inc1#7 (text+ko) ====
@@ -1,11 +1,11 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.628 2009/07/14 21:19:13 kan Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.629 2009/09/10 07:37:36 des Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
# -DNO_CLEAN do not clean at all
# -DNO_SHARE do not go into share subdir
-# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELCONFIG
+# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELDEPEND
# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
# -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
# -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#15 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.208 2009/09/03 16:34:20 remko Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.209 2009/09/10 21:42:00 delphij 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,9 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20090909: vesa and dpms promoted to be i386/amd64 common
+OLD_FILES+=usr/include/machine/pc/vesa.h
+OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz
# 20090904: remove lukemftpd
OLD_FILES+=usr/libexec/lukemftpd
OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz
==== //depot/projects/scottl-camlock/src/UPDATING#16 (text+ko) ====
@@ -22,6 +22,10 @@
machines to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20090910:
+ ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for
+ mount(8) and -a option for df(1) to see them.
+
20090825:
The old tunable hw.bus.devctl_disable has been superseded by
hw.bus.devctl_queue. hw.bus.devctl_disable=1 in loader.conf should be
@@ -971,4 +975,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.638 2009/09/05 08:09:35 imp Exp $
+$FreeBSD: src/UPDATING,v 1.639 2009/09/14 21:10:40 pjd Exp $
==== //depot/projects/scottl-camlock/src/bin/setfacl/mask.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/setfacl/mask.c,v 1.8 2005/01/10 08:39:25 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/setfacl/mask.c,v 1.9 2009/09/07 16:19:32 trasz Exp $");
#include <sys/types.h>
#include <sys/acl.h>
@@ -40,7 +40,7 @@
/* set the appropriate mask the given ACL's */
int
-set_acl_mask(acl_t *prev_acl)
+set_acl_mask(acl_t *prev_acl, const char *filename)
{
acl_entry_t entry;
acl_t acl;
@@ -59,7 +59,7 @@
acl = acl_dup(*prev_acl);
if (acl == NULL)
- err(1, "acl_dup() failed");
+ err(1, "%s: acl_dup() failed", filename);
if (n_flag == 0) {
/*
@@ -70,7 +70,7 @@
* class in the resulting ACL
*/
if (acl_calc_mask(&acl)) {
- warn("acl_calc_mask() failed");
+ warn("%s: acl_calc_mask() failed", filename);
acl_free(acl);
return (-1);
}
@@ -86,7 +86,8 @@
while (acl_get_entry(acl, entry_id, &entry) == 1) {
entry_id = ACL_NEXT_ENTRY;
if (acl_get_tag_type(entry, &tag) == -1)
- err(1, "acl_get_tag_type() failed");
+ err(1, "%s: acl_get_tag_type() failed",
+ filename);
if (tag == ACL_MASK) {
acl_free(acl);
@@ -100,7 +101,7 @@
* file, then write an error message to standard error and
* continue with the next file.
*/
- warnx("warning: no mask entry");
+ warnx("%s: warning: no mask entry", filename);
acl_free(acl);
return (0);
}
==== //depot/projects/scottl-camlock/src/bin/setfacl/merge.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.8 2005/01/10 08:39:25 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.9 2009/09/07 16:19:32 trasz Exp $");
#include <sys/types.h>
#include <sys/acl.h>
@@ -36,12 +36,15 @@
#include "setfacl.h"
-static int merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new);
+static int merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new,
+ int acl_brand);
static int
-merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new)
+merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new, int acl_brand)
{
acl_permset_t permset;
+ acl_entry_type_t entry_type;
+ acl_flagset_t flagset;
int have_entry;
uid_t *id, *id_new;
@@ -59,6 +62,18 @@
err(1, "acl_get_permset() failed");
if (acl_set_permset(*entry_new, permset) == -1)
err(1, "acl_set_permset() failed");
+
+ if (acl_brand == ACL_BRAND_NFS4) {
+ if (acl_get_entry_type_np(*entry, &entry_type))
+ err(1, "acl_get_entry_type_np() failed");
+ if (acl_set_entry_type_np(*entry_new, entry_type))
+ err(1, "acl_set_entry_type_np() failed");
+ if (acl_get_flagset_np(*entry, &flagset))
+ err(1, "acl_get_flagset_np() failed");
+ if (acl_set_flagset_np(*entry_new, flagset))
+ err(1, "acl_set_flagset_np() failed");
+ }
+
have_entry = 1;
}
acl_free(id);
@@ -71,20 +86,31 @@
* merge an ACL into existing file's ACL
*/
int
-merge_acl(acl_t acl, acl_t *prev_acl)
+merge_acl(acl_t acl, acl_t *prev_acl, const char *filename)
{
acl_entry_t entry, entry_new;
acl_permset_t permset;
acl_t acl_new;
acl_tag_t tag, tag_new;
- int entry_id, entry_id_new, have_entry;
+ acl_entry_type_t entry_type, entry_type_new;
+ acl_flagset_t flagset;
+ int entry_id, entry_id_new, have_entry, entry_number = 0;
+ int acl_brand, prev_acl_brand;
+
+ acl_get_brand_np(acl, &acl_brand);
+ acl_get_brand_np(*prev_acl, &prev_acl_brand);
+
+ if (acl_brand != prev_acl_brand) {
+ warnx("%s: branding mismatch; existing ACL is %s, "
+ "entry to be merged is %s", filename,
+ prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e",
+ acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e");
+ return (-1);
+ }
- if (acl_type == ACL_TYPE_ACCESS)
- acl_new = acl_dup(prev_acl[ACCESS_ACL]);
- else
- acl_new = acl_dup(prev_acl[DEFAULT_ACL]);
+ acl_new = acl_dup(*prev_acl);
if (acl_new == NULL)
- err(1, "acl_dup() failed");
+ err(1, "%s: acl_dup() failed", filename);
entry_id = ACL_FIRST_ENTRY;
@@ -94,28 +120,45 @@
/* keep track of existing ACL_MASK entries */
if (acl_get_tag_type(entry, &tag) == -1)
- err(1, "acl_get_tag_type() failed - invalid ACL entry");
+ err(1, "%s: acl_get_tag_type() failed - "
+ "invalid ACL entry", filename);
if (tag == ACL_MASK)
have_mask = 1;
/* check against the existing ACL entries */
entry_id_new = ACL_FIRST_ENTRY;
- while (have_entry == 0 &&
- acl_get_entry(acl_new, entry_id_new, &entry_new) == 1) {
+ while (acl_get_entry(acl_new, entry_id_new, &entry_new) == 1) {
entry_id_new = ACL_NEXT_ENTRY;
if (acl_get_tag_type(entry, &tag) == -1)
- err(1, "acl_get_tag_type() failed");
+ err(1, "%s: acl_get_tag_type() failed",
+ filename);
if (acl_get_tag_type(entry_new, &tag_new) == -1)
- err(1, "acl_get_tag_type() failed");
+ err(1, "%s: acl_get_tag_type() failed",
+ filename);
if (tag != tag_new)
continue;
+ /*
+ * For NFSv4, in addition to "tag" and "id" we also
+ * compare "entry_type".
+ */
+ if (acl_brand == ACL_BRAND_NFS4) {
+ if (acl_get_entry_type_np(entry, &entry_type))
+ err(1, "%s: acl_get_entry_type_np() "
+ "failed", filename);
+ if (acl_get_entry_type_np(entry_new, &entry_type_new))
+ err(1, "%s: acl_get_entry_type_np() "
+ "failed", filename);
+ if (entry_type != entry_type_new)
+ continue;
+ }
+
switch(tag) {
case ACL_USER:
case ACL_GROUP:
have_entry = merge_user_group(&entry,
- &entry_new);
+ &entry_new, acl_brand);
if (have_entry == 0)
break;
/* FALLTHROUGH */
@@ -123,37 +166,127 @@
case ACL_GROUP_OBJ:
case ACL_OTHER:
case ACL_MASK:
+ case ACL_EVERYONE:
if (acl_get_permset(entry, &permset) == -1)
- err(1, "acl_get_permset() failed");
+ err(1, "%s: acl_get_permset() failed",
+ filename);
if (acl_set_permset(entry_new, permset) == -1)
- err(1, "acl_set_permset() failed");
+ err(1, "%s: acl_set_permset() failed",
+ filename);
+
+ if (acl_brand == ACL_BRAND_NFS4) {
+ if (acl_get_entry_type_np(entry, &entry_type))
+ err(1, "%s: acl_get_entry_type_np() failed",
+ filename);
+ if (acl_set_entry_type_np(entry_new, entry_type))
+ err(1, "%s: acl_set_entry_type_np() failed",
+ filename);
+ if (acl_get_flagset_np(entry, &flagset))
+ err(1, "%s: acl_get_flagset_np() failed",
+ filename);
+ if (acl_set_flagset_np(entry_new, flagset))
+ err(1, "%s: acl_set_flagset_np() failed",
+ filename);
+ }
have_entry = 1;
break;
default:
/* should never be here */
- errx(1, "Invalid tag type: %i", tag);
+ errx(1, "%s: invalid tag type: %i", filename, tag);
break;
}
}
/* if this entry has not been found, it must be new */
if (have_entry == 0) {
- if (acl_create_entry(&acl_new, &entry_new) == -1) {
- acl_free(acl_new);
- return (-1);
+
+ /*
+ * NFSv4 ACL entries must be prepended to the ACL.
+ * Appending them at the end makes no sense, since
+ * in most cases they wouldn't even get evaluated.
+ */
+ if (acl_brand == ACL_BRAND_NFS4) {
+ if (acl_create_entry_np(&acl_new, &entry_new, entry_number) == -1) {
+ warn("%s: acl_create_entry_np() failed", filename);
+ acl_free(acl_new);
+ return (-1);
+ }
+ /*
+ * Without this increment, adding several
+ * entries at once, for example
+ * "setfacl -m user:1:r:allow,user:2:r:allow",
+ * would make them appear in reverse order.
+ */
+ entry_number++;
+ } else {
+ if (acl_create_entry(&acl_new, &entry_new) == -1) {
+ warn("%s: acl_create_entry() failed", filename);
+ acl_free(acl_new);
+ return (-1);
+ }
}
if (acl_copy_entry(entry_new, entry) == -1)
- err(1, "acl_copy_entry() failed");
+ err(1, "%s: acl_copy_entry() failed", filename);
}
}
- if (acl_type == ACL_TYPE_ACCESS) {
- acl_free(prev_acl[ACCESS_ACL]);
- prev_acl[ACCESS_ACL] = acl_new;
- } else {
- acl_free(prev_acl[DEFAULT_ACL]);
- prev_acl[DEFAULT_ACL] = acl_new;
+ acl_free(*prev_acl);
+ *prev_acl = acl_new;
+
+ return (0);
+}
+
+int
+add_acl(acl_t acl, uint entry_number, acl_t *prev_acl, const char *filename)
+{
+ acl_entry_t entry, entry_new;
+ acl_t acl_new;
+ int entry_id, acl_brand, prev_acl_brand;
+
+ acl_get_brand_np(acl, &acl_brand);
+ acl_get_brand_np(*prev_acl, &prev_acl_brand);
+
+ if (prev_acl_brand != ACL_BRAND_NFS4) {
+ warnx("%s: the '-a' option is only applicable to NFSv4 ACLs",
+ filename);
+ return (-1);
+ }
+
+ if (acl_brand != ACL_BRAND_NFS4) {
+ warnx("%s: branding mismatch; existing ACL is NFSv4, "
+ "entry to be added is POSIX.1e", filename);
+ return (-1);
+ }
+
+ acl_new = acl_dup(*prev_acl);
+ if (acl_new == NULL)
+ err(1, "%s: acl_dup() failed", filename);
+
+ entry_id = ACL_FIRST_ENTRY;
+
+ while (acl_get_entry(acl, entry_id, &entry) == 1) {
+ entry_id = ACL_NEXT_ENTRY;
+
+ if (acl_create_entry_np(&acl_new, &entry_new, entry_number) == -1) {
+ warn("%s: acl_create_entry_np() failed", filename);
+ acl_free(acl_new);
+ return (-1);
+ }
+
+ /*
+ * Without this increment, adding several
+ * entries at once, for example
+ * "setfacl -m user:1:r:allow,user:2:r:allow",
+ * would make them appear in reverse order.
+ */
+ entry_number++;
+
+ if (acl_copy_entry(entry_new, entry) == -1)
+ err(1, "%s: acl_copy_entry() failed", filename);
}
+ acl_free(*prev_acl);
+ *prev_acl = acl_new;
+
return (0);
}
==== //depot/projects/scottl-camlock/src/bin/setfacl/remove.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.6 2005/01/10 08:39:25 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.7 2009/09/07 16:19:32 trasz Exp $");
#include <sys/types.h>
#include <sys/acl.h>
@@ -41,21 +41,31 @@
* remove ACL entries from an ACL
*/
int
-remove_acl(acl_t acl, acl_t *prev_acl)
+remove_acl(acl_t acl, acl_t *prev_acl, const char *filename)
{
acl_entry_t entry;
acl_t acl_new;
acl_tag_t tag;
- int carried_error, entry_id;
+ int carried_error, entry_id, acl_brand, prev_acl_brand;
+
+ carried_error = 0;
+
+ acl_get_brand_np(acl, &acl_brand);
+ acl_get_brand_np(*prev_acl, &prev_acl_brand);
+
+ if (acl_brand != prev_acl_brand) {
+ warnx("%s: branding mismatch; existing ACL is %s, "
+ "entry to be removed is %s", filename,
+ prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e",
+ acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e");
+ return (-1);
+ }
carried_error = 0;
- if (acl_type == ACL_TYPE_ACCESS)
- acl_new = acl_dup(prev_acl[ACCESS_ACL]);
- else
- acl_new = acl_dup(prev_acl[DEFAULT_ACL]);
+ acl_new = acl_dup(*prev_acl);
if (acl_new == NULL)
- err(1, "acl_dup() failed");
+ err(1, "%s: acl_dup() failed", filename);
tag = ACL_UNDEFINED_TAG;
@@ -64,23 +74,68 @@
while (acl_get_entry(acl, entry_id, &entry) == 1) {
entry_id = ACL_NEXT_ENTRY;
if (acl_get_tag_type(entry, &tag) == -1)
- err(1, "acl_get_tag_type() failed");
+ err(1, "%s: acl_get_tag_type() failed", filename);
if (tag == ACL_MASK)
have_mask++;
if (acl_delete_entry(acl_new, entry) == -1) {
carried_error++;
- warnx("cannot remove non-existent acl entry");
+ warnx("%s: cannot remove non-existent ACL entry",
+ filename);
}
}
- if (acl_type == ACL_TYPE_ACCESS) {
- acl_free(prev_acl[ACCESS_ACL]);
- prev_acl[ACCESS_ACL] = acl_new;
- } else {
- acl_free(prev_acl[DEFAULT_ACL]);
- prev_acl[DEFAULT_ACL] = acl_new;
+ acl_free(*prev_acl);
+ *prev_acl = acl_new;
+
+ if (carried_error)
+ return (-1);
+
+ return (0);
+}
+
+int
+remove_by_number(uint entry_number, acl_t *prev_acl, const char *filename)
+{
+ acl_entry_t entry;
+ acl_t acl_new;
+ acl_tag_t tag;
+ int carried_error, entry_id;
+ uint i;
+
+ carried_error = 0;
+
+ acl_new = acl_dup(*prev_acl);
+ if (acl_new == NULL)
+ err(1, "%s: acl_dup() failed", filename);
+
+ tag = ACL_UNDEFINED_TAG;
+
+ /*
+ * Find out whether we're removing the mask entry,
+ * to behave the same as the routine above.
+ *
+ * XXX: Is this loop actually needed?
+ */
+ entry_id = ACL_FIRST_ENTRY;
+ i = 0;
+ while (acl_get_entry(acl_new, entry_id, &entry) == 1) {
+ entry_id = ACL_NEXT_ENTRY;
+ if (i != entry_number)
+ continue;
+ if (acl_get_tag_type(entry, &tag) == -1)
+ err(1, "%s: acl_get_tag_type() failed", filename);
+ if (tag == ACL_MASK)
+ have_mask++;
+ }
+
+ if (acl_delete_entry_np(acl_new, entry_number) == -1) {
+ carried_error++;
+ warn("%s: acl_delete_entry_np() failed", filename);
}
+ acl_free(*prev_acl);
+ *prev_acl = acl_new;
+
if (carried_error)
return (-1);
@@ -91,18 +146,14 @@
* remove default entries
*/
int
-remove_default(acl_t *prev_acl)
+remove_default(acl_t *prev_acl, const char *filename)
{
- if (prev_acl[1]) {
- acl_free(prev_acl[1]);
- prev_acl[1] = acl_init(ACL_MAX_ENTRIES);
- if (prev_acl[1] == NULL)
- err(1, "acl_init() failed");
- } else {
- warn("cannot remove default ACL");
- return (-1);
- }
+ acl_free(*prev_acl);
+ *prev_acl = acl_init(ACL_MAX_ENTRIES);
+ if (*prev_acl == NULL)
+ err(1, "%s: acl_init() failed", filename);
+
return (0);
}
@@ -110,71 +161,14 @@
* remove extended entries
*/
void
-remove_ext(acl_t *prev_acl)
+remove_ext(acl_t *prev_acl, const char *filename)
{
- acl_t acl_new, acl_old;
- acl_entry_t entry, entry_new;
- acl_permset_t perm;
- acl_tag_t tag;
- int entry_id, have_mask_entry;
+ acl_t acl_new;
- if (acl_type == ACL_TYPE_ACCESS)
- acl_old = acl_dup(prev_acl[ACCESS_ACL]);
- else
- acl_old = acl_dup(prev_acl[DEFAULT_ACL]);
- if (acl_old == NULL)
- err(1, "acl_dup() failed");
-
- have_mask_entry = 0;
- acl_new = acl_init(ACL_MAX_ENTRIES);
+ acl_new = acl_strip_np(*prev_acl, !n_flag);
if (acl_new == NULL)
- err(1, "acl_init() failed");
- tag = ACL_UNDEFINED_TAG;
+ err(1, "%s: acl_strip_np() failed", filename);
- /* only save the default user/group/other entries */
- entry_id = ACL_FIRST_ENTRY;
- while (acl_get_entry(acl_old, entry_id, &entry) == 1) {
- entry_id = ACL_NEXT_ENTRY;
-
- if (acl_get_tag_type(entry, &tag) == -1)
- err(1, "acl_get_tag_type() failed");
-
- switch(tag) {
- case ACL_USER_OBJ:
- case ACL_GROUP_OBJ:
- case ACL_OTHER:
- if (acl_get_tag_type(entry, &tag) == -1)
- err(1, "acl_get_tag_type() failed");
- if (acl_get_permset(entry, &perm) == -1)
- err(1, "acl_get_permset() failed");
- if (acl_create_entry(&acl_new, &entry_new) == -1)
- err(1, "acl_create_entry() failed");
- if (acl_set_tag_type(entry_new, tag) == -1)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list