Date: Tue, 5 May 2009 19:39:00 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 161636 for review Message-ID: <200905051939.n45Jd0UY011991@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=161636 Change 161636 by trasz@trasz_victim on 2009/05/05 19:38:30 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/rm/rm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/.cvsignore#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/ChangeLog#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/animation#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/audio#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/cafebabe#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/compress#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/elf#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/epoc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/filesystems#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/graphviz#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/images#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/jpeg#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/mach#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/macintosh#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/msdos#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/perl#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/printer#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/timezone#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/wireless#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/xwindows#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Makefile.am#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Makefile.am-src#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/README#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/TODO#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/apprentice.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/apptype.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/ascmagic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/asprintf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/cdf.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/cdf.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/cdf_time.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/compress.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/config.h.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/configure#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/configure.ac#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/encoding.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/file.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/file.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/file.man#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/file_opts.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/fsmagic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/funcs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/getopt_long.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/is_tar.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/libmagic.man#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/magic.man#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/patchlevel.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/print.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/readcdf.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/readelf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/softmagic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/file/vasprintf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/jail#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/arm/string/strncmp.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Symbol.map#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/sourcefilter.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/ptsname.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/Symbol.map#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/jail.2#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libmagic/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libmagic/config.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/journal/gjournal.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/iflagg.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/newfs/newfs.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/tunefs/tunefs.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/geom_fox.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/isp.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mpt.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ng_hole.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/u3g.4#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/bsd-family-tree#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-src.dot#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/africa#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/identcpu.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/local_apic.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/mp_machdep.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/apicvar.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/clock.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/smp.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/specialreg.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/devicename.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/disk.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/libuboot.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_misc.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscall.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscalls.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/syscalls.master#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_futex.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_futex.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#30 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#37 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kern.post.mk#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-pci.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-queue.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-sata.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-ahci.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bwi/bitops.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bwi/bwimac.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bwi/bwimac.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bwi/bwiphy.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bwi/bwiphy.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bwi/bwirf.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bwi/bwirf.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bwi/if_bwi.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bwi/if_bwi_pci.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bwi/if_bwireg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bwi/if_bwivar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/creator.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndisvar.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwn.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwnvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ohci.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uhci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_aue.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cue.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_kue.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_rue.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_udav.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/ustorage_fs.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_compat_linux.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_core.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_device.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_device.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_generic.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hub.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_revision.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_transfer.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rum.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rumvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_uath.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_uathvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_ural.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_uralvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_zydreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/usb_wlan.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wi/if_wi.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wi/if_wivar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wpi/if_wpi.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonkrpc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonport.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonsubs.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_var.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfscl.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfsclstate.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfsdport.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfskpiport.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfsm_subs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfsport.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfsproto.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfsrvcache.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfsrvstate.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfsv4_errstr.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/rpcv2.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/xdr_subs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clbio.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clcomsubs.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clkrpc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_cllock.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clnfsiod.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clnode.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clport.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clrpcops.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clstate.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clsubs.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clvfsops.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clvnops.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_lock.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfsargs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfsdiskless.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfsmount.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfsnode.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nlminfo.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdcache.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdkrpc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdport.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdserv.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdsocket.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdstate.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdsubs.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_var.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/bios/apm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/local_apic.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/mp_machdep.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/clock.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/smp.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/specialreg.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/clock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_sysvec.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/clock.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/mp_machdep.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/isa/atrtc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/isa/rtc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_main.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_sysent.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_cpuset.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_fork.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_linker.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mib.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_osd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sysctl.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_vimage.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_ule.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_pcpu.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_smp.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_witness.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_socket.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.master#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/systrace_args.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_socket.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_usrreq.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/pmap.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/pmap.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/bwi/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_bridge.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_clone.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_ethersubr.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_gif.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_gif.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_lagg.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_mib.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_var.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/netisr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/vnet.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_adhoc.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ddb.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_freebsd.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ht.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ioctl.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_node.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_scan_sta.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_superg.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_superg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_var.h#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/netgraph.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/icmp6.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/igmp.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_mcast.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.h#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_rmx.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_carp.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_divert.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw_pfil.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_input.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_ipsec.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_mroute.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_output.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/raw_ip.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_hostcache.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_subr.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_syncache.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_syncache.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_timewait.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_var.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/vinet.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/icmp6.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_ifattach.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_mcast.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_pcb.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_proto.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_rmx.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_var.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_input.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_mroute.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_output.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_var.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/mld6.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/mld6.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6_nbr.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/raw_ip6.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/vinet6.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/key.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/vipsec.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_tcp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_kdtrace.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_krpc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vnops.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/GENERIC#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_atalk.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_audit.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_cred.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_inet.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_inet6.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_internal.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_net.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_pipe.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_posix_sem.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_posix_shm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_priv.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_process.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_socket.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_system.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_sysv_msg.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_sysv_sem.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_sysv_shm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_vfs.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/jail.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ktr.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/osd.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/priv.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/proc.h#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/smp.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/socketvar.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.mk#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysctl.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysproto.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ucred.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vimage.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/swap_pager.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_pageout.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vnode_pager.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/calendar/calendars/calendar.freebsd#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/du/du.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/file/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/file/config.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ncal/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ncal/ncal.1#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ncal/ncal.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/inet6.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/arp/arp.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ifmcstat/ifmcstat.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jail/jail.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/kbdmap/kbdmap.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mtest/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mtest/mtest.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mtest/mtest.c#3 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#25 (text+ko) ==== @@ -22,6 +22,100 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090430: + The layout of the following structs has changed: sysctl_oid, + socket, ifnet, inpcbinfo, tcpcb, syncache_head, vnet_inet, + vnet_inet6 and vnet_ipfw. Most modules need to be rebuild or + panics may be experienced. World rebuild is required for + correctly checking networking state from userland. + Bump __FreeBSD_version to 800085. + +20090429: + MLDv2 and Source-Specific Multicast (SSM) have been merged + to the IPv6 stack. VIMAGE hooks are in but not yet used. + The implementation of SSM within FreeBSD's IPv6 stack closely + follows the IPv4 implementation. + + For kernel developers: + + * The most important changes are that the ip6_output() and + ip6_input() paths no longer take the IN6_MULTI_LOCK, + and this lock has been downgraded to a non-recursive mutex. + + * As with the changes to the IPv4 stack to support SSM, filtering + of inbound multicast traffic must now be performed by transport + protocols within the IPv6 stack. This does not apply to TCP and + SCTP, however, it does apply to UDP in IPv6 and raw IPv6. + + * The KPIs used by IPv6 multicast are similar to those used by + the IPv4 stack, with the following differences: + * im6o_mc_filter() is analogous to imo_multicast_filter(). + * The legacy KAME entry points in6_joingroup and in6_leavegroup() + are shimmed to in6_mc_join() and in6_mc_leave() respectively. + * IN6_LOOKUP_MULTI() has been deprecated and removed. + * IPv6 relies on MLD for the DAD mechanism. KAME's internal KPIs + for MLDv1 have an additional 'timer' argument which is used to + jitter the initial membership report for the solicited-node + multicast membership on-link. + * This is not strictly needed for MLDv2, which already jitters + its report transmissions. However, the 'timer' argument is + preserved in case MLDv1 is active on the interface. + + * The KAME linked-list based IPv6 membership implementation has + been refactored to use a vector similar to that used by the IPv4 + stack. + Code which maintains a list of its own multicast memberships + internally, e.g. carp, has been updated to reflect the new + semantics. + + * There is a known Lock Order Reversal (LOR) due to in6_setscope() + acquiring the IF_AFDATA_LOCK and being called within ip6_output(). + Whilst MLDv2 tries to avoid this otherwise benign LOR, it is an + implementation constraint which needs to be addressed in HEAD. + + For application developers: + + * The changes are broadly similar to those made for the IPv4 + stack. + + * The use of IPv4 and IPv6 multicast socket options on the same + socket, using mapped addresses, HAS NOT been tested or supported. + + * There are a number of issues with the implementation of various + IPv6 multicast APIs which need to be resolved in the API surface + before the implementation is fully compatible with KAME userland + use, and these are mostly to do with interface index treatment. + + * The literature available discusses the use of either the delta / ASM + API with setsockopt(2)/getsockopt(2), or the full-state / ASM API + using setsourcefilter(3)/getsourcefilter(3). For more information + please refer to RFC 3768, 'Socket Interface Extensions for + Multicast Source Filters'. + + * Applications which use the published RFC 3678 APIs should be fine. + + For systems administrators: + + * The mtest(8) utility has been refactored to support IPv6, in + addition to IPv4. Interface addresses are no longer accepted + as arguments, their names must be used instead. The utility + will map the interface name to its first IPv4 address as + returned by getifaddrs(3). + + * The ifmcstat(8) utility has also been updated to print the MLDv2 + endpoint state and source filter lists via sysctl(3). + + * The net.inet6.ip6.mcast.loop sysctl may be tuned to 0 to disable + loopback of IPv6 multicast datagrams by default; it defaults to 1 + to preserve the existing behaviour. Disabling multicast loopback is + recommended for optimal system performance. + + * The IPv6 MROUTING code has been changed to examine this sysctl + instead of attempting to perform a group lookup before looping + back forwarded datagrams. + + Bump __FreeBSD_version to 800084. + 20090422: Implement low-level Bluetooth HCI API. Bump __FreeBSD_version to 800083. @@ -1419,4 +1513,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.596 2009/04/24 15:38:13 delphij Exp $ +$FreeBSD: src/UPDATING,v 1.598 2009/04/30 13:36:26 zec Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/rm/rm.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.58 2006/10/31 02:22:36 delphij Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.59 2009/04/29 18:08:18 imp Exp $"); #include <sys/stat.h> #include <sys/param.h> @@ -60,6 +60,7 @@ int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok; int rflag, Iflag; uid_t uid; +volatile sig_atomic_t info; int check(char *, char *, struct stat *); int check2(char **); @@ -68,6 +69,7 @@ void rm_file(char **); int rm_overwrite(char *, struct stat *); void rm_tree(char **); +static void siginfo(int __unused); void usage(void); /* @@ -150,6 +152,7 @@ checkslash(argv); uid = geteuid(); + (void)signal(SIGINFO, siginfo); if (*argv) { stdin_ok = isatty(STDIN_FILENO); @@ -266,6 +269,11 @@ if (rval == 0 && vflag) (void)printf("%s\n", p->fts_path); + if (rval == 0 && info) { + info = 0; + (void)printf("%s\n", + p->fts_path); + } continue; } break; @@ -276,6 +284,11 @@ if (vflag) (void)printf("%s\n", p->fts_path); + if (info) { + info = 0; + (void)printf("%s\n", + p->fts_path); + } continue; } break; @@ -297,6 +310,11 @@ if (rval == 0 && vflag) (void)printf("%s\n", p->fts_path); + if (rval == 0 && info) { + info = 0; + (void)printf("%s\n", + p->fts_path); + } continue; } } @@ -369,6 +387,10 @@ } if (vflag && rval == 0) (void)printf("%s\n", f); + if (info && rval == 0) { + info = 0; + (void)printf("%s\n", f); + } } } @@ -592,3 +614,10 @@ " unlink file"); exit(EX_USAGE); } + +static void +siginfo(int sig __unused) +{ + + info = 1; +} ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/file/ChangeLog#3 (text+ko) ==== @@ -1,9 +1,105 @@ +2008-12-12 15:50 Christos Zoulas <christos@zoulas.com> + + * fix initial offset calculation for non 4K sector files + + * add loop limits to avoid DoS attacks by constructing + looping sector references. + +2008-12-03 13:05 Christos Zoulas <christos@zoulas.com> + + * fix memory botches on cdf file parsing. + + * exit with non-zero value for any error, not just for the last + file processed. + +2008-11-09 20:42 Charles Longeau <chl@tuxfamily.org> + + * Replace all str{cpy,cat} functions with strl{cpy,cat} + * Ensure that strl{cpy,cat} are included in libmagic, + as needed. + +2008-11-06 18:18 Christos Zoulas <christos@zoulas.com> + + * Handle ID3 format files. + +2008-11-06 23:00 Reuben Thomas <rrt@sc3d.org> + + * Fix --mime, --mime-type and --mime-encoding under new scheme. + + * Rename "ascii" to "text" and add "encoding" test. + + * Return a precise ("utf-16le" or "utf-16be") MIME charset for + UTF-16. + + * Fix error in comment caused by automatic indentation adding + words! + +2008-11-06 10:35 Christos Zoulas <christos@astron.com> + + * use memchr instead of strchr because the string + might not be NUL terminated (Scott MacVicar) + +2008-11-03 07:31 Reuben Thomas <rrt@sc3d.org> + + * Fix a printf with a non-literal format string. + + * Fix formatting and punctuation of help for "--apple". + +2008-10-30 11:00 Reuben Thomas <rrt@sc3d.org> + + * Correct words counts in comments of struct magic. + + * Fix handle_annotation to allow both Apple and MIME types to be + printed, and to return correct code if MIME type is + printed (1, not 0) or if there's an error (-1 not 1). + + * Fix output of charset for MIME type (precede with semi-colon; + fixes Debian bug #501460). + + * Fix potential attacks via conversion specifications in magic + strings. + + * Add a FIXME for Debian bug #488562 (magic files should be + read in a defined order, by sorting the names). + +2008-10-18 16:45 Christos Zoulas <christos@astron.com> + + * Added APPLE file creator/type + +2008-10-12 10:20 Christos Zoulas <christos@astron.com> + + * Added CDF parsing + +2008-10-09 16:40 Christos Zoulas <christos@astron.com> + + * filesystem and msdos patches (Joerg Jenderek) + +2008-10-09 13:20 Christos Zoulas <christos@astron.com> + + * correct --exclude documentation issues: remove troff and fortran + and rename "token" to "tokens". (Randy McMurchy) + +2008-10-01 10:30 Christos Zoulas <christos@astron.com> + + * Read ~/.magic in addition to the default magic file not instead + of, as documented in the man page. + +2008-09-10 21:30 Reuben Thomas <rrt@sc3d.org> + + * Comment out graphviz patterns, as they match too many files. + 2008-08-30 12:54 Christos Zoulas <christos@astron.com> * Don't eat trailing \n in magic enties. * Cast defines to allow compilation using a c++ compiler. +2008-08-25 23:56 Reuben Thomas <rrt@sc3d.org> + + * Add text/x-lua MIME type for Lua scripts. + + * Escape { in regex in graphviz patterns. + 2008-07-26 00:59 Reuben Thomas <rrt@sc3d.org> * Add MIME types for special files. @@ -55,22 +151,22 @@ 2008-05-06 00:13 Robert Byrnes <byrnes@wildpumpkin.net> - * src/Makefile.am: + * src/Makefile.am: Ensure that getopt_long and [v]asprintf are included in libmagic, as needed. Remove unnecessary EXTRA_DIST. - * src/Makefile.in: + * src/Makefile.in: Rerun automake. - * src/vasprintf.c (dispatch): + * src/vasprintf.c (dispatch): Fix variable precision bug: be sure to step past '*'. - * src/vasprintf.c (core): + * src/vasprintf.c (core): Remove unreachable code. - * src/apprentice.c (set_test_type): + * src/apprentice.c (set_test_type): Add cast to avoid compiler warning. 2008-04-22 23:45 Christos Zoulas <christos@astron.com> @@ -81,12 +177,12 @@ 2008-04-04 11:00 Christos Zoulas <christos@astron.com> - * >= <= is not supported, so fix the magic and warn about it. + * >= <= is not supported, so fix the magic and warn about it. reported by: Thien-Thi Nguyen <ttn@gnuvola.org> 2008-03-27 16:16 Robert Byrnes <byrnes@wildpumpkin.net> - * src/readelf.c (donote): + * src/readelf.c (donote): ELF core file command name/line bug fixes and enhancements: Try larger offsets first to avoid false matches @@ -112,7 +208,7 @@ * Clarify UTF-8 BOM message (Reuben Thomas) * Add HTML comment to token list in names.h - + 2007-02-04 15:50 Christos Zoulas <christos@astron.com> * Debian fixes (Reuben Thomas) @@ -152,7 +248,7 @@ 2007-10-28 20:48 Christos Zoulas <christos@astron.com> - * float and double magic support (Behan Webster) + * float and double magic support (Behan Webster) 2007-10-28 20:48 Christos Zoulas <christos@astron.com> @@ -199,7 +295,7 @@ be easily parsed: mimetype [charset=character-set] [encoding=encoding-mime-type] - Remove spurious extra text from some MIME type printouts + Remove spurious extra text from some MIME type printouts (mostly in is_tar). Fix one case where -i produced nothing at all (for a 1-byte file, @@ -229,7 +325,7 @@ 2007-03-15 10:51 Christos Zoulas <christos@astron.com> * fix fortran and nroff reversed tests (Dmitry V. Levin) - + * fix exclude option (Dmitry V. Levin) 2007-02-08 17:30 Christos Zoulas <christos@astron.com> @@ -248,7 +344,7 @@ * Add exclude flag. 2007-01-18 05:29 Anon Ymous <do@not.spam.me> - + * Move the "type" detection code from parse() into its own table driven routine. This avoids maintaining multiple lists in file.h. @@ -256,7 +352,7 @@ * Add an optional conditional field (ust before the type field). This code is wrapped in "#ifdef ENABLE_CONDITIONALS" as it is likely to go away. - + 2007-01-16 23:24 Anon Ymous <do@not.spam.me> * Fix an initialization bug in check_mem(). @@ -327,7 +423,7 @@ 2006-12-08 16:32 Christos Zoulas <christos@astron.com> * store and print the line number of the magic - entry for debugging. + entry for debugging. * if the magic entry did not print anything, don't treat it as a match @@ -342,7 +438,7 @@ file_softmagic. 2006-11-25 13:35 Christos Zoulas <christos@astron.com> - + * Don't store the current offset in the magic struct, because it needs to be restored and it was not done properly all the time. Bug @@ -432,7 +528,7 @@ * Look for note sections in non executables. 2005-09-20 13:33 Christos Zoulas <christos@astron.com> - + * Don't print SVR4 Style in core files multiple times (Radek Vokál) @@ -443,9 +539,9 @@ 2005-08-18 09:53 Christos Zoulas <christos@astron.com> * Remove erroreous mention of /etc/magic in the file man page - This is gentoo bug 101639. (Mike Frysinger) + This is gentoo bug 101639. (Mike Frysinger) - * Cross-compile support and detection (Mike Frysinger) + * Cross-compile support and detection (Mike Frysinger) 2005-08-12 10:17 Christos Zoulas <christos@astron.com> @@ -477,20 +573,20 @@ * Avoid NULL pointer dereference in time conversion. 2005-03-06 00:00 Joerg Walter <jwalt@mail.garni.ch> - + * Add indirect magic offset support, and search mode. 2005-01-12 00:00 Stepan Kasal <kasal@ucw.cz> - * src/ascmagic.c (file_ascmagic): Fix three bugs about text files: - If a CRLF text file happens to have CR at offset HOWMANY - 1 - (currently 0xffff), it should not be counted as CR line - terminator. - If a line has length exactly MAXLINELEN, it should not yet be - treated as a ``very long line'', as MAXLINELEN is ``longest sane - line length''. - With CRLF, the line length was not computed correctly, and even - lines of length MAXLINELEN - 1 were treated as ``very long''. + * src/ascmagic.c (file_ascmagic): Fix three bugs about text files: + If a CRLF text file happens to have CR at offset HOWMANY - 1 + (currently 0xffff), it should not be counted as CR line + terminator. + If a line has length exactly MAXLINELEN, it should not yet be + treated as a ``very long line'', as MAXLINELEN is ``longest sane + line length''. + With CRLF, the line length was not computed correctly, and even + lines of length MAXLINELEN - 1 were treated as ``very long''. 2004-12-07 14:15 Christos Zoulas <christos@astron.com> @@ -525,12 +621,12 @@ * Remove 3rd and 4th copyright clause; approved by Ian Darwin. - * Fix small memory leaks; caught by: Tamas Sarlos + * Fix small memory leaks; caught by: Tamas Sarlos <stamas@csillag.ilab.sztaki.hu> 2004-07-24 16:33 Christos Zoulas <christos@astron.com> - * magic.mime update Danny Milosavljevic <danny.milo@gmx.net> + * magic.mime update Danny Milosavljevic <danny.milo@gmx.net> * FreeBSD version update Oliver Eikemeier <eikemeier@fillmore-labs.com> ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/animation#3 (text+ko) ==== @@ -325,6 +325,7 @@ # MP2, M1A 0 beshort&0xFFFE 0xFFFC MPEG ADTS, layer II, v1 +!:mime audio/mpeg # rates >2 byte&0xF0 0x10 \b, 32 kbps >2 byte&0xF0 0x20 \b, 48 kbps @@ -399,6 +400,7 @@ # MP3, M2A 0 beshort&0xFFFE 0xFFF2 MPEG ADTS, layer III, v2 +!:mime audio/mpeg # rate >2 byte&0xF0 0x10 \b, 8 kbps >2 byte&0xF0 0x20 \b, 16 kbps @@ -790,3 +792,24 @@ 0 belong 0x00000001 >4 byte&0x1F 0x07 !:mime video/h264 + +# Type: Bink Video +# URL: http://wiki.multimedia.cx/index.php?title=3DBink_Container +# From: <hoehle@users.sourceforge.net> 2008-07-18 +0 string BIK Bink Video +>3 regex =[a-z] rev.%s +#>4 ulelong x size %d +>20 ulelong x \b, %d +>24 ulelong x \bx%d +>8 ulelong x \b, %d frames +>32 ulelong x at rate %d/ +>28 ulelong >1 \b%d +>40 ulelong =0 \b, no audio +>40 ulelong !0 \b, %d audio track +>>40 ulelong !1 \bs +# follow properties of the first audio track only +>>48 uleshort x %dHz +>>51 byte&0x20 0 mono +>>51 byte&0x20 !0 stereo +#>>51 byte&0x10 0 FFT +#>>51 byte&0x10 !0 DCT ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/file/Magdir/audio#3 (text+ko) ==== @@ -286,43 +286,14 @@ # SGI SoundTrack <mpruett@sgi.com> 0 string _SGI_SoundTrack SGI SoundTrack project file # ID3 version 2 tags <waschk@informatik.uni-rostock.de> -0 string ID3 Audio file with ID3 version 2. -# ??? Normally such a file is an MP3 file, but this will give false positives -!:mime audio/mpeg ->3 ubyte <0xff \b%d -#>4 ubyte <0xff \b%d tag ->2584 string fLaC \b, FLAC encoding ->>2588 byte&0x7f >0 \b, unknown version ->>2588 byte&0x7f 0 \b -# some common bits/sample values ->>>2600 beshort&0x1f0 0x030 \b, 4 bit ->>>2600 beshort&0x1f0 0x050 \b, 6 bit ->>>2600 beshort&0x1f0 0x070 \b, 8 bit ->>>2600 beshort&0x1f0 0x0b0 \b, 12 bit ->>>2600 beshort&0x1f0 0x0f0 \b, 16 bit ->>>2600 beshort&0x1f0 0x170 \b, 24 bit ->>>2600 byte&0xe 0x0 \b, mono ->>>2600 byte&0xe 0x2 \b, stereo ->>>2600 byte&0xe 0x4 \b, 3 channels ->>>2600 byte&0xe 0x6 \b, 4 channels ->>>2600 byte&0xe 0x8 \b, 5 channels ->>>2600 byte&0xe 0xa \b, 6 channels ->>>2600 byte&0xe 0xc \b, 7 channels ->>>2600 byte&0xe 0xe \b, 8 channels -# some common sample rates ->>>2597 belong&0xfffff0 0x0ac440 \b, 44.1 kHz ->>>2597 belong&0xfffff0 0x0bb800 \b, 48 kHz ->>>2597 belong&0xfffff0 0x07d000 \b, 32 kHz ->>>2597 belong&0xfffff0 0x056220 \b, 22.05 kHz ->>>2597 belong&0xfffff0 0x05dc00 \b, 24 kHz ->>>2597 belong&0xfffff0 0x03e800 \b, 16 kHz ->>>2597 belong&0xfffff0 0x02b110 \b, 11.025 kHz ->>>2597 belong&0xfffff0 0x02ee00 \b, 12 kHz ->>>2597 belong&0xfffff0 0x01f400 \b, 8 kHz ->>>2597 belong&0xfffff0 0x177000 \b, 96 kHz ->>>2597 belong&0xfffff0 0x0fa000 \b, 64 kHz ->>>2601 byte&0xf >0 \b, >4G samples ->2584 string !fLaC \b, MP3 encoding +0 string ID3 Audio file with ID3 version 2 +>3 byte x \b.%d +>4 byte x \b.%d +>>5 byte &0x80 \b, unsynchronized frames +>>5 byte &0x40 \b, extended header +>>5 byte &0x20 \b, experimental +>>5 byte &0x10 \b, footer present +>(6.I) indirect x \b, contains: # NSF (NES sound file) magic >>> TRUNCATED FOR MAIL (1000 lines) <<<help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905051939.n45Jd0UY011991>