PERFORCE change 157529 for review

Edward Tomasz Napierala trasz at FreeBSD.org
Wed Feb 11 01:28:55 PST 2009


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

Change 157529 by trasz at trasz_victim7 on 2009/02/11 09:27:59

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/updater.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/named#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/getaddrinfo.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/gethostbydns.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/atol.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/memchr.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/send.2#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc_r/uthread/uthread_init.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libdisk/open_disk.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/math.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/scripts/doFS.sh#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/part/geom_part.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifieee80211.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/regdomain.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/regdomain.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/ipfw.8#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/nat.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nfs/mount_nfs.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/re.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/rum.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/smb.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/lock.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/busdma_machdep.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/DEFAULTS#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/NOTES#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/legacyvar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/busdma_machdep.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/sparc64/loader/main.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_periph.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_cd.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_da.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#25 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#29 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.amd64#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.i386#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.ia64#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.mips#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.pc98#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/crypto/via/padlock.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_panasonic.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/arcmsr/arcmsr.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah_regdomain.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5212.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athioctl.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/atkbdc/atkbdc_isa.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bge.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cardbus/cardbus_device.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfi/cfi_core.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfi/cfi_dev.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfi/cfi_reg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cfi/cfi_var.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/de/if_de.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/exca/exca.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/if_fwe.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/if_fwip.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/sbp.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fxp/if_fxp.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hifn/hifn7751.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/if_ic.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iicbb.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iicbus.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iicbus/iicsmb.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lmc/if_lmc.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/lmc/if_lmc.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/my/if_my.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nve/if_nve.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/card_if.m#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccard.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccard_cis.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pccard/pccardvarp.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pcn/if_pcn.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc_pci.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppcvar.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/re/if_re.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/safe/safe.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/scc/scc_if.m#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sdhci/sdhci.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/si/si.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sis/if_sis.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/macio/aoa.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/macio/aoa.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/macio/davbus.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/macio/i2s.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/macio/snapper.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/macio/tumbler.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/ds1.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scterm-teken.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/teken/teken.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tl/if_tl.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/tx/if_tx.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_bus_pci.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_rum.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_urtw.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#20 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci_atmelarm.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/atmegadci.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2_ixp4xx.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2_mbus.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2_pci.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/musb2_otg.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_controller.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_busdma.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_config_td.c#3 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_config_td.h#3 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_core.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_device.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_hub.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_msctest.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_process.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_process.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_request.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_request.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_transfer.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_util.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_util.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_aue2.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_auereg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axe2.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axereg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cdce2.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cdcereg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cue2.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cuereg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_kue2.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_kuereg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_rue2.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_ruereg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_udav2.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_udavreg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/usb2_ethernet.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/usb2_ethernet.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_cdc.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devid.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devtable.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/misc/ufm2.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/u3g2.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uark2.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ubsa2.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ubser2.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uchcom2.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ucycom2.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ufoma2.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uftdi2.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ugensa2.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uipaq2.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ulpt2.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/umct2.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/umodem2.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/umoscom2.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uplcom2.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/usb2_serial.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/usb2_serial.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uslcom2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uvisor2.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uvscom2.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/sound/uaudio2.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/umass2.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/template/usb2_template_cdce.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rum2.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rumreg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rumvar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_ural2.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_uralreg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_uralvar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zydfw.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zydreg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/xen/netfront/netfront.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fifofs/fifo_vnops.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_subr.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/udf/ecma167-udf.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/udf/udf.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/udf/udf_vfsops.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/udf/udf_vnops.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_apm.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_bsd.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_ebr.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_gpt.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_mbr.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_pc98.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_vtoc8.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/DEFAULTS#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/busdma_machdep.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/vm_machdep.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/pmap.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/conf/NOTES#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/busdma_machdep.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/mp_machdep.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_linker.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lock.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sysctl.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/link_elf.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/link_elf_obj.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_bus.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_clist.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_debug.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_socket.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_bio.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_init.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#24 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/pmap.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/busdma_machdep.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/in_cksum.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/geom/geom_part/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/geom/geom_part/geom_part_ebr/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/libalias/libalias/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/Makefile#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/core/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_slcom/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/rtsock.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_adhoc.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_crypto.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_ddb.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_regdomain.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_tdma.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw_nat.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_ipsec.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_output.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias_db.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias_local.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias_sctp.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias_sctp.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/raw_ip.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_crc32.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_crc32.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_uio.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctputil.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_subr.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_usrreq.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_pcb.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_src.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_forward.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_ipsec.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_output.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/raw_ip6.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec6.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_syscalls.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/opencrypto/cryptosoft.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/NOTES#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/if_rl.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/if_rlreg.h#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/clnt_rc.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_klib.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_pipe.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_private.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/bus_private.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/vmparam.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/iommu.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/include/vmparam.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/bus_dma.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/cfictl.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/jail.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/kobj.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/lockmgr.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mount.h#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysctl.h#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/tty.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_alloc.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_kern.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_map.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_map.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_mmap.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_object.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_object.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_unix.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vnode_pager.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vnode_pager.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/README#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/Makefile#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/athstats.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/main.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/statfoo.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/cfi/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/cfi/cfi.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/net80211/wlanstats/main.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/subst.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/write.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/config/main.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pstat/pstat.8#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pstat/pstat.c#6 integrate

