PERFORCE change 163040 for review

Edward Tomasz Napierala trasz at FreeBSD.org
Fri May 29 19:26:21 UTC 2009


http://perforce.freebsd.org/chv.cgi?CH=163040

Change 163040 by trasz at trasz_victim on 2009/05/29 19:25:34

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#25 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#29 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/test/TEST.sh#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/test/test.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/lockstat/sym.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.sbin/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.sbin/lockstat/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/Changes#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/README.ee#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/create.make#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/ee.1#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/ee.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/ee.i18n.guide#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/ee.msg#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/ee_version.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/genstr#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/make.default#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/new_curse.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ee/new_curse.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/lib/load_http.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/netcat/nc.1#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/netcat/netcat.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.include.dist#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/daily/460.status-mail-rejects#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/include/Makefile#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/popen.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/include/nss_tls.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/nsdispatch.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/resolver.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_entry.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/resolv/res_comp.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/rpc/svc_dg.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/rpc/svc_generic.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdtime/time2posix.3#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/jail.2#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb.3#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb20.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb20.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb20_int.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb20_ugen20.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusbhid/descr.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-elf/rtld.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dump/optr.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nfs/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nfs/mount_nfs.8#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nfs/mount_nfs.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man3/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man3/queue.3#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ksyms.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mld.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/multicast.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/fail.9#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/rmlock.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/sx.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/africa#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/antarctica#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/australasia#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/backward#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/etcetera#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/europe#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/factory#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/leapseconds#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/northamerica#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/pacificnew#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/southamerica#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/systemv#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/zone.tab#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/ohci_atmelarm.c#3 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/AVILA#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/files.ixp425#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/common/ufsread.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/boot2/sys.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/rwlock.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/lockstat/lockstat.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_misc.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_ioctl.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_mib.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_usbd.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_fcntl.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_ioctl.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_misc.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_resource.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_signal.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_socket.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_stat.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_stream.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_sysconfig.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#33 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#40 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kern.pre.mk#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#26 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/crypto/via/padlock_hash.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-usb.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfe/cfe_console.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_main.c#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dcons/dcons_os.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis_usb.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndisvar.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ksyms/ksyms.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nmdm/nmdm.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ofw/ofw_console.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/rp/rp.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/si/si.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/cmi.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/cs4281.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/vibes.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/sound.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/sound.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/usb/uaudio.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/usb/uaudioreg.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/sysmouse.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_tty.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/bluetooth/TODO.TXT#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/bluetooth/ng_ubt.c#4 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/bluetooth/ng_ubt_var.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/bluetooth/ubtbcmfw.c#4 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/at91dci.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/at91dci.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/atmegadci.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/atmegadci.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/atmegadci_atmelarm.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/avr32dci.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/avr32dci.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/musb_otg.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/musb_otg.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ohci.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ohci.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uhci.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uhci.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/usb_controller.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uss820dci.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uss820dci.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/input/uhid.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/input/ukbd.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/input/ums.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/misc/udbp.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/misc/ufm.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_aue.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_auereg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_axe.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_axereg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cdce.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cdcereg.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cue.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cuereg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_kue.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_kuereg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_rue.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_ruereg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_udav.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_udavreg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/usb_ethernet.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/usb_ethernet.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/quirk/usb_quirk.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/u3g.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uark.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ubsa.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ubser.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uchcom.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ucycom.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ufoma.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uftdi.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ugensa.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uipaq.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/ulpt.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/umct.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/umodem.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/umoscom.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uplcom.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/usb_serial.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/usb_serial.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uslcom.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uvisor.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uvscom.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/umass.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/urio.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/ustorage_fs.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/template/usb_template.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/template/usb_template.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/template/usb_template_cdce.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/template/usb_template_msc.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/template/usb_template_mtp.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_bus.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_busdma.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_busdma.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_cdc.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_compat_linux.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_compat_linux.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_controller.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_core.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_debug.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_debug.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_dev.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_dev.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_device.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_device.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_dynamic.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_dynamic.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_error.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_generic.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_generic.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_handle_request.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hid.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hid.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hub.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_hub.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_ioctl.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_lookup.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_lookup.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_mbuf.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_mbuf.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_msctest.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_msctest.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_parse.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_parse.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_process.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_process.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_request.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_request.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_transfer.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_transfer.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_util.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#27 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbhid.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rum.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rumvar.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_uath.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_uathvar.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_upgt.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_upgtvar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_ural.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_uralvar.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_urtw.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_urtwreg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_urtwvar.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_zyd.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_zydreg.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/console/console.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/netfront/netfront.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonport.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonsubs.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfsport.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clbio.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clnode.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdport.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/procfs/procfs_status.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/smbfs/smbfs_io.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_vnops.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/xen_clock_util.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/clock.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_clock_util.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_rtc.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/mp_machdep.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/ssc.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_main.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_cpuset.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_descrip.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exit.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_fail.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_fork.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_linker.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lock.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lockstat.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mib.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mutex.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_osd.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_prot.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_rmlock.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_rwlock.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sx.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/link_elf.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/link_elf_obj.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/linker_if.m#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sysv_msg.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sysv_sem.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sysv_shm.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#23 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_pts.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_bio.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_lookup.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#20 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#31 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#20 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/ata/ata-usb.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/sound/usb/uaudio.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/sound/usb/uaudio.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/FILES#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/dsbr100io.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ehci.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ehci_ddb.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ehci_mbus.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ehci_pci.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ehcireg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ehcivar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/hid.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/hid.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/if_urtw.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/if_urtwreg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/if_urtwvar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ohci.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ohci_pci.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ohcireg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ohcivar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/rio500_usb.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/rt2573_ucode.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/sl811hs.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/sl811hsreg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/sl811hsvar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/slhci_pccard.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/u3g.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uark.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ubsa.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ubser.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ubser.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uchcom.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ucom.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ucomvar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ucycom.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/udbp.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/udbp.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ufm.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ufoma.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uftdi.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uftdireg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ugen.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uhci.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uhci_pci.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uhcireg.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uhcivar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uhid.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uhub.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uipaq.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ukbd.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ulpt.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/umass.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/umct.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/umodem.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/ums.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uplcom.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/urio.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb_if.m#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb_mem.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb_mem.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb_port.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb_quirks.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb_quirks.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usb_subr.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usbcdc.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usbdi.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usbdi.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usbdi_util.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usbdi_util.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usbdivar.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/usbhid.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uscanner.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uslcom.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uvisor.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uvscom.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#25 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/dtraceall/dtraceall.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ksyms/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/linux/Makefile#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/netgraph/bluetooth/ubt/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfscl/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfscommon/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfsd/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb/Makefile#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb/urtw/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/zfs/Makefile#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/pfil.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubt/TODO#3 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/accf_dns.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.c#20 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_input.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_input.c#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/icmp6.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_ifattach.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_mcast.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_pcb.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_input.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/mld6.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/key.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_bio.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvsock.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/xdr.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_framework.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_internal.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/sun4v/hvcons.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/cpuset.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/fail.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/jail.h#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ksyms.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/lock.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/lockstat.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mount.h#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mutex.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/namei.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#27 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/queue.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/rmlock.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/rwlock.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sx.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscallsubr.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/systm.h#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/tty.h#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#28 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_object.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_pageout.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/xdr/xdr_mem.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/xenbus/xenbus_xs.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/README#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/file/flock/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/file/flock/flock.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/vfs/trailing_slash.t#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/Artistic#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/FREEBSD-upgrade#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/README#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/ee.1#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/ee.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/ee.i18n.guide#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/new_curse.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/new_curse.h#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/nls/en_US.US-ASCII/ee.msg#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/kdump/mkioctls#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/killall/killall.1#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/killall/killall.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/perror/perror.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/amd64-fbsd.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/amd64-fbsd32.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/amd64-linux32.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/i386-fbsd.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/i386-linux.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/ia64-fbsd.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/mips-fbsd.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/powerpc-fbsd.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/sparc64-fbsd.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ifmcstat/ifmcstat.8#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ifmcstat/ifmcstat.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jail/jail.8#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jail/jail.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jexec/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jexec/jexec.8#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jexec/jexec.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jls/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jls/jls.8#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jls/jls.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mountd/exports.5#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mountd/mountd.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mountd/mountd.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsd/nfsd.8#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsd/nfsd.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbconfig/usbconfig.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/README#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/Theory#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/zdump.8#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/zdump.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/zic.8#4 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#25 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.190 2009/05/23 16:54:07 antoine Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.193 2009/05/27 19:28:04 ed 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,45 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER()
+OLD_FILES+=usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz
+OLD_FILES+=usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz
+# 20090527: removal of legacy USB stack
+OLD_FILES+=usr/include/legacy/dev/usb/dsbr100io.h
+OLD_FILES+=usr/include/legacy/dev/usb/ehcireg.h
+OLD_FILES+=usr/include/legacy/dev/usb/ehcivar.h
+OLD_FILES+=usr/include/legacy/dev/usb/hid.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_urtwreg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_urtwvar.h
+OLD_FILES+=usr/include/legacy/dev/usb/ohcireg.h
+OLD_FILES+=usr/include/legacy/dev/usb/ohcivar.h
+OLD_FILES+=usr/include/legacy/dev/usb/rio500_usb.h
+OLD_FILES+=usr/include/legacy/dev/usb/rt2573_ucode.h
+OLD_FILES+=usr/include/legacy/dev/usb/sl811hsreg.h
+OLD_FILES+=usr/include/legacy/dev/usb/sl811hsvar.h
+OLD_FILES+=usr/include/legacy/dev/usb/ubser.h
+OLD_FILES+=usr/include/legacy/dev/usb/ucomvar.h
+OLD_FILES+=usr/include/legacy/dev/usb/udbp.h
+OLD_FILES+=usr/include/legacy/dev/usb/uftdireg.h
+OLD_FILES+=usr/include/legacy/dev/usb/ugraphire_rdesc.h
+OLD_FILES+=usr/include/legacy/dev/usb/uhcireg.h
+OLD_FILES+=usr/include/legacy/dev/usb/uhcivar.h
+OLD_FILES+=usr/include/legacy/dev/usb/usb.h
+OLD_FILES+=usr/include/legacy/dev/usb/usb_mem.h
+OLD_FILES+=usr/include/legacy/dev/usb/usb_port.h
+OLD_FILES+=usr/include/legacy/dev/usb/usb_quirks.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbcdc.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbdi.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbdi_util.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbdivar.h
+OLD_FILES+=usr/include/legacy/dev/usb/usbhid.h
+OLD_FILES+=usr/include/legacy/dev/usb/uxb360gp_rdesc.h
+OLD_DIRS+=usr/include/legacy/dev/usb
+OLD_DIRS+=usr/include/legacy/dev
+OLD_DIRS+=usr/include/legacy
+# 20090526: removal of makekey(8)
+OLD_FILES+=libexec/makekey
+OLD_FILES+=usr/share/man/man8/makekey.8.gz
 # 20090522: removal of University of Michigan NFSv4 client
 OLD_FILES+=etc/rc.d/idmapd
 OLD_FILES+=sbin/idmapd

