Date: Mon, 2 Jul 2007 13:19:01 GMT From: Sepherosa Ziehau <sephe@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 122717 for review Message-ID: <200707021319.l62DJ1r7033542@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=122717 Change 122717 by sephe@sephe_enigma:sam_wifi on 2007/07/02 13:18:05 IFC @122706 Affected files ... .. //depot/projects/wifi/ObsoleteFiles.inc#19 integrate .. //depot/projects/wifi/UPDATING#34 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipfstat.c#5 integrate .. //depot/projects/wifi/contrib/less/main.c#6 integrate .. //depot/projects/wifi/contrib/less/screen.c#5 integrate .. //depot/projects/wifi/contrib/netcat/netcat.c#4 integrate .. //depot/projects/wifi/contrib/telnet/telnet/externs.h#2 integrate .. //depot/projects/wifi/contrib/traceroute/traceroute.c#7 integrate .. //depot/projects/wifi/etc/mtree/BSD.include.dist#18 integrate .. //depot/projects/wifi/include/Makefile#25 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_fd.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_file.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_filename.c#4 integrate .. //depot/projects/wifi/lib/libc/arm/sys/sbrk.S#3 integrate .. //depot/projects/wifi/lib/libc/net/sctp_sys_calls.c#7 integrate .. //depot/projects/wifi/lib/libgssapi/gss_accept_sec_context.c#3 integrate .. //depot/projects/wifi/lib/libgssapi/gss_display_status.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_export_name.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_indicate_mechs.c#2 integrate .. //depot/projects/wifi/lib/libgssapi/gss_init_sec_context.c#4 integrate .. //depot/projects/wifi/lib/libipsec/Makefile#6 integrate .. //depot/projects/wifi/lib/libipsec/ipsec_dump_policy.c#2 integrate .. //depot/projects/wifi/lib/libipsec/ipsec_get_policylen.c#2 integrate .. //depot/projects/wifi/lib/libipsec/ipsec_set_policy.3#5 integrate .. //depot/projects/wifi/lib/libipsec/ipsec_strerror.3#4 integrate .. //depot/projects/wifi/lib/libipsec/ipsec_strerror.c#2 integrate .. //depot/projects/wifi/lib/libipsec/pfkey.c#2 integrate .. //depot/projects/wifi/lib/libipsec/pfkey_dump.c#3 integrate .. //depot/projects/wifi/lib/libipsec/policy_parse.y#2 integrate .. //depot/projects/wifi/lib/libipsec/policy_token.l#2 integrate .. //depot/projects/wifi/lib/libipsec/test-policy.c#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#23 integrate .. //depot/projects/wifi/release/scripts/src-install.sh#2 integrate .. //depot/projects/wifi/rescue/rescue/Makefile#18 integrate .. //depot/projects/wifi/sbin/Makefile#14 integrate .. //depot/projects/wifi/sbin/mount/mount.8#10 integrate .. //depot/projects/wifi/sbin/mount/mount.c#13 integrate .. //depot/projects/wifi/sbin/mount_umapfs/Makefile#2 delete .. //depot/projects/wifi/sbin/mount_umapfs/mount_umapfs.8#3 delete .. //depot/projects/wifi/sbin/mount_umapfs/mount_umapfs.c#4 delete .. //depot/projects/wifi/sbin/mount_umapfs/sample.group.mapfile#2 delete .. //depot/projects/wifi/sbin/mount_umapfs/sample.user.mapfile#2 delete .. //depot/projects/wifi/sbin/mount_umapfs/umap_manual#2 delete .. //depot/projects/wifi/sbin/ping/ping.c#7 integrate .. //depot/projects/wifi/sbin/ping6/Makefile#4 integrate .. //depot/projects/wifi/sbin/ping6/ping6.c#5 integrate .. //depot/projects/wifi/sbin/setkey/Makefile#3 integrate .. //depot/projects/wifi/sbin/setkey/parse.y#2 integrate .. //depot/projects/wifi/sbin/setkey/setkey.c#2 integrate .. //depot/projects/wifi/sbin/setkey/test-pfkey.c#2 integrate .. //depot/projects/wifi/sbin/setkey/test-policy.c#2 integrate .. //depot/projects/wifi/sbin/setkey/token.l#3 integrate .. //depot/projects/wifi/share/Makefile#5 integrate .. //depot/projects/wifi/share/man/man4/Makefile#40 integrate .. //depot/projects/wifi/share/man/man4/ath.4#18 integrate .. //depot/projects/wifi/share/man/man4/bce.4#5 integrate .. //depot/projects/wifi/share/man/man4/ieee80211.4#3 integrate .. //depot/projects/wifi/share/man/man4/mac.4#2 integrate .. //depot/projects/wifi/share/man/man4/msk.4#3 integrate .. //depot/projects/wifi/share/man/man4/nxge.4#1 branch .. //depot/projects/wifi/share/man/man4/pcm.4#9 integrate .. //depot/projects/wifi/share/man/man4/tty.4#3 integrate .. //depot/projects/wifi/share/man/man4/ucom.4#4 integrate .. //depot/projects/wifi/share/man/man4/uhid.4#4 integrate .. //depot/projects/wifi/share/man/man4/wi.4#11 integrate .. //depot/projects/wifi/share/man/man7/hier.7#12 integrate .. //depot/projects/wifi/share/man/man9/ieee80211_ioctl.9#4 integrate .. //depot/projects/wifi/share/man/man9/priv.9#4 integrate .. //depot/projects/wifi/share/man/man9/suser.9#7 integrate .. //depot/projects/wifi/share/misc/committers-ports.dot#8 integrate .. //depot/projects/wifi/share/misc/committers-src.dot#5 integrate .. //depot/projects/wifi/share/mk/bsd.own.mk#11 integrate .. //depot/projects/wifi/share/mk/sys.mk#8 integrate .. //depot/projects/wifi/sys/Makefile#9 integrate .. //depot/projects/wifi/sys/amd64/amd64/pmap.c#22 integrate .. //depot/projects/wifi/sys/amd64/conf/GENERIC#24 integrate .. //depot/projects/wifi/sys/amd64/conf/NOTES#22 integrate .. //depot/projects/wifi/sys/boot/forth/loader.conf#17 integrate .. //depot/projects/wifi/sys/cam/cam_xpt.c#23 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_da.c#17 integrate .. //depot/projects/wifi/sys/conf/NOTES#44 integrate .. //depot/projects/wifi/sys/conf/files#57 integrate .. //depot/projects/wifi/sys/conf/options#37 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi.c#29 integrate .. //depot/projects/wifi/sys/dev/ata/ata-all.h#18 integrate .. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#28 integrate .. //depot/projects/wifi/sys/dev/ata/ata-disk.c#19 integrate .. //depot/projects/wifi/sys/dev/ata/ata-pci.h#20 integrate .. //depot/projects/wifi/sys/dev/ata/ata-usb.c#4 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#147 edit .. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#17 integrate .. //depot/projects/wifi/sys/dev/isp/isp.c#12 integrate .. //depot/projects/wifi/sys/dev/isp/isp_pci.c#15 integrate .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#55 integrate .. //depot/projects/wifi/sys/dev/nxge/if_nxge.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/if_nxge.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/build-version.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/version.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xge-debug.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xge-defs.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xge-list.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xge-os-pal.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xge-os-template.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xge-queue.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xgehal-channel.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xgehal-config.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xgehal-device.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xgehal-driver.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xgehal-event.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xgehal-fifo.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xgehal-mgmt.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xgehal-mgmtaux.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xgehal-mm.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xgehal-regs.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xgehal-ring.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xgehal-stats.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xgehal-types.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/include/xgehal.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/xge-osdep.h#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xge-queue.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xgehal-channel-fp.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xgehal-channel.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xgehal-config.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xgehal-device-fp.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xgehal-device.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xgehal-driver.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xgehal-fifo.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xgehal-mgmt.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xgehal-mm.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xgehal-ring-fp.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xgehal-ring.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgehal/xgehal-stats.c#1 branch .. //depot/projects/wifi/sys/dev/nxge/xgell-version.h#1 branch .. //depot/projects/wifi/sys/dev/ral/rt2560.c#23 integrate .. //depot/projects/wifi/sys/dev/ral/rt2661.c#15 integrate .. //depot/projects/wifi/sys/dev/rp/rp.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pci/hda/hdac.c#13 integrate .. //depot/projects/wifi/sys/dev/sound/pci/hda/hdac_private.h#5 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/ac97_patch.c#8 integrate .. //depot/projects/wifi/sys/dev/sym/sym_hipd.c#13 integrate .. //depot/projects/wifi/sys/dev/usb/if_aue.c#17 integrate .. //depot/projects/wifi/sys/dev/usb/if_axe.c#23 integrate .. //depot/projects/wifi/sys/dev/usb/if_axereg.h#11 integrate .. //depot/projects/wifi/sys/dev/usb/if_cdce.c#12 integrate .. //depot/projects/wifi/sys/dev/usb/if_cue.c#16 integrate .. //depot/projects/wifi/sys/dev/usb/if_kue.c#16 integrate .. //depot/projects/wifi/sys/dev/usb/if_ural.c#32 integrate .. //depot/projects/wifi/sys/dev/usb/uark.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/ucom.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/ugen.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/uhub.c#13 integrate .. //depot/projects/wifi/sys/dev/usb/ukbd.c#13 integrate .. //depot/projects/wifi/sys/dev/usb/umass.c#17 integrate .. //depot/projects/wifi/sys/dev/usb/umodem.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/ums.c#15 integrate .. //depot/projects/wifi/sys/dev/usb/usb.h#9 integrate .. //depot/projects/wifi/sys/dev/usb/usb_port.h#13 integrate .. //depot/projects/wifi/sys/dev/usb/usb_quirks.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/usb_quirks.h#7 integrate .. //depot/projects/wifi/sys/dev/usb/usb_subr.c#15 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#29 integrate .. //depot/projects/wifi/sys/dev/usb/usbdi.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/usbdi.h#10 integrate .. //depot/projects/wifi/sys/dev/wi/if_wi.c#38 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_uma.c#2 delete .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_uma.h#2 delete .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/wifi/sys/fs/umapfs/umap.h#4 delete .. //depot/projects/wifi/sys/fs/umapfs/umap_subr.c#4 delete .. //depot/projects/wifi/sys/fs/umapfs/umap_vfsops.c#10 delete .. //depot/projects/wifi/sys/fs/umapfs/umap_vnops.c#9 delete .. //depot/projects/wifi/sys/i386/conf/GENERIC#22 integrate .. //depot/projects/wifi/sys/i386/conf/NOTES#27 integrate .. //depot/projects/wifi/sys/i386/i386/pmap.c#25 integrate .. //depot/projects/wifi/sys/kern/Make.tags.inc#5 integrate .. //depot/projects/wifi/sys/kern/Makefile#4 integrate .. //depot/projects/wifi/sys/kern/kern_malloc.c#17 integrate .. //depot/projects/wifi/sys/kern/kern_rwlock.c#9 integrate .. //depot/projects/wifi/sys/kern/kern_timeout.c#10 integrate .. //depot/projects/wifi/sys/kern/tty.c#16 integrate .. //depot/projects/wifi/sys/modules/Makefile#41 integrate .. //depot/projects/wifi/sys/modules/acpi/acpi_video/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/ath_rate_amrr/Makefile#5 integrate .. //depot/projects/wifi/sys/modules/ath_rate_onoe/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/i2c/controllers/alpm/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/i2c/controllers/viapm/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/nxge/Makefile#1 branch .. //depot/projects/wifi/sys/modules/tmpfs/Makefile#2 integrate .. //depot/projects/wifi/sys/modules/umapfs/Makefile#2 delete .. //depot/projects/wifi/sys/net/bridgestp.c#12 integrate .. //depot/projects/wifi/sys/net/if_gre.c#11 integrate .. //depot/projects/wifi/sys/net80211/_ieee80211.h#25 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#32 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#110 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#15 integrate .. //depot/projects/wifi/sys/netatalk/aarp.h#4 integrate .. //depot/projects/wifi/sys/netatalk/ddp.h#4 integrate .. //depot/projects/wifi/sys/netatm/atm_cm.c#5 integrate .. //depot/projects/wifi/sys/netatm/ipatm/ipatm_event.c#3 integrate .. //depot/projects/wifi/sys/netatm/spans/spans_proto.c#3 integrate .. //depot/projects/wifi/sys/netatm/uni/sscf_uni_lower.c#3 integrate .. //depot/projects/wifi/sys/netatm/uni/uniarp.c#4 integrate .. //depot/projects/wifi/sys/netatm/uni/uniarp_timer.c#3 integrate .. //depot/projects/wifi/sys/netatm/uni/unisig_decode.h#3 integrate .. //depot/projects/wifi/sys/netatm/uni/unisig_proto.c#3 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#12 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#8 integrate .. //depot/projects/wifi/sys/netgraph/ng_parse.c#6 integrate .. //depot/projects/wifi/sys/netinet/in_pcb.c#18 integrate .. //depot/projects/wifi/sys/netinet/in_pcb.h#11 integrate .. //depot/projects/wifi/sys/netinet/in_proto.c#11 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#28 integrate .. //depot/projects/wifi/sys/netinet/ip_icmp.c#12 integrate .. //depot/projects/wifi/sys/netinet/ip_input.c#19 integrate .. //depot/projects/wifi/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/wifi/sys/netinet/ip_output.c#20 integrate .. //depot/projects/wifi/sys/netinet/raw_ip.c#17 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.c#15 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.c#17 integrate .. //depot/projects/wifi/sys/netinet/sctp_os_bsd.h#13 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#18 integrate .. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#15 integrate .. //depot/projects/wifi/sys/netinet/sctputil.c#17 integrate .. //depot/projects/wifi/sys/netinet/tcp_input.c#29 integrate .. //depot/projects/wifi/sys/netinet/tcp_output.c#18 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#33 integrate .. //depot/projects/wifi/sys/netinet/tcp_syncache.c#20 integrate .. //depot/projects/wifi/sys/netinet/udp_usrreq.c#23 integrate .. //depot/projects/wifi/sys/netinet6/ah.h#3 delete .. //depot/projects/wifi/sys/netinet6/ah6.h#3 delete .. //depot/projects/wifi/sys/netinet6/ah_aesxcbcmac.c#5 delete .. //depot/projects/wifi/sys/netinet6/ah_aesxcbcmac.h#3 delete .. //depot/projects/wifi/sys/netinet6/ah_core.c#8 delete .. //depot/projects/wifi/sys/netinet6/ah_input.c#4 delete .. //depot/projects/wifi/sys/netinet6/ah_output.c#5 delete .. //depot/projects/wifi/sys/netinet6/esp.h#3 delete .. //depot/projects/wifi/sys/netinet6/esp6.h#3 delete .. //depot/projects/wifi/sys/netinet6/esp_aesctr.c#6 delete .. //depot/projects/wifi/sys/netinet6/esp_aesctr.h#3 delete .. //depot/projects/wifi/sys/netinet6/esp_camellia.c#2 delete .. //depot/projects/wifi/sys/netinet6/esp_camellia.h#2 delete .. //depot/projects/wifi/sys/netinet6/esp_core.c#6 delete .. //depot/projects/wifi/sys/netinet6/esp_input.c#4 delete .. //depot/projects/wifi/sys/netinet6/esp_rijndael.c#4 delete .. //depot/projects/wifi/sys/netinet6/esp_rijndael.h#3 delete .. //depot/projects/wifi/sys/netinet6/icmp6.c#17 integrate .. //depot/projects/wifi/sys/netinet6/in6.h#10 integrate .. //depot/projects/wifi/sys/netinet6/in6_pcb.c#12 integrate .. //depot/projects/wifi/sys/netinet6/in6_proto.c#12 integrate .. //depot/projects/wifi/sys/netinet6/ip6_forward.c#7 integrate .. //depot/projects/wifi/sys/netinet6/ip6_input.c#12 integrate .. //depot/projects/wifi/sys/netinet6/ip6_ipsec.c#1 branch .. //depot/projects/wifi/sys/netinet6/ip6_ipsec.h#1 branch .. //depot/projects/wifi/sys/netinet6/ip6_output.c#16 integrate .. //depot/projects/wifi/sys/netinet6/ipcomp.h#3 delete .. //depot/projects/wifi/sys/netinet6/ipcomp6.h#3 delete .. //depot/projects/wifi/sys/netinet6/ipcomp_core.c#4 delete .. //depot/projects/wifi/sys/netinet6/ipcomp_input.c#5 delete .. //depot/projects/wifi/sys/netinet6/ipcomp_output.c#4 delete .. //depot/projects/wifi/sys/netinet6/ipsec.c#10 delete .. //depot/projects/wifi/sys/netinet6/ipsec.h#3 delete .. //depot/projects/wifi/sys/netinet6/ipsec6.h#3 delete .. //depot/projects/wifi/sys/netinet6/nd6.c#14 integrate .. //depot/projects/wifi/sys/netinet6/nd6_nbr.c#13 integrate .. //depot/projects/wifi/sys/netinet6/raw_ip6.c#15 integrate .. //depot/projects/wifi/sys/netinet6/sctp6_usrreq.c#14 integrate .. //depot/projects/wifi/sys/netinet6/udp6_output.c#8 integrate .. //depot/projects/wifi/sys/netinet6/udp6_usrreq.c#10 integrate .. //depot/projects/wifi/sys/netipsec/ipsec.c#9 integrate .. //depot/projects/wifi/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/wifi/sys/netipsec/ipsec6.h#3 integrate .. //depot/projects/wifi/sys/netipsec/ipsec_mbuf.c#4 integrate .. //depot/projects/wifi/sys/netipsec/ipsec_output.c#5 integrate .. //depot/projects/wifi/sys/netipsec/key.c#6 integrate .. //depot/projects/wifi/sys/netipsec/key_debug.c#4 integrate .. //depot/projects/wifi/sys/netipsec/keysock.c#7 integrate .. //depot/projects/wifi/sys/netipsec/xform_ah.c#4 integrate .. //depot/projects/wifi/sys/netkey/key.c#8 delete .. //depot/projects/wifi/sys/netkey/key.h#4 delete .. //depot/projects/wifi/sys/netkey/key_debug.c#4 delete .. //depot/projects/wifi/sys/netkey/key_debug.h#3 delete .. //depot/projects/wifi/sys/netkey/key_var.h#3 delete .. //depot/projects/wifi/sys/netkey/keydb.c#5 delete .. //depot/projects/wifi/sys/netkey/keydb.h#4 delete .. //depot/projects/wifi/sys/netkey/keysock.c#7 delete .. //depot/projects/wifi/sys/netkey/keysock.h#4 delete .. //depot/projects/wifi/sys/security/audit/audit.c#11 integrate .. //depot/projects/wifi/sys/security/audit/audit.h#6 integrate .. //depot/projects/wifi/sys/security/audit/audit_arg.c#8 integrate .. //depot/projects/wifi/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/wifi/sys/security/audit/audit_bsm_token.c#5 integrate .. //depot/projects/wifi/sys/security/audit/audit_syscalls.c#10 integrate .. //depot/projects/wifi/sys/security/mac/mac_audit.c#2 integrate .. //depot/projects/wifi/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/wifi/sys/security/mac/mac_policy.h#5 integrate .. //depot/projects/wifi/sys/security/mac_stub/mac_stub.c#14 integrate .. //depot/projects/wifi/sys/security/mac_test/mac_test.c#13 integrate .. //depot/projects/wifi/sys/sys/_rwlock.h#4 integrate .. //depot/projects/wifi/sys/sys/rwlock.h#7 integrate .. //depot/projects/wifi/sys/ufs/ufs/dir.h#3 integrate .. //depot/projects/wifi/sys/vm/swap_pager.c#21 integrate .. //depot/projects/wifi/sys/vm/vm_pageout.c#19 integrate .. //depot/projects/wifi/tools/regression/fsx/fsx.c#3 integrate .. //depot/projects/wifi/tools/regression/lib/libc/nss/test-gethostby.c#2 integrate .. //depot/projects/wifi/tools/regression/lib/libc/nss/test-gethostby.t#2 integrate .. //depot/projects/wifi/tools/regression/tmpfs/Makefile#2 integrate .. //depot/projects/wifi/tools/regression/tmpfs/t_id_gen#2 delete .. //depot/projects/wifi/tools/tools/README#12 integrate .. //depot/projects/wifi/tools/tools/nxge/Makefile#1 branch .. //depot/projects/wifi/tools/tools/nxge/xge_cmn.h#1 branch .. //depot/projects/wifi/tools/tools/nxge/xge_info.c#1 branch .. //depot/projects/wifi/tools/tools/nxge/xge_info.h#1 branch .. //depot/projects/wifi/tools/tools/nxge/xge_log.c#1 branch .. //depot/projects/wifi/tools/tools/nxge/xge_log.h#1 branch .. //depot/projects/wifi/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles#2 integrate .. //depot/projects/wifi/tools/tools/tinybsd/conf/default/tinybsd.basefiles#2 integrate .. //depot/projects/wifi/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles#2 integrate .. //depot/projects/wifi/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles#2 integrate .. //depot/projects/wifi/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles#2 integrate .. //depot/projects/wifi/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles#2 integrate .. //depot/projects/wifi/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles#2 integrate .. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.freebsd#25 integrate .. //depot/projects/wifi/usr.bin/netstat/Makefile#11 integrate .. //depot/projects/wifi/usr.bin/netstat/ipsec.c#5 integrate .. //depot/projects/wifi/usr.bin/netstat/main.c#12 integrate .. //depot/projects/wifi/usr.bin/netstat/netstat.h#10 integrate .. //depot/projects/wifi/usr.bin/netstat/pfkey.c#4 integrate .. //depot/projects/wifi/usr.bin/telnet/Makefile#6 integrate .. //depot/projects/wifi/usr.bin/truss/amd64-fbsd.c#5 integrate .. //depot/projects/wifi/usr.bin/truss/i386-fbsd.c#5 integrate .. //depot/projects/wifi/usr.bin/truss/i386-linux.c#5 integrate .. //depot/projects/wifi/usr.bin/truss/ia64-fbsd.c#5 integrate .. //depot/projects/wifi/usr.bin/truss/main.c#6 integrate .. //depot/projects/wifi/usr.bin/truss/powerpc-fbsd.c#3 integrate .. //depot/projects/wifi/usr.bin/truss/setup.c#5 integrate .. //depot/projects/wifi/usr.bin/truss/sparc64-fbsd.c#5 integrate .. //depot/projects/wifi/usr.bin/usbhidaction/usbhidaction.1#2 integrate .. //depot/projects/wifi/usr.bin/usbhidaction/usbhidaction.c#2 integrate .. //depot/projects/wifi/usr.sbin/Makefile#22 integrate .. //depot/projects/wifi/usr.sbin/inetd/Makefile#5 integrate .. //depot/projects/wifi/usr.sbin/inetd/inetd.c#8 integrate .. //depot/projects/wifi/usr.sbin/portsnap/phttpget/phttpget.c#8 integrate .. //depot/projects/wifi/usr.sbin/rrenumd/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/rrenumd/rrenumd.c#2 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/dist.c#9 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/dist.h#4 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/help/distributions.hlp#3 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/help/fixit.hlp#3 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/help/media.hlp#2 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/help/network_device.hlp#2 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/help/options.hlp#3 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/help/securelevel.hlp#3 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/help/shortcuts.hlp#3 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/index.c#10 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/install.c#8 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/menus.c#15 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/sysinstall.8#11 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/sysinstall.h#8 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/system.c#6 integrate .. //depot/projects/wifi/usr.sbin/traceroute6/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/traceroute6/traceroute6.c#4 integrate .. //depot/projects/wifi/usr.sbin/wicontrol/Makefile#2 delete .. //depot/projects/wifi/usr.sbin/wicontrol/wicontrol.8#6 delete .. //depot/projects/wifi/usr.sbin/wicontrol/wicontrol.c#4 delete Differences ... ==== //depot/projects/wifi/ObsoleteFiles.inc#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.96 2007/06/18 18:50:59 rafan Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.101 2007/07/01 20:05:19 thompsa 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,34 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070701: KAME IPSec removal +OLD_FILES+=usr/include/netinet6/ah.h +OLD_FILES+=usr/include/netinet6/ah6.h +OLD_FILES+=usr/include/netinet6/ah_aesxcbcmac.h +OLD_FILES+=usr/include/netinet6/esp.h +OLD_FILES+=usr/include/netinet6/esp6.h +OLD_FILES+=usr/include/netinet6/esp_aesctr.h +OLD_FILES+=usr/include/netinet6/esp_camellia.h +OLD_FILES+=usr/include/netinet6/esp_rijndael.h +OLD_FILES+=usr/include/netinet6/ipsec.h +OLD_FILES+=usr/include/netinet6/ipsec6.h +OLD_FILES+=usr/include/netinet6/ipcomp.h +OLD_FILES+=usr/include/netinet6/ipcomp6.h +OLD_FILES+=usr/include/netkey/key.h +OLD_FILES+=usr/include/netkey/key_debug.h +OLD_FILES+=usr/include/netkey/key_var.h +OLD_FILES+=usr/include/netkey/keydb.h +OLD_FILES+=usr/include/netkey/keysock.h +OLD_DIRS+=usr/include/netkey +# 20070701: remove wicontrol +OLD_FILES+=usr/sbin/wicontrol +OLD_FILES+=usr/share/man/man8/wicontrol.8.gz +# 20070625: umapfs removal +OLD_FILES+=rescue/mount_umapfs +OLD_FILES+=sbin/mount_umapfs +OLD_FILES+=usr/include/fs/umapfs/umap.h +OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz +OLD_DIRS+=usr/include/fs/umapfs # 20070618: shared library version bump OLD_LIBS+=lib/libalias.so.5 OLD_LIBS+=lib/libbsnmp.so.3 @@ -3583,7 +3611,6 @@ # - usr/share/tmac/mm/locale # - usr/share/tmac/mm/se_locale # - var/yp/Makefile - # 20070519: GCC 4.2 OLD_LIBS+=usr/lib/libg2c.a OLD_LIBS+=usr/lib/libg2c.so ==== //depot/projects/wifi/UPDATING#34 (text+ko) ==== @@ -21,6 +21,19 @@ developers choose to disable these features on build machines to maximize performance. +20070701: + Remove KAME IPsec in favor of FAST_IPSEC, which is now the + only IPsec supported by FreeBSD. The new IPsec stack + supports both IPv4 and IPv6. The kernel option will change + after the code changes have settled in. For now the kernel + option IPSEC is deprecated and FAST_IPSEC is the only option, that + will change after some settling time. + +20070701: + The wicontrol(8) utility has been removed from the base system. wi(4) + cards should be configured using ifconfig(8), see the man page for more + information. + 20070612: By default, /etc/rc.d/sendmail no longer rebuilds the aliases database if it is missing or older than the aliases file. If @@ -857,4 +870,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.497 2007/06/12 17:33:56 gshapiro Exp $ +$FreeBSD: src/UPDATING,v 1.499 2007/07/01 11:38:26 gnn Exp $ ==== //depot/projects/wifi/contrib/ipfilter/tools/ipfstat.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.6 2007/06/24 16:39:12 darrenr Exp $ */ /* * Copyright (C) 2002-2006 by Darren Reed. @@ -1811,7 +1811,7 @@ *port = -1; } else if (!sscanf(comma + 1, "%d", port) || (*port < 0) || (*port > 65535)) { - fprintf(stderr, "Invalid port specfication in %s\n", + fprintf(stderr, "Invalid port specification in %s\n", argument); free(s); exit(-2); @@ -1823,6 +1823,7 @@ /* get ip address */ if (!strcasecmp(s, "any")) { ip->in4.s_addr = INADDR_ANY; + ok = 1; #ifdef USE_INET6 ip->in6 = in6addr_any; } else if (use_inet6 && inet_pton(AF_INET6, s, &ip->in6)) { ==== //depot/projects/wifi/contrib/less/main.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/main.c,v 1.8 2007/06/21 10:39:24 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/main.c,v 1.9 2007/06/23 15:28:00 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -59,6 +59,7 @@ extern int missing_cap; extern int know_dumb; extern int quit_if_one_screen; +extern int no_init; extern int pr_type; @@ -165,7 +166,7 @@ } if (less_is_more && get_quit_at_eof()) - quit_if_one_screen = TRUE; + no_init = quit_if_one_screen = TRUE; #if EDITOR editor = lgetenv("VISUAL"); ==== //depot/projects/wifi/contrib/less/screen.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/screen.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/screen.c,v 1.8 2007/06/23 15:28:00 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -228,8 +228,6 @@ extern int no_back_scroll; extern int swindow; extern int no_init; -extern int quit_at_eof; -extern int less_is_more; extern int no_keypad; extern int sigs; extern int wscroll; @@ -1211,19 +1209,11 @@ if (sc_e_keypad == NULL) sc_e_keypad = ""; - /* - * This loses for terminals with termcap entries with ti/te strings - * that switch to/from an alternate screen, and we're in quit_at_eof - * (eg, more(1)). - */ - if (!quit_at_eof && !less_is_more) { - sc_init = ltgetstr("ti", &sp); - sc_deinit = ltgetstr("te", &sp); - } - + sc_init = ltgetstr("ti", &sp); if (sc_init == NULL) sc_init = ""; + sc_deinit= ltgetstr("te", &sp); if (sc_deinit == NULL) sc_deinit = ""; ==== //depot/projects/wifi/contrib/netcat/netcat.c#4 (text+ko) ==== @@ -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.5 2007/03/28 01:57:03 delphij Exp $ + * $FreeBSD: src/contrib/netcat/netcat.c,v 1.6 2007/07/01 12:08:04 gnn Exp $ */ /* @@ -42,7 +42,7 @@ #include <netinet/in.h> #include <netinet/in_systm.h> #ifdef IPSEC -#include <netinet6/ipsec.h> +#include <netipsec/ipsec.h> #endif #include <netinet/tcp.h> #include <netinet/ip.h> ==== //depot/projects/wifi/contrib/telnet/telnet/externs.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)externs.h 8.3 (Berkeley) 5/30/95 - * $FreeBSD: src/contrib/telnet/telnet/externs.h,v 1.10 2003/05/11 18:17:00 markm Exp $ + * $FreeBSD: src/contrib/telnet/telnet/externs.h,v 1.11 2007/07/01 12:08:04 gnn Exp $ */ #ifndef BSD @@ -72,7 +72,7 @@ #include <string.h> #if defined(IPSEC) -#include <netinet6/ipsec.h> +#include <netipsec/ipsec.h> #if defined(IPSEC_POLICY_IPSEC) extern char *ipsec_policy_in; extern char *ipsec_policy_out; ==== //depot/projects/wifi/contrib/traceroute/traceroute.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.33 2007/04/30 19:08:12 maxim Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.34 2007/07/01 12:08:05 gnn Exp $"; #endif /* @@ -228,7 +228,7 @@ #ifdef IPSEC #include <net/route.h> -#include <netinet6/ipsec.h> /* XXX */ +#include <netipsec/ipsec.h> /* XXX */ #endif /* IPSEC */ #include <ctype.h> ==== //depot/projects/wifi/etc/mtree/BSD.include.dist#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.114 2007/06/01 18:53:36 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.116 2007/07/01 12:08:05 gnn Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -146,8 +146,6 @@ .. udf .. - umapfs - .. unionfs .. .. @@ -233,8 +231,6 @@ .. netipx .. - netkey - .. netnatm api .. ==== //depot/projects/wifi/include/Makefile#25 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.270 2007/04/13 01:39:33 pjd Exp $ +# $FreeBSD: src/include/Makefile,v 1.272 2007/07/01 12:08:05 gnn Exp $ # # Doing a "make install" builds /usr/include. @@ -34,7 +34,7 @@ termios.h ucontext.h LDIRS= bsm cam geom net net80211 netatalk netatm netgraph netinet netinet6 \ - netipsec ${_netipx} netkey netnatm ${_netncp} netsmb \ + netipsec ${_netipx} netnatm ${_netncp} netsmb \ nfs nfsclient nfsserver \ pccard sys vm @@ -43,8 +43,7 @@ dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ - ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ - fs/unionfs \ + ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ ==== //depot/projects/wifi/lib/libarchive/archive_read_open_fd.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.12 2007/06/18 00:36:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.13 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -78,7 +78,8 @@ return (ARCHIVE_FATAL); } mine->fd = fd; - mine->can_skip = 1; + /* lseek() hardly ever works, so disable it by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -93,8 +94,18 @@ return (ARCHIVE_FATAL); } - if (S_ISREG(st.st_mode)) + if (S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* + * Enabling skip here is a performance optimization for + * anything that supports lseek(). On FreeBSD, only + * regular files and raw disk devices support lseek() and + * there's no portable way to determine if a device is + * a raw disk device, so we only enable this optimization + * for regular files. + */ + mine->can_skip = 1; + } return (ARCHIVE_OK); } ==== //depot/projects/wifi/lib/libarchive/archive_read_open_file.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.19 2007/01/09 08:05:55 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.20 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -51,6 +51,7 @@ FILE *f; size_t block_size; void *buffer; + char can_skip; }; static int file_close(struct archive *, void *); @@ -80,6 +81,8 @@ return (ARCHIVE_FATAL); } mine->f = f; + /* Suppress skip by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -95,8 +98,11 @@ * it's not a file. (FILE * objects can wrap many kinds * of I/O streams.) */ - if (fstat(fileno(mine->f), &st) == 0 && S_ISREG(st.st_mode)) + if (fstat(fileno(mine->f), &st) == 0 && S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* Enable the seek optimization for regular files. */ + mine->can_skip = 1; + } return (ARCHIVE_OK); } @@ -125,21 +131,25 @@ { struct read_FILE_data *mine = (struct read_FILE_data *)client_data; + (void)a; /* UNUSED */ + /* - * Note: the 'fd' and 'filename' versions round the request - * down to a multiple of the block size to ensure proper - * operation on block-oriented media such as tapes. But stdio - * doesn't work with such media (it doesn't ensure blocking), - * so we don't need to bother. + * If we can't skip, return 0 as the amount we did step and + * the caller will work around by reading and discarding. */ + if (!mine->can_skip) + return (0); + if (request == 0) + return (0); + #if HAVE_FSEEKO if (fseeko(mine->f, request, SEEK_CUR) != 0) #else if (fseek(mine->f, request, SEEK_CUR) != 0) #endif { - archive_set_error(a, errno, "Error skipping forward"); - return (ARCHIVE_FATAL); + mine->can_skip = 0; + return (0); } return (request); } ==== //depot/projects/wifi/lib/libarchive/archive_read_open_filename.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.19 2007/06/18 00:36:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.20 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -96,7 +96,8 @@ mine->block_size = block_size; mine->buffer = NULL; mine->fd = -1; - mine->can_skip = 1; + /* lseek() almost never works; disable it by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -123,8 +124,19 @@ if (fstat(mine->fd, &st) == 0) { /* If we're reading a file from disk, ensure that we don't overwrite it with an extracted file. */ - if (S_ISREG(st.st_mode)) + if (S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* + * Enabling skip here is a performance + * optimization for anything that supports + * lseek(). On FreeBSD, only regular files + * and raw disk devices support lseek() and + * there's no portable way to determine if a + * device is a raw disk device, so we only + * enable this optimization for regular files. + */ + mine->can_skip = 1; + } /* Remember mode so close can decide whether to flush. */ mine->st_mode = st.st_mode; } else { ==== //depot/projects/wifi/lib/libc/arm/sys/sbrk.S#3 (text+ko) ==== @@ -32,10 +32,10 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/arm/sys/sbrk.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/sys/sbrk.S,v 1.3 2007/06/27 02:45:37 kan Exp $"); #include "SYS.h" - .globl _C_LABEL(end) + .globl _C_LABEL(_end) #ifdef WEAK_ALIAS WEAK_ALIAS(sbrk, _sbrk) @@ -46,7 +46,7 @@ .globl CURBRK .type CURBRK,#object CURBRK: - .word _C_LABEL(end) + .word _C_LABEL(_end) /* * Change the data segment size ==== //depot/projects/wifi/lib/libc/net/sctp_sys_calls.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.9 2007/06/22 13:59:54 rrs Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.11 2007/06/26 02:07:47 mjacob Exp $"); #include <stdio.h> #include <string.h> #include <errno.h> @@ -185,10 +185,18 @@ /* validate all the addresses and get the size */ for (i = 0; i < addrcnt; i++) { if (at->sa_family == AF_INET) { + if (at->sa_len != sizeof(struct sockaddr_in)) { + errno = EINVAL; + return (-1); + } memcpy(cpto, at, at->sa_len); cpto = ((caddr_t)cpto + at->sa_len); len += at->sa_len; } else if (at->sa_family == AF_INET6) { + if (at->sa_len != sizeof(struct sockaddr_in6)) { + errno = EINVAL; + return (-1); + } if (IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)at)->sin6_addr)) { len += sizeof(struct sockaddr_in); in6_sin6_2_sin((struct sockaddr_in *)cpto, (struct sockaddr_in6 *)at); @@ -205,7 +213,8 @@ } if (len > (sizeof(buf) - sizeof(int))) { /* Never enough memory */ - return (E2BIG); + errno = E2BIG; + return (-1); } at = (struct sockaddr *)((caddr_t)at + at->sa_len); cnt++; @@ -231,7 +240,7 @@ { struct sctp_getaddresses *gaddrs; struct sockaddr *sa; - int i, sz, fam, argsz; + int i, sz, argsz; /* validate the flags */ if ((flags != SCTP_BINDX_ADD_ADDR) && @@ -251,23 +260,30 @@ errno = ENOMEM; return (-1); } - gaddrs->sget_assoc_id = 0; sa = addrs; for (i = 0; i < addrcnt; i++) { sz = sa->sa_len; - fam = sa->sa_family; - if ((fam != AF_INET) && (fam != AF_INET6)) { + if (sa->sa_family == AF_INET) { + if (sa->sa_len != sizeof(struct sockaddr_in)) + goto out_error; + } else if (sa->sa_family == AF_INET6) { + if (sa->sa_len != sizeof(struct sockaddr_in6)) + goto out_error; + } else { + /* invalid address family specified */ + out_error: free(gaddrs); errno = EINVAL; return (-1); } + memset(gaddrs, 0, argsz); + gaddrs->sget_assoc_id = 0; memcpy(gaddrs->addr, sa, sz); - if (setsockopt(sd, IPPROTO_SCTP, flags, - gaddrs, (socklen_t) argsz) != 0) { + if (setsockopt(sd, IPPROTO_SCTP, flags, gaddrs, + (socklen_t) argsz) != 0) { free(gaddrs); return (-1); } - memset(gaddrs, 0, argsz); sa = (struct sockaddr *)((caddr_t)sa + sz); } free(gaddrs); @@ -315,7 +331,6 @@ errno = ENOMEM; return (-1); } - memset(addrs, 0, siz); addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_PEER_ADDRESSES, @@ -380,7 +395,6 @@ errno = ENOMEM; return (-1); } - memset(addrs, 0, siz); addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_LOCAL_ADDRESSES, addrs, ==== //depot/projects/wifi/lib/libgssapi/gss_accept_sec_context.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libgssapi/gss_accept_sec_context.c,v 1.2 2007/04/04 02:40:59 kan Exp $ + * $FreeBSD: src/lib/libgssapi/gss_accept_sec_context.c,v 1.3 2007/06/30 07:47:45 dfr Exp $ */ #include <gssapi/gssapi.h> @@ -48,7 +48,7 @@ OM_uint32 *time_rec, gss_cred_id_t *delegated_cred_handle) { - OM_uint32 major_status; + OM_uint32 major_status, mech_ret_flags; struct _gss_mech_switch *m; struct _gss_context *ctx = (struct _gss_context *) *context_handle; struct _gss_cred *cred = (struct _gss_cred *) acceptor_cred_handle; @@ -165,7 +165,7 @@ &src_mn, mech_type, output_token, - ret_flags, + &mech_ret_flags, time_rec, &delegated_mc); if (major_status != GSS_S_COMPLETE && @@ -187,7 +187,7 @@ *src_name = (gss_name_t) name; } - if (*ret_flags & GSS_C_DELEG_FLAG) { + if (mech_ret_flags & GSS_C_DELEG_FLAG) { if (!delegated_cred_handle) { >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707021319.l62DJ1r7033542>