Differences ...

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

@@ -22,6 +22,13 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090203:
+	The ichsmb(4) driver has been changed to require SMBus slave
+	addresses be left-justified (xxxxxxx0b) rather than right-justified.
+	All of the other SMBus controller drivers require left-justified
+	slave addresses, so this change makes all the drivers provide the
+	same interface.
+
 20090201:
 	INET6 statistics (struct ip6stat) was updated.
 	netstat(1) needs to be recompiled.
@@ -1219,4 +1226,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.560 2009/02/01 21:11:08 bz Exp $
+$FreeBSD: src/UPDATING,v 1.561 2009/02/06 15:03:14 jhb Exp $

==== //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/updater.c#3 (text) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/contrib/csup/updater.c,v 1.2 2009/01/05 15:18:16 lulf Exp $
+ * $FreeBSD: src/contrib/csup/updater.c,v 1.3 2009/02/09 20:13:55 lulf Exp $
  */
 
 #include <sys/types.h>
@@ -1656,10 +1656,12 @@
 
 	if (rf == NULL) {
 		fattr_maskout(oldfattr, ~FA_MODTIME);
-		if (fattr_equal(oldfattr, sr->sr_serverattr) == 0)
+		if (fattr_equal(oldfattr, sr->sr_serverattr))
 		 	lprintf(1, " SetAttrs %s", fup->coname);
 		else
 			lprintf(1, " Touch %s", fup->coname);
+		/* Install new attributes. */
+		fattr_install(sr->sr_serverattr, fup->destpath, NULL);
 		if (fup->attic)
 			lprintf(1, " -> Attic");
 		lprintf(1, "\n");

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/named#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/named,v 1.28 2008/08/01 06:11:33 dougb Exp $
+# $FreeBSD: src/etc/rc.d/named,v 1.29 2009/02/07 16:37:02 bz Exp $
 #
 
 # PROVIDE: named
@@ -61,10 +61,23 @@
 
 	# Mount a devfs in the chroot directory if needed
 	#
-	umount ${named_chrootdir}/dev 2>/dev/null
-	devfs_domount ${named_chrootdir}/dev devfsrules_hide_all
-	devfs -m ${named_chrootdir}/dev rule apply path null unhide
-	devfs -m ${named_chrootdir}/dev rule apply path random unhide
+	if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then
+		umount ${named_chrootdir}/dev 2>/dev/null
+		devfs_domount ${named_chrootdir}/dev devfsrules_hide_all
+		devfs -m ${named_chrootdir}/dev rule apply path null unhide
+		devfs -m ${named_chrootdir}/dev rule apply path random unhide
+	else
+		if [ -c ${named_chrootdir}/dev/null -a \
+		    -c ${named_chrootdir}/dev/random ]; then
+			info "named chroot: using pre-mounted devfs."
+		else
+			err 1 "named chroot: devfs cannot be mounted from" \
+			    "within a jail. Thus a chrooted named cannot" \
+			    "be run from within a jail." \
+			    "To run named without chrooting it, set" \
+			    "named_chrootdir=\"\" in /etc/rc.conf."
+		fi
+	fi
 
 	# Copy and/or update key files to the chroot /etc 
 	#
@@ -113,7 +126,12 @@
 named_poststop()
 {
 	if [ -n "${named_chrootdir}" -a -c ${named_chrootdir}/dev/null ]; then
-		umount ${named_chrootdir}/dev 2>/dev/null || true
+		if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then
+			umount ${named_chrootdir}/dev 2>/dev/null || true
+		else
+			warn "named chroot:" \
+			    "cannot unmount devfs from inside jail!"
+		fi
 	fi
 }
 

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/getaddrinfo.c#2 (text+ko) ====

@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.87 2008/02/03 19:07:55 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.88 2009/02/08 16:58:05 ume Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
@@ -1863,7 +1863,8 @@
 			}
 		} else if (type != qtype) {
 #ifdef DEBUG
-			if (type != T_KEY && type != T_SIG)
+			if (type != T_KEY && type != T_SIG &&
+			    type != ns_t_dname)
 				syslog(LOG_NOTICE|LOG_AUTH,
 	       "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"",
 				       qname, p_class(C_IN), p_type(qtype),

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/gethostbydns.c#2 (text+ko) ====

@@ -54,7 +54,7 @@
 static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.58 2007/01/09 00:28:02 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.59 2009/02/08 16:58:05 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -294,7 +294,7 @@
 			continue;
 		}
 		if (type != qtype) {
-			if (type != T_SIG)
+			if (type != T_SIG && type != ns_t_dname)
 				syslog(LOG_NOTICE|LOG_AUTH,
 	"gethostby*.gethostanswer: asked for \"%s %s %s\", got type \"%s\"",
 				       qname, p_class(C_IN), p_type(qtype),

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/atol.3#2 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)atol.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/atol.3,v 1.14 2007/01/09 00:28:09 imp Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/atol.3,v 1.15 2009/02/08 08:26:58 keramida Exp $
 .\"
-.Dd November 28, 2001
+.Dd February 1, 2009
 .Dt ATOL 3
 .Os
 .Sh NAME
@@ -78,13 +78,42 @@
 It is equivalent to:
 .Pp
 .Dl "strtoll(nptr, (char **)NULL, 10);"
+.Sh COMPATIBILITY
+The
+.Fx
+implementations of the
+.Fn atol
+and
+.Fn atoll
+functions are thin wrappers around
+.Fn strtol
+and
+.Fn stroll
+respectively, so these functions will affect the value of
+.Va errno
+in the same way that the
+.Fn strtol
+and
+.Fn stroll
+functions are able to.
+This behavior of
+.Fn atol
+and
+.Fn atoll
+is not required by
+.St -isoC
+or
+.St -isoC-c99 ,
+but it is allowed by all of
+.St -isoC , St -isoC-99
+and
+.St -p1003.1-2001 .
 .Sh ERRORS
 The functions
 .Fn atol
 and
 .Fn atoll
-need not
-affect the value of
+may affect the value of
 .Va errno
 on an error.
 .Sh SEE ALSO

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/memchr.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)memchr.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/memchr.c,v 1.7 2009/02/03 20:25:36 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/string/memchr.c,v 1.8 2009/02/07 19:34:44 imp Exp $");
 
 #include <string.h>
 
@@ -45,7 +45,7 @@
 		const unsigned char *p = s;
 
 		do {
-			if (*p++ == c)
+			if (*p++ == (unsigned char)c)
 				return ((void *)(p - 1));
 		} while (--n != 0);
 	}

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/send.2#2 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.36 2007/04/27 10:30:31 roam Exp $
+.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.37 2009/02/05 14:06:09 jamie Exp $
 .\"
-.Dd September 13, 2006
+.Dd February 5, 2009
 .Dt SEND 2
 .Os
 .Sh NAME
@@ -190,7 +190,7 @@
 The remote host was down.
 .It Bq Er ENETDOWN
 The remote network was down.
-.It Bq Er EPERM
+.It Bq Er EADDRNOTAVAIL
 The process using a
 .Dv SOCK_RAW
 socket was jailed and the source

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc_r/uthread/uthread_init.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.51 2007/01/12 07:25:26 imp Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.52 2009/02/08 06:44:58 deischen Exp $
  */
 
 /* Allocate space for global thread variables here: */
@@ -95,6 +95,7 @@
 	&_getsockopt,
 	&_ioctl,
 	&_kevent,
+	&_kqueue,
 	&_listen,
 	&_nanosleep,
 	&_open,

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libdisk/open_disk.c#2 (text+ko) ====

@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/open_disk.c,v 1.13 2008/04/24 00:11:15 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/open_disk.c,v 1.14 2009/02/09 21:34:06 lulf Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -127,6 +127,9 @@
 				name, a, b, line);
 	}
 