==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#29 (text+ko) ====

@@ -22,6 +22,18 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090528:
+	The compiling option ADAPTIVE_SX has been retired while it has been
+	introduced the option NO_ADAPTIVE_SX which handles the reversed logic.
+	The KPI for sx_init_flags() changes as accepting flags:
+	SX_ADAPTIVESPIN flag has been retired while the SX_NOADAPTIVE flag
+	has been introduced in order to handle the reversed logic.
+	Bump __FreeBSD_version to 800092.
+
+20090527:
+	Add support for hierarchical jails.  Remove global securelevel.
+	Bump __FreeBSD_version to 800091.
+
 20090523:
 	The layout of struct vnet_net has changed, therefore modules
 	need to be rebuilt.
@@ -1535,4 +1547,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.604 2009/05/23 21:43:44 zec Exp $
+$FreeBSD: src/UPDATING,v 1.606 2009/05/29 01:49:27 attilio Exp $

==== //depot/projects/soc2008/trasz_nfs4acl/bin/test/TEST.sh#2 (text+ko) ====

@@ -28,7 +28,7 @@
 #
 # TEST.sh - check if test(1) or builtin test works
 #
-# $FreeBSD: src/bin/test/TEST.sh,v 1.8 2005/01/10 08:39:26 imp Exp $
+# $FreeBSD: src/bin/test/TEST.sh,v 1.9 2009/05/26 22:33:10 jilles Exp $
 
 # force a specified test program, e.g. `env test=/bin/test sh TEST.sh'
 : ${test=test}		