+	/* Sanitize the parameters. */
+	Sanitize_Bios_Geom(d);
+
 	/*
 	 * Calculate the number of cylinders this disk must have. If we have
 	 * an obvious insanity, we set the number of cylinders to zero.

==== //depot/projects/soc2008/trasz_nfs4acl/lib/msun/src/math.h#5 (text+ko) ====

@@ -11,7 +11,7 @@
 
 /*
  * from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD: src/lib/msun/src/math.h,v 1.75 2009/01/08 06:12:03 das Exp $
+ * $FreeBSD: src/lib/msun/src/math.h,v 1.76 2009/02/07 05:41:24 das Exp $
  */
 
 #ifndef _MATH_H_
@@ -70,12 +70,12 @@
 
 /* XXX We need a <machine/math.h>. */
 #if defined(__ia64__) || defined(__sparc64__)
-#define	FP_FAST_FMA
+#define	FP_FAST_FMA	1
 #endif
 #ifdef __ia64__
-#define	FP_FAST_FMAL
+#define	FP_FAST_FMAL	1
 #endif
-#define	FP_FAST_FMAF
+#define	FP_FAST_FMAF	1
 
 /* Symbolic constants to classify floating point numbers. */
 #define	FP_INFINITE	0x01

==== //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.938 2008/11/13 01:47:08 kensmith Exp $
+# $FreeBSD: src/release/Makefile,v 1.940 2009/02/10 15:11:26 kensmith Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -191,7 +191,6 @@
 
 .undef MAKE_FLOPPIES
 .if ${TARGET_ARCH} == "i386"
-MAKE_FLOPPIES=		true
 MAKE_DVD=
 SEPARATE_LIVEFS=
 SPLIT_MFSROOT=
@@ -223,7 +222,6 @@
 MFSLABEL=		auto
 SEPARATE_LIVEFS=
 .elif ${TARGET_ARCH} == "amd64"
-MAKE_FLOPPIES=		true
 MAKE_DVD=
 FLOPPYSIZE=		1440
 FLOPPYSPLITSIZE=	1392

==== //depot/projects/soc2008/trasz_nfs4acl/release/scripts/doFS.sh#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/release/scripts/doFS.sh,v 1.60 2004/08/25 01:39:52 kensmith Exp $
+# $FreeBSD: src/release/scripts/doFS.sh,v 1.61 2009/02/10 15:07:57 kensmith Exp $
 #
 
 set -ex
@@ -73,8 +73,8 @@
 
 	if [ "x${DISKLABEL}" != "x" ] ; then
 		${DISKLABEL} ${MACHINE} -w ${BOOT} ${MDDEVICE} ${FSLABEL}
-		newfs -O1 -i ${FSINODE} -o space -m 0 /dev/${MDDEVICE}c
-		mount /dev/${MDDEVICE}c ${MNT}
+		newfs -O1 -i ${FSINODE} -o space -m 0 /dev/${MDDEVICE}
+		mount /dev/${MDDEVICE} ${MNT}
 	else
 		newfs -O1 -i ${FSINODE} -o space -m 0 /dev/${MDDEVICE}
 		mount /dev/${MDDEVICE} ${MNT}