@@ -133,5 +133,45 @@
 t 1 '""'
 t 0 '! ""'
 
+t 0 '!'
+t 0 '\('
+t 0 '\)'
+
+t 1 '\( = \)'
+t 0 '\( != \)'
+t 0 '\( ! \)'
+t 0 '\( \( \)'
+t 0 '\( \) \)'
+t 0 '! = !'
+t 1 '! != !'
+t 1 '-n = \)'
+t 0 '! != \)'
+t 1 '! = a'
+t 0 '! != -n'
+t 0 '! -c /etc/passwd'
+
+t 0 '! \( = \)'
+t 1 '! \( != \)'
+t 1 '! = = ='
+t 0 '! = = \)'
+t 0 '! "" -o ""'
+t 1 '! "x" -o ""'
+t 1 '! "" -o "x"'
+t 1 '! "x" -o "x"'
+t 0 '\( -f /etc/passwd \)'
+t 1 '\( ! = \)'
+t 0 '\( ! "" \)'
+t 1 '\( ! -e \)'
+
+t 0 '0 -eq 0 -a -d /'
+t 0 '-s = "" -o "" = ""'
+t 0 '"" = "" -o -s = ""'
+t 1 '-s = "" -o -s = ""'
+t 0 '-z x -o x = "#" -o x = x'
+t 1 '-z y -o y = "#" -o y = x'
+t 0 '0 -ne 0 -o ! -f /'
+t 0 '1 -ne 0 -o ! -f /etc/passwd'
+t 1 '0 -ne 0 -o ! -f /etc/passwd'
+
 echo ""
 echo "Syntax errors: $ERROR Failed: $FAILED"