==== //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/part/geom_part.c#6 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.16 2008/11/30 23:46:31 marcel Exp $");
+__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.17 2009/02/08 20:19:19 marcel Exp $");
 
 #include <sys/stat.h>
 
@@ -187,17 +187,23 @@
 find_provider(struct ggeom *gp, unsigned long long minsector)
 {
 	struct gprovider *pp, *bestpp;
-	unsigned long long offset;
+	const char *s;
 	unsigned long long sector, bestsector;
 
 	bestpp = NULL;
 	LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
-		offset = atoll(find_provcfg(pp, "offset"));
-		sector = offset / pp->lg_sectorsize;
+		s = find_provcfg(pp, "start");
+		if (s == NULL) {
+			s = find_provcfg(pp, "offset");
+			sector = atoll(s) / pp->lg_sectorsize;
+		} else
+			sector = atoll(s);
+
 		if (sector < minsector)
 			continue;
 		if (bestpp != NULL && sector >= bestsector)
 			continue;
+
 		bestpp = pp;
 		bestsector = sector;
 	}
@@ -240,7 +246,7 @@
 	struct gprovider *pp;
 	const char *s, *scheme;
 	unsigned long long first, last, sector, end;
-	unsigned long long offset, length, secsz;
+	unsigned long long length, secsz;
 	int idx, wblocks, wname;
 
 	scheme = find_geomcfg(gp, "scheme");
@@ -258,14 +264,24 @@
 	    scheme, fmtsize(pp->lg_mediasize));
 
 	while ((pp = find_provider(gp, first)) != NULL) {
-		s = find_provcfg(pp, "offset");
-		offset = atoll(s);
-		sector = offset / secsz;
-		s = find_provcfg(pp, "length");
-		length = atoll(s);
+		s = find_provcfg(pp, "start");
+		if (s == NULL) {
+			s = find_provcfg(pp, "offset");
+			sector = atoll(s) / secsz;
+		} else
+			sector = atoll(s);
+
+		s = find_provcfg(pp, "end");
+		if (s == NULL) {
+			s = find_provcfg(pp, "length");
+			length = atoll(s) / secsz;
+			end = sector + length - 1;
+		} else {
+			end = atoll(s);
+			length = end - sector + 1;
+		}
 		s = find_provcfg(pp, "index");
 		idx = atoi(s);
-		end = sector + length / secsz;
 		if (first < sector) {
 			printf("  %*llu  %*llu  %*s  - free -  (%s)\n",
 			    wblocks, first, wblocks, sector - first,
@@ -273,16 +289,17 @@
 			    fmtsize((sector - first) * secsz));
 		}
 		printf("  %*llu  %*llu  %*d  %s %s (%s)\n",
-		    wblocks, sector, wblocks, end - sector,
+		    wblocks, sector, wblocks, length,
 		    wname, idx, find_provcfg(pp, element),
 		    fmtattrib(pp), fmtsize(pp->lg_mediasize));
-		first = end;
+		first = end + 1;
 	}
 	if (first <= last) {
+		length = last - first + 1;
 		printf("  %*llu  %*llu  %*s  - free -  (%s)\n",
-		    wblocks, first, wblocks, last - first + 1,
+		    wblocks, first, wblocks, length,
 		    wname, "",
-		    fmtsize((last - first + 1) * secsz));
+		    fmtsize(length * secsz));
 	}
 	printf("\n");
 }

==== //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifieee80211.c#11 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.74 2009/02/03 00:15:19 delphij Exp $
+ * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.75 2009/02/07 01:12:51 sam Exp $
  */
 
 /*-
@@ -99,10 +99,6 @@
 #define	IEEE80211_FIXED_RATE_NONE	0xff
 #endif
 
-#define	REQ_ECM		0x01000000	/* enable if ECM set */
-#define	REQ_OUTDOOR	0x02000000	/* enable for outdoor operation */
-#define	REQ_FLAGS	0xff000000	/* private flags, don't pass to os */
-
 /* XXX need these publicly defined or similar */
 #ifndef IEEE80211_NODE_AUTH
 #define	IEEE80211_NODE_AUTH	0x0001		/* authorized for data */