==== //depot/projects/soc2008/trasz_nfs4acl/bin/test/test.c#2 (text+ko) ====

@@ -11,7 +11,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.53 2005/01/10 08:39:26 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.54 2009/05/26 22:33:10 jilles Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -163,6 +163,7 @@
 struct t_op const *t_wp_op;
 int nargc;
 char **t_wp;
+int parenlevel;
 
 static int	aexpr(enum token);
 static int	binop(void);
@@ -171,7 +172,9 @@
 static int	getn(const char *);
 static intmax_t	getq(const char *);
 static int	intcmp(const char *, const char *);
-static int	isoperand(void);
+static int	isunopoperand(void);
+static int	islparenoperand(void);
+static int	isrparenoperand(void);
 static int	newerf(const char *, const char *);
 static int	nexpr(enum token);
 static int	oexpr(enum token);
@@ -205,7 +208,14 @@
 #endif
 	nargc = argc;
 	t_wp = &argv[1];
-	res = !oexpr(t_lex(*t_wp));
+	parenlevel = 0;
+	if (nargc == 4 && strcmp(*t_wp, "!") == 0) {
+		/* Things like ! "" -o x do not fit in the normal grammar. */
+		--nargc;
+		++t_wp;
+		res = oexpr(t_lex(*t_wp));
+	} else
+		res = !oexpr(t_lex(*t_wp));
 
 	if (--nargc > 0)
 		syntax(*t_wp, "unexpected operator");
@@ -268,12 +278,16 @@
 	if (n == EOI)
 		return 0;		/* missing expression */
 	if (n == LPAREN) {
+		parenlevel++;
 		if ((nn = t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)) ==
-		    RPAREN)
+		    RPAREN) {
+			parenlevel--;
 			return 0;	/* missing expression */
+		}
 		res = oexpr(nn);
 		if (t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL) != RPAREN)
 			syntax(NULL, "closing paren expected");
+		parenlevel--;
 		return res;
 	}
 	if (t_wp_op && t_wp_op->op_type == UNOP) {
@@ -410,8 +424,10 @@
 	}
 	while (op->op_text) {
 		if (strcmp(s, op->op_text) == 0) {
-			if ((op->op_type == UNOP && isoperand()) ||
-			    (op->op_num == LPAREN && nargc == 1))
+			if (((op->op_type == UNOP || op->op_type == BUNOP)
+						&& isunopoperand()) ||
+			    (op->op_num == LPAREN && islparenoperand()) ||
+			    (op->op_num == RPAREN && isrparenoperand()))
 				break;
 			t_wp_op = op;
 			return op->op_num;
@@ -423,7 +439,7 @@
 }
 
 static int
-isoperand(void)
+isunopoperand(void)
 {
 	struct t_op const *op = ops;
 	char *s;
@@ -431,19 +447,53 @@
 
 	if (nargc == 1)
 		return 1;
+	s = *(t_wp + 1);
 	if (nargc == 2)
-		return 0;
-	s = *(t_wp + 1);
+		return parenlevel == 1 && strcmp(s, ")") == 0;
 	t = *(t_wp + 2);
 	while (op->op_text) {
 		if (strcmp(s, op->op_text) == 0)
 			return op->op_type == BINOP &&
-			    (t[0] != ')' || t[1] != '\0');
+			    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
+		op++;
+	}
+	return 0;
+}
+
+static int
+islparenoperand(void)
+{
+	struct t_op const *op = ops;
+	char *s;
+
+	if (nargc == 1)
+		return 1;
+	s = *(t_wp + 1);
+	if (nargc == 2)
+		return parenlevel == 1 && strcmp(s, ")") == 0;
+	if (nargc != 3)
+		return 0;
+	while (op->op_text) {
+		if (strcmp(s, op->op_text) == 0)
+			return op->op_type == BINOP;
 		op++;
 	}
 	return 0;
 }
 
+static int
+isrparenoperand(void)
+{
+	char *s;
+
+	if (nargc == 1)
+		return 0;
+	s = *(t_wp + 1);
+	if (nargc == 2)
+		return parenlevel == 1 && strcmp(s, ")") == 0;
+	return 0;
+}
+
 /* atoi with error detection */
 static int
 getn(const char *s)

==== //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.sbin/Makefile#3 (text+ko) ====

@@ -1,8 +1,9 @@
-# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.9 2008/05/22 23:06:19 jb Exp $
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.10 2009/05/27 01:30:23 sson Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	dtrace \
+	lockstat \
 	${_zdb}
 
 .if ${MK_ZFS} != "no"

==== //depot/projects/soc2008/trasz_nfs4acl/contrib/ipfilter/lib/load_http.c#2 (text+ko) ====

@@ -14,11 +14,13 @@
 alist_t *
 load_http(char *url)
 {
-	int fd, len, left, port, endhdr, removed;
-	char *s, *t, *u, buffer[1024], *myurl;
+	char *s, *t, *u, buffer[1044], *myurl;
 	alist_t *a, *rtop, *rbot;
 	struct sockaddr_in sin;
 	struct hostent *host;
+	size_t avail;
+	int fd, len, left, port, endhdr, removed;
+	int error;
 
 	/*
 	 * More than this would just be absurd.
@@ -32,7 +34,14 @@
 	rtop = NULL;
 	rbot = NULL;
 
-	sprintf(buffer, "GET %s HTTP/1.0\r\n", url);
+	avail = sizeof(buffer);
+	error = snprintf(buffer, avail, "GET %s HTTP/1.0\r\n", url);
+
+	/*
+	 * error is always less then avail due to the constraint on
+	 * the url length above.
+	 */
+	avail -= error;
 
 	myurl = strdup(url);
 	if (myurl == NULL)
@@ -51,7 +60,11 @@
 	if (u != NULL)
 		s = u + 1;		/* AUTH */
 
-	sprintf(buffer + strlen(buffer), "Host: %s\r\n\r\n", s);
+	error = snprintf(buffer + strlen(buffer), avail, "Host: %s\r\n\r\n", s);
+	if (error >= avail) {
+		fprintf(stderr, "URL is too large: %s\n", url);
+		goto done;
+	}
 
 	u = strchr(s, ':');
 	if (u != NULL) {
@@ -83,16 +96,12 @@
 	if (fd == -1)
 		goto done;
 
-	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
-		close(fd);
+	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) == -1)
 		goto done;
-	}
 
 	len = strlen(buffer);
-	if (write(fd, buffer, len) != len) {
-		close(fd);
+	if (write(fd, buffer, len) != len)
 		goto done;
-	}
 
 	s = buffer;
 	endhdr = 0;