@@ -1802,6 +1798,57 @@
 	return 0;
 }
 
+/*
+ * Check channel compatibility.
+ */
+static int
+checkchan(const struct ieee80211req_chaninfo *avail, int freq, int flags)
+{
+	flags &= ~REQ_FLAGS;
+	/*
+	 * Check if exact channel is in the calibration table;
+	 * everything below is to deal with channels that we
+	 * want to include but that are not explicitly listed.
+	 */
+	if (flags & IEEE80211_CHAN_HT40) {
+		/* NB: we use an HT40 channel center that matches HT20 */
+		flags = (flags &~ IEEE80211_CHAN_HT40) | IEEE80211_CHAN_HT20;
+	}
+	if (chanlookup(avail->ic_chans, avail->ic_nchans, freq, flags) != NULL)
+		return 1;
+	if (flags & IEEE80211_CHAN_GSM) {
+		/*
+		 * XXX GSM frequency mapping is handled in the kernel
+		 * so we cannot find them in the calibration table;
+		 * just accept the channel and the kernel will reject
+		 * the channel list if it's wrong.
+		 */
+		return 1;
+	}
+	/*
+	 * If this is a 1/2 or 1/4 width channel allow it if a full
+	 * width channel is present for this frequency, and the device
+	 * supports fractional channels on this band.  This is a hack
+	 * that avoids bloating the calibration table; it may be better
+	 * by per-band attributes though (we are effectively calculating
+	 * this attribute by scanning the channel list ourself).
+	 */
+	if ((flags & (IEEE80211_CHAN_HALF | IEEE80211_CHAN_QUARTER)) == 0)
+		return 0;
+	if (chanlookup(avail->ic_chans, avail->ic_nchans, freq,
+	    flags &~ (IEEE80211_CHAN_HALF | IEEE80211_CHAN_QUARTER)) == NULL)
+		return 0;
+	if (flags & IEEE80211_CHAN_HALF) {
+		return chanfind(avail->ic_chans, avail->ic_nchans,
+		    IEEE80211_CHAN_HALF |
+		       (flags & (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_5GHZ)));
+	} else {
+		return chanfind(avail->ic_chans, avail->ic_nchans,
+		    IEEE80211_CHAN_QUARTER |
+			(flags & (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_5GHZ)));
+	}
+}
+
 static void
 regdomain_addchans(struct ieee80211req_chaninfo *ci,
 	const netband_head *bands,
@@ -1812,15 +1859,12 @@
 	const struct netband *nb;
 	const struct freqband *b;
 	struct ieee80211_channel *c, *prev;
-	int freq, channelSep, hasHalfChans, hasQuarterChans;
+	int freq, hi_adj, lo_adj, channelSep;
+	uint32_t flags;
 
+	hi_adj = (chanFlags & IEEE80211_CHAN_HT40U) ? -20 : 0;
+	lo_adj = (chanFlags & IEEE80211_CHAN_HT40D) ? 20 : 0;
 	channelSep = (chanFlags & IEEE80211_CHAN_2GHZ) ? 0 : 40;
-	hasHalfChans = chanfind(avail->ic_chans, avail->ic_nchans,
-	    IEEE80211_CHAN_HALF |
-	       (chanFlags & (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_5GHZ)));
-	hasQuarterChans = chanfind(avail->ic_chans, avail->ic_nchans,
-	    IEEE80211_CHAN_QUARTER |
-	        (chanFlags & (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_5GHZ)));
 	LIST_FOREACH(nb, bands, next) {
 		b = nb->band;
 		if (verbose) {
@@ -1831,63 +1875,80 @@
 			putchar('\n');
 		}
 		prev = NULL;
-		for (freq = b->freqStart; freq <= b->freqEnd; freq += b->chanSep) {
-			uint32_t flags = nb->flags | b->flags;
-
-			/* check if device can operate on this frequency */
+		for (freq = b->freqStart + lo_adj;
+		     freq <= b->freqEnd + hi_adj; freq += b->chanSep) {
+			/*
+			 * Construct flags for the new channel.  We take
+			 * the attributes from the band descriptions except
+			 * for HT40 which is enabled generically (i.e. +/-
+			 * extension channel) in the band description and
+			 * then constrained according by channel separation.
+			 */
+			flags = nb->flags | b->flags;
+			if (flags & IEEE80211_CHAN_HT) {
+				/*
+				 * HT channels are generated specially; we're
+				 * called to add HT20, HT40+, and HT40- chan's
+				 * so we need to expand only band specs for
+				 * the HT channel type being added.
+				 */
+				if ((chanFlags & IEEE80211_CHAN_HT20) &&
+				    (flags & IEEE80211_CHAN_HT20) == 0) {
+					if (verbose)
+						printf("%u: skip, not an "
+						    "HT20 channel\n", freq);
+					continue;
+				}
+				if ((chanFlags & IEEE80211_CHAN_HT40) &&
+				    (flags & IEEE80211_CHAN_HT40) == 0) {
+					if (verbose)
+						printf("%u: skip, not an "
+						    "HT40 channel\n", freq);
+					continue;
+				}
+				/*
+				 * DFS and HT40 don't mix.  This should be
+				 * expressed in the regdomain database but
+				 * just in case enforce it here.
+				 */
+				if ((chanFlags & IEEE80211_CHAN_HT40) &&
+				    (flags & IEEE80211_CHAN_DFS)) {
+					if (verbose)
+						printf("%u: skip, HT40+DFS "
+						    "not permitted\n", freq);
+					continue;
+				}
+				/* NB: HT attribute comes from caller */
+				flags &= ~IEEE80211_CHAN_HT;
+				flags |= chanFlags & IEEE80211_CHAN_HT;
+			}
 			/*
-			 * XXX GSM frequency mapping is handled in the kernel
-			 * so we cannot find them in the calibration table;
-			 * just construct the list and the kernel will reject
-			 * if it's wrong.
+			 * Check if device can operate on this frequency.
 			 */
-			if (chanlookup(avail->ic_chans, avail->ic_nchans, freq, chanFlags) == NULL &&
-			    (flags & IEEE80211_CHAN_GSM) == 0) {
+			if (!checkchan(avail, freq, flags)) {
 				if (verbose) {
 					printf("%u: skip, ", freq);
-					printb("flags", chanFlags,
+					printb("flags", flags,
 					    IEEE80211_CHAN_BITS);
 					printf(" not available\n");
 				}
 				continue;
 			}
-			if ((flags & IEEE80211_CHAN_HALF) && !hasHalfChans) {
+			if ((flags & REQ_ECM) && !reg->ecm) {
 				if (verbose)
-					printf("%u: skip, device does not "
-					    "support half-rate channel\n",
-					    freq);
+					printf("%u: skip, ECM channel\n", freq);
 				continue;
 			}
-			if ((flags & IEEE80211_CHAN_QUARTER) &&
-			    !hasQuarterChans) {
+			if ((flags & REQ_INDOOR) && reg->location == 'O') {
 				if (verbose)
-					printf("%u: skip, device does not "
-					    "support quarter-rate channel\n",
+					printf("%u: skip, indoor channel\n",
 					    freq);
 				continue;
 			}
-			if ((flags & IEEE80211_CHAN_HT20) &&
-			    (chanFlags & IEEE80211_CHAN_HT20) == 0) {
-				if (verbose)
-					printf("%u: skip, device does not "
-					    "support HT20 operation\n", freq);
-				continue;
-			}
-			if ((flags & IEEE80211_CHAN_HT40) &&
-			    (chanFlags & IEEE80211_CHAN_HT40) == 0) {
-				if (verbose)

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


More information about the p4-projects mailing list