==== //depot/projects/soc2008/trasz_nfs4acl/contrib/netcat/nc.1#3 (text+ko) ====

@@ -1,4 +1,4 @@
-.\"     $OpenBSD: nc.1,v 1.47 2008/05/06 16:21:03 jmc Exp $
+.\"     $OpenBSD: nc.1,v 1.48 2008/09/19 13:24:41 sobrado Exp $
 .\"
 .\" Copyright (c) 1996 David Sacerdote
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.11 2008/12/19 23:00:23 delphij Exp $
+.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.13 2009/05/29 07:18:31 delphij Exp $
 .\"
 .Dd $Mdocdate: May 6 2008 $
 .Dt NC 1
@@ -53,7 +53,7 @@
 .Ar port Oc Oc
 .Xc
 .Op Ar hostname
-.Op Ar port Ns Bq Ar s
+.Op Ar port
 .Ek
 .Sh DESCRIPTION
 The
@@ -275,8 +275,8 @@
 option is given
 (in which case the local host is used).
 .Pp
-.Ar port Ns Op Ar s
-can be single integers or ranges.
+.Ar port
+can be a single integer or a range of ports.
 Ranges are in the form nn-mm.
 In general,
 a destination port must be specified,
@@ -445,6 +445,8 @@
 if the proxy requires it:
 .Pp
 .Dl $ nc -x10.2.3.4:8080 -Xconnect -Pruser host.example.com 42
+.Sh EXIT STATUS
+.Ex -std
 .Sh SEE ALSO
 .Xr cat 1 ,
 .Xr ssh 1 ,

==== //depot/projects/soc2008/trasz_nfs4acl/contrib/netcat/netcat.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.91 2008/05/09 09:00:11 markus Exp $ */
+/* $OpenBSD: netcat.c,v 1.92 2008/09/19 13:24:41 sobrado Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson <ericj at monkey.org>
  *
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/contrib/netcat/netcat.c,v 1.9 2008/12/19 23:00:23 delphij Exp $
+ * $FreeBSD: src/contrib/netcat/netcat.c,v 1.10 2009/05/28 23:23:49 delphij Exp $
  */
 
 /*
@@ -967,14 +967,15 @@
 void
 usage(int ret)
 {
+	fprintf(stderr,
 #ifdef IPSEC
-	fprintf(stderr, "usage: nc [-46DdEhklnorStUuvz] [-e policy] [-I receive_buffer_len] [-i interval]\n");
+	    "usage: nc [-46DdEhklnorStUuvz] [-e policy] [-I length] [-i interval] [-O length]\n"
 #else
-	fprintf(stderr, "usage: nc [-46DdhklnorStUuvz] [-I receive_buffer_len] [-i interval]\n");
+	    "usage: nc [-46DdhklnorStUuvz] [-I length] [-i interval] [-O length]\n"
 #endif
-	fprintf(stderr, "\t  [-O send_buffer_len] [-P proxy_username] [-p source_port]\n");
-	fprintf(stderr, "\t  [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n");
-	fprintf(stderr, "\t  [-x proxy_address[:port]] [hostname] [port[s]]\n");
+	    "\t  [-P proxy_username] [-p source_port] [-s source_ip_address] [-T ToS]\n"
+	    "\t  [-w timeout] [-X proxy_protocol] [-x proxy_address[:port]] [hostname]\n"
+	    "\t  [port]\n");
 	if (ret)
 		exit(1);
 }

==== //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.include.dist#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.129 2009/05/21 16:27:47 rmacklem Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.130 2009/05/27 16:16:56 thompsa Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -197,12 +197,6 @@
     ..
     kadm5
     ..
-    legacy
-        dev
-            usb
-            ..
-        ..
-    ..
     libmilter
     ..
     lwres

==== //depot/projects/soc2008/trasz_nfs4acl/etc/periodic/daily/460.status-mail-rejects#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.21 2008/01/08 07:22:43 dds Exp $
+# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.22 2009/05/28 07:43:06 brian Exp $
 #
 
 # If there is a global system configuration file, suck it in.
@@ -12,10 +12,8 @@
 fi
 
 case "$daily_status_mail_rejects_shorten" in

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list