From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 00:33:13 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F41D5106564A; Sun, 6 Feb 2011 00:33:12 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id CA62E8FC17; Sun, 6 Feb 2011 00:33:12 +0000 (UTC) Received: from fledge.watson.org (fledge.watson.org [65.122.17.41]) by cyrus.watson.org (Postfix) with ESMTPS id 7C27E46B8A; Sat, 5 Feb 2011 19:33:12 -0500 (EST) Date: Sun, 6 Feb 2011 00:33:12 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: John Baldwin In-Reply-To: <58E18E40-3670-429A-A8D9-0A1C65E99CC5@freebsd.org> Message-ID: References: <201102031922.p13JML8i055697@svn.freebsd.org> <4D4C45C9.4080105@freebsd.org> <201102041356.39777.jhb@freebsd.org> <58E18E40-3670-429A-A8D9-0A1C65E99CC5@freebsd.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@freebsd.org, Randall Stewart , svn-src-all@freebsd.org, src-committers@freebsd.org, Julian Elischer Subject: Re: svn commit: r218232 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 00:33:13 -0000 On Fri, 4 Feb 2011, Robert N. M. Watson wrote: > On 4 Feb 2011, at 10:56, John Baldwin wrote: > >> The difference here is that FOREACH_THREAD_IN_PROC() is just a >> TAILQ_FOREACH(). The CPU iterators are more complex. >> >> I agree that that we should have topology-aware iterators, though part of >> the problem is what do you iterate? We'd have to create new sets of >> package and core IDs. >> >> For HWTHREAD_FOREACH() you can already use CPU_FOREACH(). > > Yeah, I have no real opinion on spelling at all. Rather, I'm of the opinion > that we need some more semantics in order to express useful concepts, and > make it easy to represent things like "one X per package", and "find me the > closest X to which I wish to enqueue this request". And just to expand on this thought slightly: I'd like it to answer the question without dirtying cache lines for shared data (so no locks, etc). That way we can do it cheaply per-packet if need be. Robert From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 01:00:40 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FF39106564A; Sun, 6 Feb 2011 01:00:40 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4D3AD8FC08; Sun, 6 Feb 2011 01:00:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1610es6047342; Sun, 6 Feb 2011 01:00:40 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1610ekh047340; Sun, 6 Feb 2011 01:00:40 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201102060100.p1610ekh047340@svn.freebsd.org> From: Ed Maste Date: Sun, 6 Feb 2011 01:00:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218361 - stable/7/sys/dev/aac X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 01:00:40 -0000 Author: emaste Date: Sun Feb 6 01:00:40 2011 New Revision: 218361 URL: http://svn.freebsd.org/changeset/base/218361 Log: MFC r218207: Revert part of r173264. Both aac_ioctl_sendfib and aac_ioctl_send_raw_srb make use of the aac_ioctl_event callback, if acc_alloc_command fails. This can end up in an infinite loop in the while loop in aac_release_command. Modified: stable/7/sys/dev/aac/aac.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/aac/aac.c ============================================================================== --- stable/7/sys/dev/aac/aac.c Sat Feb 5 23:32:17 2011 (r218360) +++ stable/7/sys/dev/aac/aac.c Sun Feb 6 01:00:40 2011 (r218361) @@ -1411,11 +1411,7 @@ aac_release_command(struct aac_command * aac_enqueue_free(cm); - /* - * Dequeue all events so that there's no risk of events getting - * stranded. - */ - while ((event = TAILQ_FIRST(&sc->aac_ev_cmfree)) != NULL) { + if ((event = TAILQ_FIRST(&sc->aac_ev_cmfree)) != NULL) { TAILQ_REMOVE(&sc->aac_ev_cmfree, event, ev_links); event->ev_callback(sc, event, event->ev_arg); } From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 01:13:10 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B014106566B; Sun, 6 Feb 2011 01:13:10 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 683B28FC08; Sun, 6 Feb 2011 01:13:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p161DA2G047672; Sun, 6 Feb 2011 01:13:10 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p161DAoK047670; Sun, 6 Feb 2011 01:13:10 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201102060113.p161DAoK047670@svn.freebsd.org> From: Ed Maste Date: Sun, 6 Feb 2011 01:13:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218362 - stable/8/sys/dev/aac X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 01:13:10 -0000 Author: emaste Date: Sun Feb 6 01:13:10 2011 New Revision: 218362 URL: http://svn.freebsd.org/changeset/base/218362 Log: MFC r218207: Revert part of r173264. Both aac_ioctl_sendfib and aac_ioctl_send_raw_srb make use of the aac_ioctl_event callback, if acc_alloc_command fails. This can end up in an infinite loop in the while loop in aac_release_command. Modified: stable/8/sys/dev/aac/aac.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/aac/aac.c ============================================================================== --- stable/8/sys/dev/aac/aac.c Sun Feb 6 01:00:40 2011 (r218361) +++ stable/8/sys/dev/aac/aac.c Sun Feb 6 01:13:10 2011 (r218362) @@ -1415,11 +1415,7 @@ aac_release_command(struct aac_command * aac_enqueue_free(cm); - /* - * Dequeue all events so that there's no risk of events getting - * stranded. - */ - while ((event = TAILQ_FIRST(&sc->aac_ev_cmfree)) != NULL) { + if ((event = TAILQ_FIRST(&sc->aac_ev_cmfree)) != NULL) { TAILQ_REMOVE(&sc->aac_ev_cmfree, event, ev_links); event->ev_callback(sc, event, event->ev_arg); } From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 07:41:28 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AEFE106564A; Sun, 6 Feb 2011 07:41:28 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EC3478FC1B; Sun, 6 Feb 2011 07:41:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p167fRAU056375; Sun, 6 Feb 2011 07:41:27 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p167fRGr056373; Sun, 6 Feb 2011 07:41:27 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201102060741.p167fRGr056373@svn.freebsd.org> From: Hiroki Sato Date: Sun, 6 Feb 2011 07:41:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218363 - releng/8.2/release/doc/en_US.ISO8859-1/relnotes X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 07:41:28 -0000 Author: hrs Date: Sun Feb 6 07:41:27 2011 New Revision: 218363 URL: http://svn.freebsd.org/changeset/base/218363 Log: Add relnotes entries for upcoming 8.2R (first round): [ia64] DMA bounce buffer pool increased from 256 to 1024, [powerpc] kern.hz 100->1000, [powerpc] SMP support on MPC7400-based machines, [powerpc] DMA bounce buffer support, ddb(8) reset and reboot delay support, ddb(8) show cdev, memguard(9) improvement to use larger KVA, aibs(4) added in favor of acpi_aiboost(4), coretemp(4) Xeon 5500/5600 support, ichwd(4) Intel NM10 Express chipset support, video4linux API support in Linux emulation subsystem, alc(4) AR8151/8152 support, alc(4) poor UDP performance issue fixed, bge(4) TSO fixed, bce(4) flow control support, bwi(4) for BCM430x and BCM431x added (but not in GENERIC yet), bwn(4) padding issue fixed, cxgb(4) new sysctls: nfilters, pkt_timestamp, core_clock, em(4) 7.1.9, igb(4) 2.0.7, em(4) and igb(4) statistics counters as sysctl MIB objects, em(4) and igb(4) now supports led(4), epair(4) linkstate support, iwn(4) 6000 series support, firmware version 9.221.4.1, ixgbe(4) kernel module building, version 2.2.1, mwlfw(4) kernel module building, rl(4) WoL support, prefer_iomap knob added, sis(4) stability issue fixed, ste(4) prefer_iomap knob added, sk(4) TX checksum offloading disabled by default, altq(4) kernel module building, IPsec flow distribution improved, proxy ARP issue over Netgraph interfaces fixed, an issue with IPv6 use_defaultzone=1 fixed, ng_patch(4) added, ng_ether(4) issue when associated IF is moved to another vnet fixed, TCP BW*DELAY window limiting (inflight) disabled by default, TCP path MTU discovery when <256 octets of MTU fixed, TCP initial window increase algorithm in RFC 3390 improved, VNET now supports IPv4 multicast routing, ahci(4) NCQ and PMP disabled on VIA VT8251, arcmsr(4) updated to version 1.20.00.17, ata(4) device hints for initial ATA mode added, ata(4) now checks also on controller side when ata_dma_check_80pin=1, mpt(4) now reports max I/O size to the upper layer, twa(4) updated to version 3.8.06.003, ZFS version 15, metaslab code updated, various bug fixes, vfs.zfs.vdec.max_pending reduced from 35 to 10, arp(8) -an improvement, calendar(1) improved, dhclient(8) 10-second period changed, du(1) -t threshold added, gcore(1) -f added, get{host,net,proto}*() returns ERANGE and NS_RETURN for too small buf, gpart(8) resize command added, ifconfig(8) CIDR subnet width parsing improved, jot(1) bug fix, newsyslog(8) -S pidfile option added, pkill(8) -l option added, pmcstat(8) now supports file and network socket for the event source, pom(6) -p added, powerd(8) -m -M added, sh(1) SIGINT handling fixed, sh(1) supports " Kernel Changes - + The maximum number of pages + used for DMA bounce buffer pool has been increased from 256 to + 1024. + + The default value of + kern.hz has been increased from 100 to + 1000. + + The SMP kernel now works on + MPC7400-based Apple desktop machines such as + PowerMac3,3. + + &os;/powerpc now supports + DMA bounce buffer which is required on systems with larger RAM + than 4GB. + + The &man.ddb.8; kernel debugger now + supports an optional delay in reset and + reboot commands. This allows an + administrator to break the system into debugger and trigger + automatic textdump when an unattended panic occurs. + + The &man.ddb.8; kernel debugger now + supports a show cdev command. This + displays the list of all created cdev's, consisting of devfs + node name and struct cdev address. + + The &os; &man.memguard.9; framework has + been improved to make it able to detect use-after-free of + allocated memories over a longer time. For more details, see + &man.memguard.9; manual page. Boot Loader Changes @@ -170,44 +200,408 @@ Hardware Support - + The &man.aibs.4; driver has been + added. This supports the hardware sensors in ASUS + motherboards and replaces the &man.acpi.aiboost.4; + driver. + + The &man.coretemp.4; driver now supports + Xeon 5500/5600 series. + + The &man.ichwd.4; driver + now supports Intel NM10 Express chipset watchdog + timer. Multimedia Support - + The &os; Linux emulation subsystem now supports + video4linux API. This requires native video4linux + hardware drivers such as ones whichmultimedia/pwc and multimedia/webcamd provide. Network Interface Support - + The &man.alc.4; driver now supports + Atheros AR8151/AR8152 PCIe Gigabit/Fast Ethernet + controllers. + + The TX interrupt moderation timer in + the &man.alc.4; driver has been reduced from 50ms to 1ms. + The 50ms timer resulted in a poor UDP performance. + + A bug in the &man.bge.4; driver which + prevents TSO in BCM57780 from working has been + fixed. + + The &man.bce.4; driver now supports + flow control. + + The &man.bwi.4; driver, which supports + Broadcom BCM430* and BCM431* family Wireless Ethernet + controllers, has been added. This is not compiled into + the GENERIC kernel because there are + some problems. The kernel module + if_bwi.ko is available and can be + loaded without recompiling the kernel to enable this + driver. + + A bug in the &man.bwn.4; driver which + prevents WPA authentication from working has been + fixed. + + The &man.cxgb.4; driver now supports + the following new &man.sysctl.8; variables: + hw.cxgb.nfilters sets the maximum + number of entries in the hardware filter table, + dev.cxgbc.N.pkt_timestamp + provides packet timestamp instead of connection hash, and + dev.cxgbc.N.core_clock + provides the core clock frequency in kHz. + + The &man.em.4; driver has been updated to version + 7.1.9. + + The &man.igb.4; driver has been updated to version + 2.0.7. + + The &man.em.4; and &man.igb.4; drivers + now provide statistics counters as &man.sysctl.8; MIB + objects. + + The &man.em.4; and &man.igb.4; drivers + now support &man.led.4; interface via + /dev/led/emN + and + /dev/led/igbN + for identification LED control. The following command + line makes the LED blink on em0: + + &prompt.root; echo f2 > /dev/led/em0 + + The &man.ixgbe.4; + driver is now also provided as a kernel module. + + The &man.epair.4; virtual Ethernet + interface driver now supports explicit UP/DOWN linkstate. + This fixes an issue when it is used with the &man.carp.4; + protocol. + + The &man.iwn.4; driver now supports + Intel Wireless WiFi Link 6000 series. The firmware has + been updated to version 9.221.4.1. + + The &man.ixgbe.4; driver has been + updated to version 2.2.1. It now supports 82599, better + interrupt handling, hardware assist to LRO, and so + on. + + The &man.mwlfw.4; + driver is now also provided as a kernel module. + + The &man.rl.4; driver now supports WOL + (Wake On Lan) on RTL8139B or newer controllers. + + The &man.rl.4; driver now supports a + device hint to change a way of register access. Although + some newer RTL8139 controllers support memory-mapped + register access, it is difficult to detect the support + automatically. For this reason the driver uses I/O + mapping by default and provides the following device hint. + If it is set to 0, the driver uses + memory mapping for register access. + + hint.rl.N.prefer_iomap="0" + + Note that the default value is 1. + + Some stability issues in + the &man.sis.4; driver have been fixed. + + The &man.ste.4; driver now supports a + device hint to change a way of register access. Although + it uses memory-mapped register access by default, some old + IC Plus Corp (formerly Sundace) controllers are found + unstable. The following device hint makes the driver use + I/O mapping for register access: + + hint.ste.N.prefer_iomap="1" + + The &man.sk.4; driver now disable TX + checksum offloading by default. This is because some + revision of Yukon controller generates corrupted frames. + The checksum offloading can be enabled manually by using + option in the &man.ifconfig.8; + utility. Network Protocols - + The &man.altq.4; support is now provided + as a kernel module alq.ko. + + IPsec flow distribution has been + improved for more parallel processing. + + A bug in &os; IPv4 stack that a proxy + ARP entry cannot be added over &man.netgraph.4; interfaces + has been fixed. + + A bug in &os; IPv6 stack which prevents + an in the &man.ping6.8; utility from + working with + net.inet6.ip6.use_defaultzone=1 has been + fixed. + + A new &man.netgraph.4; node + &man.ng.patch.4; has been added. This performs data + modification of packets passing through. Modifications are + restricted to a subset of C language operations on unsigned + integers of 8, 16, 32 or 64-bit size. + + The &man.ng.ether.4; &man.netgraph.4; + node now supports interface transfer between multiple virtual + network stacks by &man.ifconfig.8; vnet + command. A &man.ng.ether.4; node associated with an network + interface is now destroyed and recreated when the network + interface is moved to another vnet. + + A TCP bandwidth delay product window + limiting algorithm by a &man.sysctl.8; variable + net.inet.tcp.inflight.enable is now + disabled by default. It has been found that this algorithm + is inefficient on a fast network with smaller RTT than 10ms. + It had been enabled by default since 5.2-RELEASE, and then + had been disabled only if the RTT was lesser than 10ms since + 7.0-RELEASE. Pluggable TCP congestion control algorithm + modules are planned to be added for the future + releases. + + A bug in &os; TCP Path MTU discovery + which can lead to a wrong calculation for a smaller MTU than + 256 octets has been fixed. Note that this bug does not + affect when MTU is equal to or larger than 256 + octets. + + The TCP initial window increase in RFC + 3390 which can be controlled by a &man.sysctl.8; variable + net.inet.tcp.rfc3390 now reduces the + congestion window to the restart window if a TCP connection + has been idle for one retransmit timeout or more. For more + details, see RFC 5681 Section 4.1. + + &os; virtual network stack (vnet) now + supports IPv4 multicast routing. Disks and Storage - + The &man.ahci.4; driver now disables NCQ + and PMP support on VIA VT8251 because they are unreliable + under load. + + The &man.arcmsr.4; driver + has been updated to version 1.20.00.17. + + The &man.ata.4; driver + now supports limiting initial ATA mode for devices via + device hints + hint.devname.unit.devN.mode or + hint.devname.unit.mode. + The valid values are the same as ones supported in the + &man.atacontrol.8; and &man.camcontrol.8;. + + The &man.ata.4; driver + now enables cable status check on both of controller and + device side when + hw.ata.ata_dma_check_80pin is + enabled. + + The &man.mpt.4; driver now supports + larger I/O sizes which the device and &man.CAM.4; subsystem + can support. This was limited to 64KB, and the number of + scatter/gather segments was limited to 33 on platforms with + 4K pages. + + The &man.twa.4; + driver has been updated. The version number is + 3.80.06.003. File Systems - + The ZFS on-disk format has been updated + to version 15. + + The ZFS metaslab code has been updated. + This provides a noticeable improvement on write speed, + especially on pools with less than 30% of free space. The + related OpenSolaris Bug IDs are 6826241, 6869229, 6918420, + and 6917066. + + The default value of + vfs.zfs.vdev.max_pending has been + decreased from 35 to 10 (OpenSolaris Bug ID is 6891731) to + improve latency. + + Bugs in the ZFS subsystem has been fixed. The + OpenSolaris Bug IDs are: 6798878, 6809683, 6794570, 6844069, + 6788152, 6843235, 6857012, 6870564, 6836714, 6836714, + 6870564, 6857012, 6843235, 6788152, 6844069, 6794570, + 6809683, 6798878, 6950219, 6953403, 6951024, 6809340, + 6755435, 6748436, 6740164, 6769612, 6757430, 6542860, + 6761100, 6774886, 6737463, 6765294, 6572357, 6572376, + 6328632, 6739487, 6767129, 6747698, 6745863, 6722540, + 6759999, 6758107, 6776548, 6761406, 6770866, 6674216, + 6621164, 6635482, 6595194, 6722991, 6396518, 6713916, + 6739553, 6784104, 6784108, 6788830, 6791064, 6791066, + 6791071, 6792134, 6792884, 6798384, 6551866, 6504953, + 6702206, 6780491, 6747596, 6801507, 6633095, 6775697, + 6790687, 6791101, 6800942, 6582163, 6804954, 6800184, + 6803822, 6789318, 6790345, 6797109, 6797118, 6803343, + 6815893, 6809691, 6790064, 6604992, 6810367, 6807765, + 6821169, 6821170, 6824006, 6792139, 6794830, 6824062, + 6816124, 6818183, 6710376, 6501037, 6827260, 6815592, + 6759986, 6774713, 6717022, 6799895, 6826466, 6826468, + 6826469, 6826470, 6826471, 6826472, 6833711, 6764124, + 6830237, 6833162, 6824968, 6834217, 6596237, 6623978, + 6801810, 6586537, 6836768, 6838062, 6794136, 6776104, + 6664765, 6841321, 6843069, 6847229, 6838344, 6844900, + 6857012, 6848242, 6856634, 6861983, 6862984, 6696858, + 6696858, 6882227, 6880764, 6793430, 6822816, 6892298, + 6807339, 6906110, 6906946, 6898245, and 6833999. Userland Changes - + The &man.arp.8; utility has been improved. + It now runs faster even when a single interface has a number + of aliases. + + The &man.calendar.1; utility now supports + repeating events which span multiple years, lunar events, and + solar events. + + The &man.dhclient.8; utility now reports a + reason for exiting and the 10-second period in which the + &man.dhclient.8; ignores routing messages has been changed to + start just after dhclient-script starts + instead of just after it finished. This change fixes a + symptom that &man.dhclient.8; silently exits under a certain + condition. + + The &man.du.1; utility now supports a + + option to display entries that exceeds the value of + threshold. If the value is + negative, it displays entries with a value less than the + absolute value of threshold. + + The &man.gcore.1; utility now supports an + flag which forces a full dump of all the + segments except for the malformed ones. + + The gethost*(), + getnet*(), and + getproto*() functions now set the errno + to ERANGE and the NSS backend terminates + with NS_RETURN when the result buffer size + is too small. + + The &man.gpart.8; utility now supports + resize command to resize partitions for all + schemes but EBR. + + The &man.ifconfig.8; utility now check an + invalid CIDR subnet notation more strictly. It wrongly + accepted 10.0.0.1/10.0.0.1 as + 10.0.0.1/10. + + Incorrect behaviors in stuttering + sequences and reverse ranges in the &man.jot.1; utility have + been fixed. + + The &man.newsyslog.8; utility now supports + an + option to override the default &man.syslogd.8; PID + file. + + The &man.pkill.1; utility now supports + an option which the &man.kill.1; utility + does. + + The &man.pmcstat.8; utility now supports a + file and a network socket as a top source. A new option + + specifies to send log output to + filename, and another new option + + specifies to receive events from + filename. For a socket, the + filename is in a form of + ipaddr:port. This allows top + monitoring over TCP on a system with no local symbols, for + example. + + The &man.pom.6; utility now + supports a flag to print only the + percentage. + + The &man.powerd.8; utility now supports + an and + to control + the minimum and maximum frequency, respectively. + + A bug in the &man.sh.1; program has been + fixed. A SIGINT signal is now passed + through from a child process if the shell is interactive and + the job control is enabled. For example, aborting + &man.sleep.1; command by Ctrl-C no longer display + ok in the following command line: + + &prompt.user; sleep 5; echo ok + + The &man.sh.1; program now supports a + bg command consisting solely of + redirections. For example: + + &prompt.user; < /dev/null & + + The &man.sleep.1; utility now supports + SIGINFO signal and reports the specified + sleep time and the remaining time. + + The &man.uname.1; utility now supports an + flag as a synonym for the + flag for compatibility with other + systems. + + Bugs in &man.vi.1; utility have been + fixed. They include handling of ^@ and + ^C in insert mode when reading an ex + command. + + The set sharenfs + command in the &man.zfs.8; utility now supports + option. + + + <filename>/etc/periodic</filename> Scripts + + A periodic script for zfs scrub has + been added. For more details, see &man.periodic.conf.5; + manual page. + <filename>/etc/rc.d</filename> Scripts @@ -241,15 +635,24 @@ sendmail has been updated to version 8.14.4. - - The timezone database has been updated to the - tzdata2010j release. --> + The timezone database has been updated to the + tzdata2010l release. Release Engineering and Integration + The &man.sysinstall.8; utility now uses + the following numbers for default and minimum partition sizes: + 1GB for /, 4GB for + /var, and 1GB for + /tmp. + + The &man.sysinstall.8; utility now + attempts to enable &man.getty.8; on a serial port when no VGA + card on the system. + The supported version of the GNOME desktop environment (x11/gnome2) has been From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 09:33:08 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1A401065694; Sun, 6 Feb 2011 09:33:08 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BEF108FC18; Sun, 6 Feb 2011 09:33:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p169X8Q5058842; Sun, 6 Feb 2011 09:33:08 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p169X8IZ058840; Sun, 6 Feb 2011 09:33:08 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201102060933.p169X8IZ058840@svn.freebsd.org> From: Konstantin Belousov Date: Sun, 6 Feb 2011 09:33:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218365 - stable/8/libexec/rtld-elf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 09:33:08 -0000 Author: kib Date: Sun Feb 6 09:33:08 2011 New Revision: 218365 URL: http://svn.freebsd.org/changeset/base/218365 Log: MFC r218098: Make ldd(1) work when versioned dependency file is cannot be loaded. MFC r218099: Fix grammar. Modified: stable/8/libexec/rtld-elf/rtld.c Directory Properties: stable/8/libexec/rtld-elf/ (props changed) Modified: stable/8/libexec/rtld-elf/rtld.c ============================================================================== --- stable/8/libexec/rtld-elf/rtld.c Sun Feb 6 08:46:37 2011 (r218364) +++ stable/8/libexec/rtld-elf/rtld.c Sun Feb 6 09:33:08 2011 (r218365) @@ -3448,10 +3448,17 @@ locate_dependency(const Obj_Entry *obj, } for (needed = obj->needed; needed != NULL; needed = needed->next) { - if (needed->obj == NULL) - continue; - if (object_match_name(needed->obj, name)) - return needed->obj; + if (strcmp(obj->strtab + needed->name, name) == 0 || + (needed->obj != NULL && object_match_name(needed->obj, name))) { + /* + * If there is DT_NEEDED for the name we are looking for, + * we are all set. Note that object might not be found if + * dependency was not loaded yet, so the function can + * return NULL here. This is expected and handled + * properly by the caller. + */ + return (needed->obj); + } } _rtld_error("%s: Unexpected inconsistency: dependency %s not found", obj->path, name); @@ -3577,6 +3584,8 @@ rtld_verify_object_versions(Obj_Entry *o vn = obj->verneed; while (vn != NULL) { depobj = locate_dependency(obj, obj->strtab + vn->vn_file); + if (depobj == NULL) + return (-1); vna = (const Elf_Vernaux *) ((char *)vn + vn->vn_aux); for (;;) { if (check_object_provided_version(obj, depobj, vna)) From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 09:49:56 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4154E106566B; Sun, 6 Feb 2011 09:49:56 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2F6CB8FC08; Sun, 6 Feb 2011 09:49:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p169nu1N059208; Sun, 6 Feb 2011 09:49:56 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p169nub4059206; Sun, 6 Feb 2011 09:49:56 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201102060949.p169nub4059206@svn.freebsd.org> From: Martin Wilke Date: Sun, 6 Feb 2011 09:49:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218366 - head/share/man/man4 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 09:49:56 -0000 Author: miwi (doc,ports committer) Date: Sun Feb 6 09:49:55 2011 New Revision: 218366 URL: http://svn.freebsd.org/changeset/base/218366 Log: - Add Dell Wireless 1390 BCM4311 Mini PCI to supported list. PR: 154500 Submitted by: Ruslan Mahmatkhanov Modified: head/share/man/man4/bwi.4 Modified: head/share/man/man4/bwi.4 ============================================================================== --- head/share/man/man4/bwi.4 Sun Feb 6 09:33:08 2011 (r218365) +++ head/share/man/man4/bwi.4 Sun Feb 6 09:49:55 2011 (r218366) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 30, 2010 +.Dd February 6, 2011 .Dt BWI 4 .Os .Sh NAME @@ -81,6 +81,7 @@ driver supports Broadcom BCM43xx based w .It "Buffalo WLI-CB-G54S BCM4318 CardBus b/g" .It "Buffalo WLI-PCI-G54S BCM4306 PCI b/g" .It "Compaq R4035 onboard BCM4306 PCI b/g" +.It "Dell Wireless 1390 BCM4311 Mini PCI b/g" .It "Dell Wireless 1470 BCM4318 Mini PCI b/g" .It "Dell Truemobile 1300 r2 BCM4306 Mini PCI b/g" .It "Dell Truemobile 1400 BCM4309 Mini PCI b/g" @@ -91,18 +92,18 @@ driver supports Broadcom BCM43xx based w .It "US Robotics 5411 BCM4318 CardBus b/g" .El .Pp -The -.Nm +The +.Nm driver uses the older v3 version of Broadcom's firmware. While this older firmware does support most BCM43xx parts, the -.Xr bwn 4 +.Xr bwn 4 driver works better for the newer chips it supports. -You must use the -.Nm +You must use the +.Nm driver if you are using older Broadcom chipsets (BCM4301, BCM4303 and BCM4306 rev 2). -The v4 version of the firmware that -.Xr bwn 4 +The v4 version of the firmware that +.Xr bwn 4 uses does not support these chips. .Sh EXAMPLES Join an existing BSS network (i.e., connect to an access point): From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 10:16:49 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD8F8106564A for ; Sun, 6 Feb 2011 10:16:49 +0000 (UTC) (envelope-from miwi.freebsd@googlemail.com) Received: from mail-pv0-f182.google.com (mail-pv0-f182.google.com [74.125.83.182]) by mx1.freebsd.org (Postfix) with ESMTP id AA8D38FC19 for ; Sun, 6 Feb 2011 10:16:49 +0000 (UTC) Received: by pvc22 with SMTP id 22so811895pvc.13 for ; Sun, 06 Feb 2011 02:16:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:sender:message-id:date:from:reply-to :organization:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding; bh=s+kxVxBRbU1vKUq/r1Wvr+VM9GCrGBFRdE1J59DF2hk=; b=qBj1I8nrgNk5AG+nqN/uDnBbr8VLlO4mNrC2YUZ+PJ+ULQIKUmHzM9Nvod6fzzlEqv Mk6hgUN+eGlsMC62mDIi0ZpAZqNvyuit1My9e61aurZiWRRjGjAq/rcmTzPdiG9U1nsy tcI+GD/bEiyf1h6znpluL9CZv+W7aE9/8EHvs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=sender:message-id:date:from:reply-to:organization:user-agent :mime-version:to:subject:references:in-reply-to:content-type :content-transfer-encoding; b=vrmX0QJEVkgRItPcmMxKWqsn6hc/EBBURz5eZZ1uMsXyr2Yh3TTsFBrMYbxwRF03Zj 8lUxoJVVzsg7KvlqseVRE99k00pOOEjBP8ctiChhAFi/LOunEBc6NKwdVeM0jthWCPOE ICjT6F4daFbMZBlclH8lfgPk05jRskkA2f0zw= Received: by 10.142.133.17 with SMTP id g17mr13883937wfd.167.1296986014249; Sun, 06 Feb 2011 01:53:34 -0800 (PST) Received: from asus.miwibox.org ([175.139.12.61]) by mx.google.com with ESMTPS id w42sm4032029wfh.15.2011.02.06.01.53.32 (version=SSLv3 cipher=RC4-MD5); Sun, 06 Feb 2011 01:53:33 -0800 (PST) Sender: Martin Wilke Message-ID: <4D4E6F96.6010606@FreeBSD.org> Date: Sun, 06 Feb 2011 17:53:26 +0800 From: Martin Wilke Organization: FreeBSD User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.13) Gecko/20110206 Thunderbird/3.1.7 MIME-Version: 1.0 To: svn-src-all@freebsd.org References: <201102060949.p169nub4059206@svn.freebsd.org> In-Reply-To: <201102060949.p169nub4059206@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: svn commit: r218366 - head/share/man/man4 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: miwi@FreeBSD.org List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 10:16:49 -0000 On 02/06/2011 17:49, Martin Wilke wrote: > Author: miwi (doc,ports committer) > Date: Sun Feb 6 09:49:55 2011 > New Revision: 218366 > URL: http://svn.freebsd.org/changeset/base/218366 > > Log: > - Add Dell Wireless 1390 BCM4311 Mini PCI to supported list. > > PR: 154500 > Submitted by: Ruslan Mahmatkhanov While here fix some whitespaces. Reviewed by: bschmidt > Modified: > head/share/man/man4/bwi.4 > > Modified: head/share/man/man4/bwi.4 > ============================================================================== > --- head/share/man/man4/bwi.4 Sun Feb 6 09:33:08 2011 (r218365) > +++ head/share/man/man4/bwi.4 Sun Feb 6 09:49:55 2011 (r218366) > @@ -24,7 +24,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd June 30, 2010 > +.Dd February 6, 2011 > .Dt BWI 4 > .Os > .Sh NAME > @@ -81,6 +81,7 @@ driver supports Broadcom BCM43xx based w > .It "Buffalo WLI-CB-G54S BCM4318 CardBus b/g" > .It "Buffalo WLI-PCI-G54S BCM4306 PCI b/g" > .It "Compaq R4035 onboard BCM4306 PCI b/g" > +.It "Dell Wireless 1390 BCM4311 Mini PCI b/g" > .It "Dell Wireless 1470 BCM4318 Mini PCI b/g" > .It "Dell Truemobile 1300 r2 BCM4306 Mini PCI b/g" > .It "Dell Truemobile 1400 BCM4309 Mini PCI b/g" > @@ -91,18 +92,18 @@ driver supports Broadcom BCM43xx based w > .It "US Robotics 5411 BCM4318 CardBus b/g" > .El > .Pp > -The > -.Nm > +The > +.Nm > driver uses the older v3 version of Broadcom's firmware. > While this older firmware does support most BCM43xx parts, the > -.Xr bwn 4 > +.Xr bwn 4 > driver works better for the newer chips it supports. > -You must use the > -.Nm > +You must use the > +.Nm > driver if you are using older Broadcom chipsets (BCM4301, BCM4303 and > BCM4306 rev 2). > -The v4 version of the firmware that > -.Xr bwn 4 > +The v4 version of the firmware that > +.Xr bwn 4 > uses does not support these chips. > .Sh EXAMPLES > Join an existing BSS network (i.e., connect to an access point): > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" -- With best Regards, Martin Wilke (miwi_(at)_FreeBSD.org) \\Mess with the Best, Die like the Rest// From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 10:25:11 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82233106566B; Sun, 6 Feb 2011 10:25:11 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 702408FC08; Sun, 6 Feb 2011 10:25:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16APBjl060147; Sun, 6 Feb 2011 10:25:11 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16APBNF060145; Sun, 6 Feb 2011 10:25:11 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201102061025.p16APBNF060145@svn.freebsd.org> From: Bernhard Schmidt Date: Sun, 6 Feb 2011 10:25:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218368 - head/sys/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 10:25:11 -0000 Author: bschmidt Date: Sun Feb 6 10:25:11 2011 New Revision: 218368 URL: http://svn.freebsd.org/changeset/base/218368 Log: Fix cut&paste mistake. MFC after: 1 week Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sun Feb 6 10:21:33 2011 (r218367) +++ head/sys/conf/files Sun Feb 6 10:25:11 2011 (r218368) @@ -1254,7 +1254,7 @@ iwn6050.fw optional iwn6050fw | iwnfw dependency "$S/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu" \ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu" \ no-obj no-implicit-rule \ - clean "iwn6000.fw" + clean "iwn6050.fw" dev/ixgb/if_ixgb.c optional ixgb dev/ixgb/ixgb_ee.c optional ixgb dev/ixgb/ixgb_hw.c optional ixgb From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 11:39:51 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4F481065672; Sun, 6 Feb 2011 11:39:51 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7C6A08FC16; Sun, 6 Feb 2011 11:39:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16BdpQ9063762; Sun, 6 Feb 2011 11:39:51 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16Bdpkq063760; Sun, 6 Feb 2011 11:39:51 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201102061139.p16Bdpkq063760@svn.freebsd.org> From: Martin Wilke Date: Sun, 6 Feb 2011 11:39:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218369 - head/share/man/man4 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 11:39:51 -0000 Author: miwi (doc,ports committer) Date: Sun Feb 6 11:39:51 2011 New Revision: 218369 URL: http://svn.freebsd.org/changeset/base/218369 Log: - Use tabs not spaces Reported by: bschmidt Modified: head/share/man/man4/bwi.4 Modified: head/share/man/man4/bwi.4 ============================================================================== --- head/share/man/man4/bwi.4 Sun Feb 6 10:25:11 2011 (r218368) +++ head/share/man/man4/bwi.4 Sun Feb 6 11:39:51 2011 (r218369) @@ -81,7 +81,7 @@ driver supports Broadcom BCM43xx based w .It "Buffalo WLI-CB-G54S BCM4318 CardBus b/g" .It "Buffalo WLI-PCI-G54S BCM4306 PCI b/g" .It "Compaq R4035 onboard BCM4306 PCI b/g" -.It "Dell Wireless 1390 BCM4311 Mini PCI b/g" +.It "Dell Wireless 1390 BCM4311 Mini PCI b/g" .It "Dell Wireless 1470 BCM4318 Mini PCI b/g" .It "Dell Truemobile 1300 r2 BCM4306 Mini PCI b/g" .It "Dell Truemobile 1400 BCM4309 Mini PCI b/g" From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 12:21:30 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 033161065696; Sun, 6 Feb 2011 12:21:30 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E65538FC2B; Sun, 6 Feb 2011 12:21:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16CLTlB064676; Sun, 6 Feb 2011 12:21:29 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16CLTCm064674; Sun, 6 Feb 2011 12:21:29 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201102061221.p16CLTCm064674@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Sun, 6 Feb 2011 12:21:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218370 - head/sbin/hastd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 12:21:30 -0000 Author: pjd Date: Sun Feb 6 12:21:29 2011 New Revision: 218370 URL: http://svn.freebsd.org/changeset/base/218370 Log: Close more descriptors that can be open if the worker process for the given resource is already running. Submitted by: Mikolaj Golub MFC after: 1 week Modified: head/sbin/hastd/hastd.c Modified: head/sbin/hastd/hastd.c ============================================================================== --- head/sbin/hastd/hastd.c Sun Feb 6 11:39:51 2011 (r218369) +++ head/sbin/hastd/hastd.c Sun Feb 6 12:21:29 2011 (r218370) @@ -109,6 +109,12 @@ descriptors_cleanup(struct hast_resource proto_close(tres->hr_remotein); if (tres->hr_remoteout != NULL) proto_close(tres->hr_remoteout); + if (tres->hr_ctrl != NULL) + proto_close(tres->hr_ctrl); + if (tres->hr_event != NULL) + proto_close(tres->hr_event); + if (tres->hr_conn != NULL) + proto_close(tres->hr_conn); } if (cfg->hc_controlin != NULL) proto_close(cfg->hc_controlin); From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 13:17:41 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 666A6106564A; Sun, 6 Feb 2011 13:17:41 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3B52C8FC13; Sun, 6 Feb 2011 13:17:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16DHfWB065987; Sun, 6 Feb 2011 13:17:41 GMT (envelope-from rrs@svn.freebsd.org) Received: (from rrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16DHfrW065985; Sun, 6 Feb 2011 13:17:41 GMT (envelope-from rrs@svn.freebsd.org) Message-Id: <201102061317.p16DHfrW065985@svn.freebsd.org> From: Randall Stewart Date: Sun, 6 Feb 2011 13:17:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218371 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 13:17:41 -0000 Author: rrs Date: Sun Feb 6 13:17:40 2011 New Revision: 218371 URL: http://svn.freebsd.org/changeset/base/218371 Log: 1) Use same scheme Michael and I discussed for a selected for a flowid 2) If flowid is not set, arrange so it is stored. 3) If flowid is set by lower layer, use it. MFC after: 3 Months Modified: head/sys/netinet/sctp_input.c Modified: head/sys/netinet/sctp_input.c ============================================================================== --- head/sys/netinet/sctp_input.c Sun Feb 6 12:21:29 2011 (r218370) +++ head/sys/netinet/sctp_input.c Sun Feb 6 13:17:40 2011 (r218371) @@ -5946,32 +5946,32 @@ sctp_input(struct mbuf *m, int off) struct sctphdr *sh; int offset; int cpu_to_use; - uint32_t tag; + uint32_t flowid, tag; if (mp_ncpus > 1) { - ip = mtod(m, struct ip *); - offset = off + sizeof(*sh); - if (SCTP_BUF_LEN(m) < offset) { - if ((m = m_pullup(m, offset)) == 0) { - SCTP_STAT_INCR(sctps_hdrops); - return; - } - ip = mtod(m, struct ip *); - } - sh = (struct sctphdr *)((caddr_t)ip + off); - if (sh->v_tag) { - tag = htonl(sh->v_tag); + if (m->m_flags & M_FLOWID) { + flowid = m->m_pkthdr.flowid; } else { /* - * Distribute new INIT's to all CPU's don't just - * pick on 0. + * No flow id built by lower layers fix it so we + * create one. */ - struct timeval tv; - - (void)SCTP_GETTIME_TIMEVAL(&tv); - tag = (uint32_t) tv.tv_usec; + ip = mtod(m, struct ip *); + offset = off + sizeof(*sh); + if (SCTP_BUF_LEN(m) < offset) { + if ((m = m_pullup(m, offset)) == 0) { + SCTP_STAT_INCR(sctps_hdrops); + return; + } + ip = mtod(m, struct ip *); + } + sh = (struct sctphdr *)((caddr_t)ip + off); + tag = htonl(sh->v_tag); + flowid = tag ^ ntohs(sh->dest_port) ^ ntohs(sh->src_port); + m->m_pkthdr.flowid = flowid; + m->m_flags |= M_FLOWID; } - cpu_to_use = sctp_cpuarry[tag % mp_ncpus]; + cpu_to_use = sctp_cpuarry[flowid % mp_ncpus]; sctp_queue_to_mcore(m, off, cpu_to_use); return; } From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 13:59:04 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 466A4106564A; Sun, 6 Feb 2011 13:59:04 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 33E818FC08; Sun, 6 Feb 2011 13:59:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16Dx4ue067008; Sun, 6 Feb 2011 13:59:04 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16Dx4WU067003; Sun, 6 Feb 2011 13:59:04 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201102061359.p16Dx4WU067003@svn.freebsd.org> From: Brooks Davis Date: Sun, 6 Feb 2011 13:59:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218372 - in stable/8: etc/defaults etc/periodic/security share/man/man5 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 13:59:04 -0000 Author: brooks Date: Sun Feb 6 13:59:03 2011 New Revision: 218372 URL: http://svn.freebsd.org/changeset/base/218372 Log: MFC r215213: Add an (off by default) check for negative permissions (where the group on a object has less permissions than everyone). These permissions will not work reliably over NFS if you have more than 14 supplemental groups and are usually not what you mean. Added: stable/8/etc/periodic/security/110.neggrpperm - copied unchanged from r215213, head/etc/periodic/security/110.neggrpperm Modified: stable/8/etc/defaults/periodic.conf stable/8/etc/periodic/security/Makefile stable/8/share/man/man5/periodic.conf.5 Directory Properties: stable/8/etc/ (props changed) stable/8/share/man/man5/ (props changed) Modified: stable/8/etc/defaults/periodic.conf ============================================================================== --- stable/8/etc/defaults/periodic.conf Sun Feb 6 13:17:40 2011 (r218371) +++ stable/8/etc/defaults/periodic.conf Sun Feb 6 13:59:03 2011 (r218372) @@ -157,6 +157,9 @@ daily_status_security_diff_flags="-b -u" # 100.chksetuid daily_status_security_chksetuid_enable="YES" +# 110.neggrpperm +daily_status_security_neggrpperm_enable="NO" + # 200.chkmounts daily_status_security_chkmounts_enable="YES" #daily_status_security_chkmounts_ignore="^amd:" # Don't check matching Copied: stable/8/etc/periodic/security/110.neggrpperm (from r215213, head/etc/periodic/security/110.neggrpperm) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/8/etc/periodic/security/110.neggrpperm Sun Feb 6 13:59:03 2011 (r218372, copy of r215213, head/etc/periodic/security/110.neggrpperm) @@ -0,0 +1,54 @@ +#!/bin/sh - +# +# Copyright (c) 2001 The FreeBSD Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (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$ +# + +# If there is a global system configuration file, suck it in. +# +if [ -r /etc/defaults/periodic.conf ] +then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +rc=0 + +case "$daily_status_security_neggrpperm_enable" in + [Yy][Ee][Ss]) + echo "" + echo 'Checking negative group permissions:' + MP=`mount -t ufs,zfs | awk '$0 !~ /no(suid|exec)/ { print $3 }'` + n=$(find -sx $MP /dev/null -type f \ + \( \( ! -perm +010 -and -perm +001 \) -or \ + \( ! -perm +020 -and -perm +002 \) -or \ + \( ! -perm +040 -and -perm +004 \) \) \ + -exec ls -liTd \{\} \+ | tee /dev/stderr | wc -l) + [ $n -gt 0 ] && rc=1 || rc=0 + ;; +esac + +exit $rc Modified: stable/8/etc/periodic/security/Makefile ============================================================================== --- stable/8/etc/periodic/security/Makefile Sun Feb 6 13:17:40 2011 (r218371) +++ stable/8/etc/periodic/security/Makefile Sun Feb 6 13:59:03 2011 (r218372) @@ -3,6 +3,7 @@ .include FILES= 100.chksetuid \ + 110.neggrpperm \ 200.chkmounts \ 300.chkuid0 \ 400.passwdless \ Modified: stable/8/share/man/man5/periodic.conf.5 ============================================================================== --- stable/8/share/man/man5/periodic.conf.5 Sun Feb 6 13:17:40 2011 (r218371) +++ stable/8/share/man/man5/periodic.conf.5 Sun Feb 6 13:59:03 2011 (r218372) @@ -482,6 +482,14 @@ Set to .Dq Li YES to compare the modes and modification times of setuid executables with the previous day's values. +.It Va daily_status_security_neggrpperm_enable +.Pq Vt bool +Set to +.Dq Li YES +to check for files where the group of a file has less permissions than +the world at large. +When users are in more than 14 supplemental groups these negative +permissions may not be enforced via NFS shares. .It Va daily_status_security_chkmounts_enable .Pq Vt bool Set to From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 14:06:37 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC3CC1065670; Sun, 6 Feb 2011 14:06:37 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DBEAC8FC12; Sun, 6 Feb 2011 14:06:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16E6bjk067261; Sun, 6 Feb 2011 14:06:37 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16E6b5P067259; Sun, 6 Feb 2011 14:06:37 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201102061406.p16E6b5P067259@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Sun, 6 Feb 2011 14:06:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218373 - head/sbin/hastd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 14:06:38 -0000 Author: pjd Date: Sun Feb 6 14:06:37 2011 New Revision: 218373 URL: http://svn.freebsd.org/changeset/base/218373 Log: Open syslog when logging sysconf(3) failure. Reported by: Mikolaj Golub MFC after: 1 week Modified: head/sbin/hastd/hastd.c Modified: head/sbin/hastd/hastd.c ============================================================================== --- head/sbin/hastd/hastd.c Sun Feb 6 13:59:03 2011 (r218372) +++ head/sbin/hastd/hastd.c Sun Feb 6 14:06:37 2011 (r218373) @@ -168,7 +168,11 @@ descriptors_assert(const struct hast_res maxfd = sysconf(_SC_OPEN_MAX); if (maxfd < 0) { + pjdlog_init(pjdlogmode); + pjdlog_prefix_set("[%s] (%s) ", res->hr_name, + role2str(res->hr_role)); pjdlog_errno(LOG_WARNING, "sysconf(_SC_OPEN_MAX) failed"); + pjdlog_fini(); maxfd = 16384; } for (fd = 0; fd <= maxfd; fd++) { From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 14:07:59 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21424106564A; Sun, 6 Feb 2011 14:07:59 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 110318FC14; Sun, 6 Feb 2011 14:07:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16E7w1x067322; Sun, 6 Feb 2011 14:07:58 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16E7wUu067320; Sun, 6 Feb 2011 14:07:58 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201102061407.p16E7wUu067320@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Sun, 6 Feb 2011 14:07:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218374 - head/sbin/hastd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 14:07:59 -0000 Author: pjd Date: Sun Feb 6 14:07:58 2011 New Revision: 218374 URL: http://svn.freebsd.org/changeset/base/218374 Log: Treat fstat(2) failure (different than EBADF) as fatal error. Reported by: Mikolaj Golub MFC after: 1 week Modified: head/sbin/hastd/hastd.c Modified: head/sbin/hastd/hastd.c ============================================================================== --- head/sbin/hastd/hastd.c Sun Feb 6 14:06:37 2011 (r218373) +++ head/sbin/hastd/hastd.c Sun Feb 6 14:07:58 2011 (r218374) @@ -188,6 +188,7 @@ descriptors_assert(const struct hast_res snprintf(msg, sizeof(msg), "Unable to fstat descriptor %d: %s", fd, strerror(errno)); + break; } if (fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO) { From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 14:09:20 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3580C1065670; Sun, 6 Feb 2011 14:09:20 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 24ABE8FC14; Sun, 6 Feb 2011 14:09:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16E9KhZ067389; Sun, 6 Feb 2011 14:09:20 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16E9KRa067387; Sun, 6 Feb 2011 14:09:20 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201102061409.p16E9KRa067387@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Sun, 6 Feb 2011 14:09:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218375 - head/sbin/hastd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 14:09:20 -0000 Author: pjd Date: Sun Feb 6 14:09:19 2011 New Revision: 218375 URL: http://svn.freebsd.org/changeset/base/218375 Log: Add (void) cast before snprintf(3)s for which we are not interested in return values. MFC after: 1 week Modified: head/sbin/hastd/hastd.c Modified: head/sbin/hastd/hastd.c ============================================================================== --- head/sbin/hastd/hastd.c Sun Feb 6 14:07:58 2011 (r218374) +++ head/sbin/hastd/hastd.c Sun Feb 6 14:09:19 2011 (r218375) @@ -185,7 +185,7 @@ descriptors_assert(const struct hast_res } else { isopen = true; /* silence gcc */ mode = 0; /* silence gcc */ - snprintf(msg, sizeof(msg), + (void)snprintf(msg, sizeof(msg), "Unable to fstat descriptor %d: %s", fd, strerror(errno)); break; @@ -193,7 +193,7 @@ descriptors_assert(const struct hast_res if (fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO) { if (!isopen) { - snprintf(msg, sizeof(msg), + (void)snprintf(msg, sizeof(msg), "Descriptor %d (%s) is closed, but should be open.", fd, (fd == STDIN_FILENO ? "stdin" : (fd == STDOUT_FILENO ? "stdout" : "stderr"))); @@ -201,39 +201,39 @@ descriptors_assert(const struct hast_res } } else if (fd == proto_descriptor(res->hr_event)) { if (!isopen) { - snprintf(msg, sizeof(msg), + (void)snprintf(msg, sizeof(msg), "Descriptor %d (event) is closed, but should be open.", fd); break; } if (!S_ISSOCK(mode)) { - snprintf(msg, sizeof(msg), + (void)snprintf(msg, sizeof(msg), "Descriptor %d (event) is %s, but should be %s.", fd, dtype2str(mode), dtype2str(S_IFSOCK)); break; } } else if (fd == proto_descriptor(res->hr_ctrl)) { if (!isopen) { - snprintf(msg, sizeof(msg), + (void)snprintf(msg, sizeof(msg), "Descriptor %d (ctrl) is closed, but should be open.", fd); break; } if (!S_ISSOCK(mode)) { - snprintf(msg, sizeof(msg), + (void)snprintf(msg, sizeof(msg), "Descriptor %d (ctrl) is %s, but should be %s.", fd, dtype2str(mode), dtype2str(S_IFSOCK)); break; } } else if (fd == proto_descriptor(res->hr_conn)) { if (!isopen) { - snprintf(msg, sizeof(msg), + (void)snprintf(msg, sizeof(msg), "Descriptor %d (conn) is closed, but should be open.", fd); break; } if (!S_ISSOCK(mode)) { - snprintf(msg, sizeof(msg), + (void)snprintf(msg, sizeof(msg), "Descriptor %d (conn) is %s, but should be %s.", fd, dtype2str(mode), dtype2str(S_IFSOCK)); break; @@ -241,13 +241,13 @@ descriptors_assert(const struct hast_res } else if (res->hr_role == HAST_ROLE_SECONDARY && fd == proto_descriptor(res->hr_remotein)) { if (!isopen) { - snprintf(msg, sizeof(msg), + (void)snprintf(msg, sizeof(msg), "Descriptor %d (remote in) is closed, but should be open.", fd); break; } if (!S_ISSOCK(mode)) { - snprintf(msg, sizeof(msg), + (void)snprintf(msg, sizeof(msg), "Descriptor %d (remote in) is %s, but should be %s.", fd, dtype2str(mode), dtype2str(S_IFSOCK)); break; @@ -255,20 +255,20 @@ descriptors_assert(const struct hast_res } else if (res->hr_role == HAST_ROLE_SECONDARY && fd == proto_descriptor(res->hr_remoteout)) { if (!isopen) { - snprintf(msg, sizeof(msg), + (void)snprintf(msg, sizeof(msg), "Descriptor %d (remote out) is closed, but should be open.", fd); break; } if (!S_ISSOCK(mode)) { - snprintf(msg, sizeof(msg), + (void)snprintf(msg, sizeof(msg), "Descriptor %d (remote out) is %s, but should be %s.", fd, dtype2str(mode), dtype2str(S_IFSOCK)); break; } } else { if (isopen) { - snprintf(msg, sizeof(msg), + (void)snprintf(msg, sizeof(msg), "Descriptor %d is open (%s), but should be closed.", fd, dtype2str(mode)); break; From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 14:14:57 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 54472106566B; Sun, 6 Feb 2011 14:14:57 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.garage.freebsd.pl (60.wheelsystems.com [83.12.187.60]) by mx1.freebsd.org (Postfix) with ESMTP id EFF948FC1B; Sun, 6 Feb 2011 14:14:55 +0000 (UTC) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 9432645E9D; Sun, 6 Feb 2011 15:14:54 +0100 (CET) Received: from localhost (89-73-195-149.dynamic.chello.pl [89.73.195.149]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 384B745C9F; Sun, 6 Feb 2011 15:14:49 +0100 (CET) Date: Sun, 6 Feb 2011 15:14:28 +0100 From: Pawel Jakub Dawidek To: Mikolaj Golub Message-ID: <20110206141428.GE2035@garage.freebsd.pl> References: <201101282148.p0SLmF8W001192@svn.freebsd.org> <86aaiartxg.fsf@kopusha.home.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="VYvi4N5CyHZx5xNE" Content-Disposition: inline In-Reply-To: <86aaiartxg.fsf@kopusha.home.net> User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 9.0-CURRENT amd64 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-0.6 required=4.5 tests=BAYES_00,RCVD_IN_SORBS_DUL autolearn=no version=3.0.4 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218041 - head/sbin/hastd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 14:14:57 -0000 --VYvi4N5CyHZx5xNE Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Feb 06, 2011 at 12:35:39AM +0200, Mikolaj Golub wrote: [...] > I think tres->hr_ctrl, hr_event, and hr_conn should be closed here too (l= ike > in the attached patch). Otherwise descriptor assertion will fail in prima= ry if > you have more than one resource, on the second resource. You are right, committed. Thanks! --=20 Pawel Jakub Dawidek http://www.wheelsystems.com pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --VYvi4N5CyHZx5xNE Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAk1OrMQACgkQForvXbEpPzQyZwCgh5/mRsmHbmqlyI8iEkGA+ljE 0doAn3uQbiwk0udccxTjxU0WZwOFZMqo =VLdW -----END PGP SIGNATURE----- --VYvi4N5CyHZx5xNE-- From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 14:17:08 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AAC82106564A; Sun, 6 Feb 2011 14:17:08 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9A5E28FC17; Sun, 6 Feb 2011 14:17:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16EH8xN067651; Sun, 6 Feb 2011 14:17:08 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16EH8C5067649; Sun, 6 Feb 2011 14:17:08 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201102061417.p16EH8C5067649@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Sun, 6 Feb 2011 14:17:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218376 - head/sbin/hastd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 14:17:08 -0000 Author: pjd Date: Sun Feb 6 14:17:08 2011 New Revision: 218376 URL: http://svn.freebsd.org/changeset/base/218376 Log: Now that we break the loop on fstat(2) failure we no longer need to satisfy gcc's imperfections. MFC after: 1 week Modified: head/sbin/hastd/hastd.c Modified: head/sbin/hastd/hastd.c ============================================================================== --- head/sbin/hastd/hastd.c Sun Feb 6 14:09:19 2011 (r218375) +++ head/sbin/hastd/hastd.c Sun Feb 6 14:17:08 2011 (r218376) @@ -183,8 +183,6 @@ descriptors_assert(const struct hast_res isopen = false; mode = 0; } else { - isopen = true; /* silence gcc */ - mode = 0; /* silence gcc */ (void)snprintf(msg, sizeof(msg), "Unable to fstat descriptor %d: %s", fd, strerror(errno)); From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 14:18:37 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 34D361065670; Sun, 6 Feb 2011 14:18:37 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.garage.freebsd.pl (60.wheelsystems.com [83.12.187.60]) by mx1.freebsd.org (Postfix) with ESMTP id CCCAE8FC15; Sun, 6 Feb 2011 14:18:36 +0000 (UTC) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 987E445E9D; Sun, 6 Feb 2011 15:18:35 +0100 (CET) Received: from localhost (89-73-195-149.dynamic.chello.pl [89.73.195.149]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 6C97445EAA; Sun, 6 Feb 2011 15:18:30 +0100 (CET) Date: Sun, 6 Feb 2011 15:18:09 +0100 From: Pawel Jakub Dawidek To: Mikolaj Golub Message-ID: <20110206141809.GF2035@garage.freebsd.pl> References: <201101282156.p0SLulCc001547@svn.freebsd.org> <8662syrtm0.fsf@kopusha.home.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="NAwUDtUPse4omjmu" Content-Disposition: inline In-Reply-To: <8662syrtm0.fsf@kopusha.home.net> User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 9.0-CURRENT amd64 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-0.6 required=4.5 tests=BAYES_00,RCVD_IN_SORBS_DUL autolearn=no version=3.0.4 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r218044 - head/sbin/hastd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 14:18:37 -0000 --NAwUDtUPse4omjmu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Feb 06, 2011 at 12:42:31AM +0200, Mikolaj Golub wrote: [...] > PJD> + /* > PJD> + * At this point descriptor to syslog socket is closed, so= if we want > PJD> + * to log assertion message, we have to first store it in = 'msg' local > PJD> + * buffer and then open syslog socket and log it. > PJD> + */ > PJD> + msg[0] =3D '\0'; > PJD> + > PJD> + maxfd =3D sysconf(_SC_OPEN_MAX); > PJD> + if (maxfd < 0) { > PJD> + pjdlog_errno(LOG_WARNING, "sysconf(_SC_OPEN_MAX) f= ailed"); >=20 > As it is commented above :-) syslog socket is closed so we can't call > pjdlog_errno() here. Correct. Fix committed. > PJD> + } else { > PJD> + isopen =3D true; /* silence gcc */ > PJD> + mode =3D 0; /* silence gcc */ > PJD> + snprintf(msg, sizeof(msg), > PJD> + "Unable to fstat descriptor %d: %s", f= d, > PJD> + strerror(errno)); >=20 > Shouldn't it break here? Yes, I think we should. My initial idea it seems was that it isn't fatal error, but it becomes messy, as we will eventually overwrite msg buffer, so I added break there. Thanks! --=20 Pawel Jakub Dawidek http://www.wheelsystems.com pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --NAwUDtUPse4omjmu Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAk1OraEACgkQForvXbEpPzStHQCgnlNndiGoc7Wh0eQwNiwaGrpV 8XsAniyGyAMCRcLnaVDJUEFCj8+/TZxe =Nnlf -----END PGP SIGNATURE----- --NAwUDtUPse4omjmu-- From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 16:21:21 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 526B81065670; Sun, 6 Feb 2011 16:21:21 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3F8998FC0A; Sun, 6 Feb 2011 16:21:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16GLLBr070540; Sun, 6 Feb 2011 16:21:21 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16GLL2U070538; Sun, 6 Feb 2011 16:21:21 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201102061621.p16GLL2U070538@svn.freebsd.org> From: Hiroki Sato Date: Sun, 6 Feb 2011 16:21:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218377 - releng/8.2/release/doc/en_US.ISO8859-1/relnotes X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 16:21:21 -0000 Author: hrs Date: Sun Feb 6 16:21:21 2011 New Revision: 218377 URL: http://svn.freebsd.org/changeset/base/218377 Log: Add more relnotes items for 8.2R: CTLFLAG_RDTUNize vm.kmem_size*, debug.{kdb.stop_cpus,trace_on_panic}, kern.sync_on_panic, pxeboot(8) NFSv3 by default, bge(4) UDP checksum offloading bug tunable, bge(4) DMA bounce buffer handling improvement, sis(4) works on all supported platforms, WoL on DP8315, padding bug tunable, xl(4) WoL support, ipfw(4) netgraph + one_pass issue fixed, ipfw(4) ngtee action changed, pf(4) + TSO issue fixed, ahci(4) device reset timeout 10->15 seconds, ata(4) serverworks K2 SATA detection fixed, kenv boot.nfsroot.nfshandlelen added, more ZFS changes, gpart(8) better /dev/ prefix handling in command line, hastd(8) SIGHUP/SIGINT/SIGTERM handling, libarchive LZMA support, pax(1) off-by-one in ustar filename fixed, tftp(1) and tfptd(8) overhaul, and tzdata2010m. Approved by: re (implicit) Modified: releng/8.2/release/doc/en_US.ISO8859-1/relnotes/article.sgml Modified: releng/8.2/release/doc/en_US.ISO8859-1/relnotes/article.sgml ============================================================================== --- releng/8.2/release/doc/en_US.ISO8859-1/relnotes/article.sgml Sun Feb 6 14:17:08 2011 (r218376) +++ releng/8.2/release/doc/en_US.ISO8859-1/relnotes/article.sgml Sun Feb 6 16:21:21 2011 (r218377) @@ -186,6 +186,15 @@ displays the list of all created cdev's, consisting of devfs node name and struct cdev address. + The following sysctl + variables are also now loader tunables: + vm.kmem_size, + vm.kmem_size_max, and + vm.kmem_size_min, + debug.kdb.stop_cpus, + debug.trace_on_panic, and + kern.sync_on_panic. + The &os; &man.memguard.9; framework has been improved to make it able to detect use-after-free of allocated memories over a longer time. For more details, see @@ -194,7 +203,8 @@ Boot Loader Changes - + The &man.pxeboot.8; now uses NFS + version 3 instead of version 2 by default. @@ -233,12 +243,29 @@ the &man.alc.4; driver has been reduced from 50ms to 1ms. The 50ms timer resulted in a poor UDP performance. + The &man.bce.4; driver now supports + flow control. + A bug in the &man.bge.4; driver which prevents TSO in BCM57780 from working has been fixed. - The &man.bce.4; driver now supports - flow control. + UDP checksum offloading in the + &man.bge.4; driver has been disabled by default. This is + because Broadcom controllers have a bug which can generate + UDP datagrams with checksum value 0 + when TX UDP checksum offloading is enabled. The checksum + offloading can be enabled by using the following loader + tunable: + + dev.bge.N.forced_udpcsum + + A bug in the &man.bge.4; driver + which can lead poor performance on a system with RAM + larger than 4GB has been fixed. The cause was that all of + Broadcom controllers except for BCM5755 and later has 4GB + boundary DMA bug and the inefficient use of bounce + buffer. The &man.bwi.4; driver, which supports Broadcom BCM430* and BCM431* family Wireless Ethernet @@ -302,8 +329,8 @@ The &man.mwlfw.4; driver is now also provided as a kernel module. - The &man.rl.4; driver now supports WOL - (Wake On Lan) on RTL8139B or newer controllers. + The &man.rl.4; driver now supports WoL + (Wake on LAN) on RTL8139B or newer controllers. The &man.rl.4; driver now supports a device hint to change a way of register access. Although @@ -318,8 +345,24 @@ Note that the default value is 1. - Some stability issues in - the &man.sis.4; driver have been fixed. + The &man.sis.4; driver + now works on all supported platforms. Some stability and + performance issues have also been fixed. + + The &man.sis.4; driver now supports + WoL (Wake on LAN) on NS DP8315 controller. + + A tunable + dev.sis.N.manual_pad + for the &man.sis.4; driver has been added. This controls + whether padding with 0x00 for short frames by software, + not the controller. The reason why this tunable has been + added is that NS DP83815/DP83816 pads them with 0xff + though RFC 1042 specifies it should be 0x00. The tunable + is disabled by default, which means padding with 0xff is + used because padding with 0x00 by software needs extra CPU + cycles. Setting a non-zero value enables the software + padding. The &man.ste.4; driver now supports a device hint to change a way of register access. Although @@ -336,6 +379,11 @@ The checksum offloading can be enabled manually by using option in the &man.ifconfig.8; utility. + + The &man.xl.4; driver now supports + WoL (Wake on LAN). Note that not all controllers support + this functionality and some need an additional remote + wakeup cable. @@ -345,6 +393,15 @@ The &man.altq.4; support is now provided as a kernel module alq.ko. + A bug in the &man.ipfw.4; packet + filter subsystem has been fixed. The syctl variable + net.inet.ip.fw.one_pass did not work for + netgraph action. + + A ngtee action in + the &man.ipfw.4; packet filter subsystem has been changed. + It no longer accepts a packet. + IPsec flow distribution has been improved for more parallel processing. @@ -371,6 +428,10 @@ interface is now destroyed and recreated when the network interface is moved to another vnet. + An ICMP unreachable problem in the + &man.pf.4; packet filter subsystem when TSO support is + enabled has been fixed. + A TCP bandwidth delay product window limiting algorithm by a &man.sysctl.8; variable net.inet.tcp.inflight.enable is now @@ -406,6 +467,10 @@ and PMP support on VIA VT8251 because they are unreliable under load. + The &man.ahci.4; driver now uses 15 + seconds for device reset timeout instead of 10 seconds + because some devices needs 10-12 seconds to spin up. + The &man.arcmsr.4; driver has been updated to version 1.20.00.17. @@ -424,6 +489,10 @@ hw.ata.ata_dma_check_80pin is enabled. + A device detection of Serverworls K2 + SATA controllers in the &man.ata.4; has been + improved. + The &man.mpt.4; driver now supports larger I/O sizes which the device and &man.CAM.4; subsystem can support. This was limited to 64KB, and the number of @@ -438,6 +507,13 @@ File Systems + The &os; NFS client now supports a + kernel environment variable + boot.nfsroot.nfshandlelen. This lets the + diskless root file system on boot to use NFS version 3 and + the spedified file handle length. If this variable is not + set, NFS version 2 is used. + The ZFS on-disk format has been updated to version 15. @@ -447,37 +523,46 @@ related OpenSolaris Bug IDs are 6826241, 6869229, 6918420, and 6917066. - The default value of + Performance improvements for the ZFS + have been imported from OpenSolaris. They include cachin of + ACL permission checks, faster handling of &man.stat.2;, + mitigation of mutex lock contention. The related + OpenSolaris Bug IDs are 6802734, 6844861, 6848431, 6775100, + 6827779, 6857433, 6860318, 6865875, 6867395, 6868276, and + 6870564. + + The default value of vfs.zfs.vdev.max_pending has been decreased from 35 to 10 (OpenSolaris Bug ID is 6891731) to improve latency. - Bugs in the ZFS subsystem has been fixed. The - OpenSolaris Bug IDs are: 6798878, 6809683, 6794570, 6844069, - 6788152, 6843235, 6857012, 6870564, 6836714, 6836714, - 6870564, 6857012, 6843235, 6788152, 6844069, 6794570, - 6809683, 6798878, 6950219, 6953403, 6951024, 6809340, - 6755435, 6748436, 6740164, 6769612, 6757430, 6542860, - 6761100, 6774886, 6737463, 6765294, 6572357, 6572376, - 6328632, 6739487, 6767129, 6747698, 6745863, 6722540, - 6759999, 6758107, 6776548, 6761406, 6770866, 6674216, - 6621164, 6635482, 6595194, 6722991, 6396518, 6713916, - 6739553, 6784104, 6784108, 6788830, 6791064, 6791066, - 6791071, 6792134, 6792884, 6798384, 6551866, 6504953, - 6702206, 6780491, 6747596, 6801507, 6633095, 6775697, - 6790687, 6791101, 6800942, 6582163, 6804954, 6800184, - 6803822, 6789318, 6790345, 6797109, 6797118, 6803343, - 6815893, 6809691, 6790064, 6604992, 6810367, 6807765, - 6821169, 6821170, 6824006, 6792139, 6794830, 6824062, - 6816124, 6818183, 6710376, 6501037, 6827260, 6815592, - 6759986, 6774713, 6717022, 6799895, 6826466, 6826468, - 6826469, 6826470, 6826471, 6826472, 6833711, 6764124, - 6830237, 6833162, 6824968, 6834217, 6596237, 6623978, - 6801810, 6586537, 6836768, 6838062, 6794136, 6776104, - 6664765, 6841321, 6843069, 6847229, 6838344, 6844900, - 6857012, 6848242, 6856634, 6861983, 6862984, 6696858, - 6696858, 6882227, 6880764, 6793430, 6822816, 6892298, - 6807339, 6906110, 6906946, 6898245, and 6833999. + Various bugs in the ZFS subsystem have been fixed. The + related OpenSolaris Bug IDs are: 6328632, 6396518, 6501037, + 6504953, 6542860, 6551866, 6572357, 6572376, 6582163, + 6586537, 6595194, 6596237, 6604992, 6621164, 6623978, + 6633095, 6635482, 6664765, 6674216, 6696858, 6696858, + 6702206, 6710376, 6713916, 6717022, 6722540, 6722991, + 6737463, 6739487, 6739553, 6740164, 6745863, 6747596, + 6747698, 6748436, 6755435, 6757430, 6758107, 6759986, + 6759999, 6761100, 6761406, 6764124, 6765294, 6767129, + 6769612, 6770866, 6774713, 6774886, 6775697, 6776104, + 6776548, 6780491, 6784104, 6784108, 6788152, 6788152, + 6788830, 6789318, 6790064, 6790345, 6790687, 6791064, + 6791066, 6791071, 6791101, 6792134, 6792139, 6792884, + 6793430, 6794136, 6794570, 6794570, 6794830, 6797109, + 6797118, 6798384, 6798878, 6798878, 6799895, 6800184, + 6800942, 6801507, 6801810, 6803343, 6803822, 6804954, + 6807339, 6807765, 6809340, 6809683, 6809683, 6809691, + 6810367, 6815592, 6815893, 6816124, 6818183, 6821169, + 6821170, 6822816, 6824006, 6824062, 6824968, 6826466, + 6826468, 6826469, 6826470, 6826471, 6826472, 6827260, + 6830237, 6833162, 6833711, 6833999, 6834217, 6836714, + 6836714, 6836768, 6838062, 6838344, 6841321, 6843069, + 6843235, 6843235, 6844069, 6844069, 6844900, 6847229, + 6848242, 6856634, 6857012, 6857012, 6857012, 6861983, + 6862984, 6863610, 6870564, 6870564, 6880764, 6882227, + 6892298, 6898245, 6906110, 6906946, 6939941, 6950219, + 6951024, and 6953403. @@ -522,6 +607,16 @@ resize command to resize partitions for all schemes but EBR. + The &man.gpart.8; utility now handles + given geom/provider names with and without + /dev/ prefix. + + The &man.hastd.8; utility now supports + SIGHUP for reloading the configuration + file. When SIGTERM or + SIGINT is received, the worker processes + terminate. + The &man.ifconfig.8; utility now check an invalid CIDR subnet notation more strictly. It wrongly accepted 10.0.0.1/10.0.0.1 as @@ -531,11 +626,19 @@ sequences and reverse ranges in the &man.jot.1; utility have been fixed. + The libarchive and + &man.tar.1; utility now support LZMA (Lempel-Ziv-Markov + chain-Algorithm) compression format. + The &man.newsyslog.8; utility now supports an option to override the default &man.syslogd.8; PID file. + An off-by-one error in the &man.pax.1; + utility when ustar file name is too long has been + fixed. + The &man.pkill.1; utility now supports an option which the &man.kill.1; utility does. @@ -581,6 +684,10 @@ SIGINFO signal and reports the specified sleep time and the remaining time. + The &man.tftp.1; and &man.tftpd.8; + utilities have been improved for better interoperability and + they now supports RFC 1350, 2347, 2348, 2349, and 3617. + The &man.uname.1; utility now supports an flag as a synonym for the flag for compatibility with other @@ -637,7 +744,7 @@ version 8.14.4. --> The timezone database has been updated to the - tzdata2010l release. + tzdata2010m release. From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 17:40:28 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 068A0106566C; Sun, 6 Feb 2011 17:40:28 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CF4368FC15; Sun, 6 Feb 2011 17:40:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16HeRJd072266; Sun, 6 Feb 2011 17:40:27 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16HeRcs072263; Sun, 6 Feb 2011 17:40:27 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201102061740.p16HeRcs072263@svn.freebsd.org> From: Adrian Chadd Date: Sun, 6 Feb 2011 17:40:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218378 - head/sys/dev/ath X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 17:40:28 -0000 Author: adrian Date: Sun Feb 6 17:40:27 2011 New Revision: 218378 URL: http://svn.freebsd.org/changeset/base/218378 Log: Only tag packets with the A-MPDU bit if they were part of an A-MPDU RX. Whilst I'm here, add a counter to count said packets. Modified: head/sys/dev/ath/if_ath.c head/sys/dev/ath/if_athioctl.h Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Sun Feb 6 16:21:21 2011 (r218377) +++ head/sys/dev/ath/if_ath.c Sun Feb 6 17:40:27 2011 (r218378) @@ -3892,16 +3892,11 @@ rx_accept: IEEE80211_KEYIX_NONE : rs->rs_keyix); sc->sc_lastrs = rs; if (ni != NULL) { -#ifdef NOTYET - /* tag AMPDU aggregates for reorder processing */ - /* - * XXX this should only tag frames marked as aggregate; rather - * XXX than all frames. - */ - if (ni->ni_flags & IEEE80211_NODE_HT) - m->m_flags |= M_AMPDU; -#endif - + /* tag AMPDU aggregates for reorder processing */ + if (rs->rs_isaggr) { + + m->m_flags |= M_AMPDU; + } /* * Sending station is known, dispatch directly. */ @@ -6499,4 +6494,6 @@ ath_sysctl_stats_attach(struct ath_softc &sc->sc_stats.ast_be_missed, 0, "number of -missed- beacons"); SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_ani_cal", CTLFLAG_RD, &sc->sc_stats.ast_ani_cal, 0, "number of ANI polls"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_agg", CTLFLAG_RD, + &sc->sc_stats.ast_rx_agg, 0, "number of aggregate frames received"); } Modified: head/sys/dev/ath/if_athioctl.h ============================================================================== --- head/sys/dev/ath/if_athioctl.h Sun Feb 6 16:21:21 2011 (r218377) +++ head/sys/dev/ath/if_athioctl.h Sun Feb 6 17:40:27 2011 (r218378) @@ -120,7 +120,8 @@ struct ath_stats { u_int32_t ast_tx_nofrag; /* tx dropped 'cuz no ath frag buffer */ u_int32_t ast_be_missed; /* missed beacons */ u_int32_t ast_ani_cal; /* ANI calibrations performed */ - u_int32_t ast_pad[12]; + u_int32_t ast_rx_agg; /* number of aggregate frames RX'ed */ + u_int32_t ast_pad[11]; }; #define SIOCGATHSTATS _IOWR('i', 137, struct ifreq) From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 20:11:24 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 765A0106566C; Sun, 6 Feb 2011 20:11:24 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 646D78FC0C; Sun, 6 Feb 2011 20:11:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16KBOqu075650; Sun, 6 Feb 2011 20:11:24 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16KBOx2075648; Sun, 6 Feb 2011 20:11:24 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201102062011.p16KBOx2075648@svn.freebsd.org> From: Adrian Chadd Date: Sun, 6 Feb 2011 20:11:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218379 - head/sys/dev/ath X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 20:11:24 -0000 Author: adrian Date: Sun Feb 6 20:11:24 2011 New Revision: 218379 URL: http://svn.freebsd.org/changeset/base/218379 Log: Just tag all RX packets as needing reorder processing for now. This fixes two problems - * All packets need to be processed here, not just aggregate ones - as any received frames (AMPDU or otherwise) in the given TID (traffic class id) will update the sequence number and, implied with that, update the window; * It seems there's situations where packets aren't matching a current node but somehow need to be tracked. Thus just tag them all for now; I'll figure out the why later. Whilst I'm here, bump the stats counters whilst I'm at it. This fixes AMPDU RX in my tests; the main problems now stem from what look like PHY level error/retransmits which are impeding general throughput, incl. AMPDU. Modified: head/sys/dev/ath/if_ath.c Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Sun Feb 6 17:40:27 2011 (r218378) +++ head/sys/dev/ath/if_ath.c Sun Feb 6 20:11:24 2011 (r218379) @@ -3891,12 +3891,19 @@ rx_accept: rs->rs_keyix == HAL_RXKEYIX_INVALID ? IEEE80211_KEYIX_NONE : rs->rs_keyix); sc->sc_lastrs = rs; + /* tag AMPDU aggregates for reorder processing */ + /* + * Just make sure all frames are tagged for AMPDU reorder checking. + * As there seems to be some situations where single frames aren't + * matching a node but bump the seqno. This needs to be investigated. + */ + m->m_flags |= M_AMPDU; + + /* Keep statistics on the number of aggregate packets received */ + if (rs->rs_isaggr) + sc->sc_stats.ast_rx_agg++; + if (ni != NULL) { - /* tag AMPDU aggregates for reorder processing */ - if (rs->rs_isaggr) { - - m->m_flags |= M_AMPDU; - } /* * Sending station is known, dispatch directly. */ From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 22:18:37 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BBD4E106566C; Sun, 6 Feb 2011 22:18:37 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AA3E88FC08; Sun, 6 Feb 2011 22:18:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16MIbK9078725; Sun, 6 Feb 2011 22:18:37 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16MIbEE078723; Sun, 6 Feb 2011 22:18:37 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201102062218.p16MIbEE078723@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 6 Feb 2011 22:18:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218382 - head/sys/ia64/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 22:18:37 -0000 Author: marcel Date: Sun Feb 6 22:18:37 2011 New Revision: 218382 URL: http://svn.freebsd.org/changeset/base/218382 Log: Comment-out FLOWTABLE. It causes a kernel panic due to a misaligned memory access related to an IPv6 route update. PR: kern/148018 Modified: head/sys/ia64/conf/GENERIC Modified: head/sys/ia64/conf/GENERIC ============================================================================== --- head/sys/ia64/conf/GENERIC Sun Feb 6 21:42:28 2011 (r218381) +++ head/sys/ia64/conf/GENERIC Sun Feb 6 22:18:37 2011 (r218382) @@ -31,7 +31,8 @@ options COMPAT_FREEBSD7 # Compatible wi options DDB # Support DDB options DEADLKRES # Enable the deadlock resolver options FFS # Berkeley Fast Filesystem -options FLOWTABLE # per-cpu routing cache +#options FLOWTABLE # per-cpu routing cache (removed due to + # misaligned access -- see kern/148018) options GDB # Support remote GDB options GEOM_LABEL # Provides labelization options INCLUDE_CONFIG_FILE # Include this file in kernel From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 22:21:19 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3DDA81065670; Sun, 6 Feb 2011 22:21:19 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 20CD18FC12; Sun, 6 Feb 2011 22:21:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16MLJTu078822; Sun, 6 Feb 2011 22:21:19 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16MLJ2N078820; Sun, 6 Feb 2011 22:21:19 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201102062221.p16MLJ2N078820@svn.freebsd.org> From: Juli Mallett Date: Sun, 6 Feb 2011 22:21:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218383 - head/sys/mips/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 22:21:19 -0000 Author: jmallett Date: Sun Feb 6 22:21:18 2011 New Revision: 218383 URL: http://svn.freebsd.org/changeset/base/218383 Log: o) Cavium Octeon doesn't need nop barriers. o) Have mips_wblush just do syncw, not sync on Cavium Octeon. o) Add support for reading and writing some Octeon-specific registers. NB: Some of these are not entirely Octeon-specific. Submitted by: Bhanu Prakash Modified: head/sys/mips/include/cpufunc.h Modified: head/sys/mips/include/cpufunc.h ============================================================================== --- head/sys/mips/include/cpufunc.h Sun Feb 6 22:18:37 2011 (r218382) +++ head/sys/mips/include/cpufunc.h Sun Feb 6 22:21:18 2011 (r218383) @@ -69,6 +69,9 @@ static __inline void mips_barrier(void) { +#ifdef CPU_CNMIPS + __asm __volatile("" : : : "memory"); +#else __asm __volatile (".set noreorder\n\t" "nop\n\t" "nop\n\t" @@ -80,6 +83,7 @@ mips_barrier(void) "nop\n\t" ".set reorder\n\t" : : : "memory"); +#endif } static __inline void @@ -91,8 +95,15 @@ mips_cp0_sync(void) static __inline void mips_wbflush(void) { +#if defined(CPU_CNMIPS) + __asm __volatile (".set noreorder\n\t" + "syncw\n\t" + ".set reorder\n" + : : : "memory"); +#else __asm __volatile ("sync" : : : "memory"); mips_barrier(); +#endif } static __inline void @@ -136,10 +147,37 @@ mips_wr_ ## n (uint64_t a0) \ mips_barrier(); \ } struct __hack +#define MIPS_RW64_COP0_SEL(n,r,s) \ +static __inline uint64_t \ +mips_rd_ ## n(void) \ +{ \ + int v0; \ + __asm __volatile ("dmfc0 %[v0], $"__XSTRING(r)", "__XSTRING(s)";" \ + : [v0] "=&r"(v0)); \ + mips_barrier(); \ + return (v0); \ +} \ +static __inline void \ +mips_wr_ ## n(uint64_t a0) \ +{ \ + __asm __volatile ("dmtc0 %[a0], $"__XSTRING(r)", "__XSTRING(s)";" \ + __XSTRING(COP0_SYNC)";" \ + : \ + : [a0] "r"(a0)); \ + mips_barrier(); \ +} struct __hack + #if defined(__mips_n64) MIPS_RW64_COP0(excpc, MIPS_COP_0_EXC_PC); MIPS_RW64_COP0(entryhi, MIPS_COP_0_TLB_HI); MIPS_RW64_COP0(pagemask, MIPS_COP_0_TLB_PG_MASK); +#ifdef CPU_CNMIPS +MIPS_RW64_COP0_SEL(cvmcount, MIPS_COP_0_COUNT, 6); +MIPS_RW64_COP0_SEL(cvmctl, MIPS_COP_0_COUNT, 7); +MIPS_RW64_COP0_SEL(cvmmemctl, MIPS_COP_0_COMPARE, 7); +MIPS_RW64_COP0_SEL(icache_err, MIPS_COP_0_CACHE_ERR, 0); +MIPS_RW64_COP0_SEL(dcache_err, MIPS_COP_0_CACHE_ERR, 1); +#endif #endif #if defined(__mips_n64) || defined(__mips_n32) /* PHYSADDR_64_BIT */ MIPS_RW64_COP0(entrylo0, MIPS_COP_0_TLB_LO0); @@ -148,6 +186,7 @@ MIPS_RW64_COP0(entrylo1, MIPS_COP_0_TLB_ MIPS_RW64_COP0(xcontext, MIPS_COP_0_TLB_XCONTEXT); #undef MIPS_RW64_COP0 +#undef MIPS_RW64_COP0_SEL #endif #define MIPS_RW32_COP0(n,r) \ @@ -212,6 +251,9 @@ MIPS_RW32_COP0(config, MIPS_COP_0_CONFIG MIPS_RW32_COP0_SEL(config1, MIPS_COP_0_CONFIG, 1); MIPS_RW32_COP0_SEL(config2, MIPS_COP_0_CONFIG, 2); MIPS_RW32_COP0_SEL(config3, MIPS_COP_0_CONFIG, 3); +#ifdef CPU_CNMIPS +MIPS_RW32_COP0_SEL(config4, MIPS_COP_0_CONFIG, 4); +#endif MIPS_RW32_COP0(count, MIPS_COP_0_COUNT); MIPS_RW32_COP0(index, MIPS_COP_0_TLB_INDEX); MIPS_RW32_COP0(wired, MIPS_COP_0_TLB_WIRED); From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 22:40:45 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82D80106564A; Sun, 6 Feb 2011 22:40:45 +0000 (UTC) (envelope-from dchagin@dchagin.static.corbina.ru) Received: from contrabass.post.ru (contrabass.post.ru [85.21.78.5]) by mx1.freebsd.org (Postfix) with ESMTP id 2D8A58FC1B; Sun, 6 Feb 2011 22:40:44 +0000 (UTC) Received: from corbina.ru (mail.post.ru [195.14.50.16]) by contrabass.post.ru (Postfix) with ESMTP id 75F09CA332; Mon, 7 Feb 2011 01:15:14 +0300 (MSK) X-Virus-Scanned: by cgpav Uf39PSi9pFi9oFi9 Received: from [10.208.17.3] (HELO dchagin.static.corbina.ru) by corbina.ru (CommuniGate Pro SMTP 5.1.14) with ESMTPS id 298778863; Mon, 07 Feb 2011 01:15:14 +0300 Received: from dchagin.static.corbina.ru (localhost [127.0.0.1]) by dchagin.static.corbina.ru (8.14.4/8.14.4) with ESMTP id p16MFDrQ013698; Mon, 7 Feb 2011 01:15:13 +0300 (MSK) (envelope-from dchagin@dchagin.static.corbina.ru) Received: (from dchagin@localhost) by dchagin.static.corbina.ru (8.14.4/8.14.4/Submit) id p16MF8Gm013697; Mon, 7 Feb 2011 01:15:08 +0300 (MSK) (envelope-from dchagin) Date: Mon, 7 Feb 2011 01:15:08 +0300 From: Chagin Dmitry To: John Baldwin Message-ID: <20110206221508.GA13630@dchagin.static.corbina.ru> References: <201101131422.p0DEMRHk053165@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="xHFwDpU9dbj6ez1V" Content-Disposition: inline In-Reply-To: <201101131422.p0DEMRHk053165@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r217351 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 22:40:45 -0000 --xHFwDpU9dbj6ez1V Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 13, 2011 at 02:22:27PM +0000, John Baldwin wrote: > Author: jhb > Date: Thu Jan 13 14:22:27 2011 > New Revision: 217351 > URL: http://svn.freebsd.org/changeset/base/217351 >=20 > Log: > Introduce two new helper macros to define the priority ranges used for > interactive timeshare threads (PRI_*_INTERACTIVE) and non-interactive > timeshare threads (PRI_*_BATCH) and use these instead of PRI_*_REALTIME > and PRI_*_TIMESHARE. No functional change. > =20 > Reviewed by: jeff Hi, John. Got a panic in vbox: Mon Feb 7 00:57:27 MSK 2011 FreeBSD amd64 9.0-CURRENT FreeBSD 9.0-CURRENT #2 r218225+ae81d3a: Sun Feb 6 21:57:31 MSK 2011 root@amd64:/usr/obj/usr/work/head/sys/YOY amd64 panic: sched_priority: invalid priority 3920: nice 0, ticks 122826752 ftick 185416 ltick 186416 tick pri 3748 --=20 Have fun! chd --xHFwDpU9dbj6ez1V Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iEYEARECAAYFAk1PHWoACgkQ0t2Tb3OO/O1/+wCeP/nBfAYEWnZM9IW0uX71PSTu pzMAoJBUf+kvzord2n6Vk3Mjjpi2Hj0B =wghs -----END PGP SIGNATURE----- --xHFwDpU9dbj6ez1V-- From owner-svn-src-all@FreeBSD.ORG Sun Feb 6 22:46:07 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C080C1065674; Sun, 6 Feb 2011 22:46:07 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AA8AB8FC12; Sun, 6 Feb 2011 22:46:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p16Mk7MD080946; Sun, 6 Feb 2011 22:46:07 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16Mk7K5080930; Sun, 6 Feb 2011 22:46:07 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201102062246.p16Mk7K5080930@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Feb 2011 22:46:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218384 - in head: contrib/bind9 contrib/bind9/bin/check contrib/bind9/bin/dig contrib/bind9/bin/dnssec contrib/bind9/bin/named contrib/bind9/bin/named/include/named contrib/bind9/bin/n... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2011 22:46:07 -0000 Author: dougb Date: Sun Feb 6 22:46:07 2011 New Revision: 218384 URL: http://svn.freebsd.org/changeset/base/218384 Log: Update to BIND 9.6.3, the latest from ISC on the 9.6 branch. All 9.6 users with DNSSEC validation enabled should upgrade to this version, or the latest version in the 9.7 branch, prior to 2011-03-31 in order to avoid validation failures for names in .COM as described here: https://www.isc.org/announcement/bind-9-dnssec-validation-fails-new-ds-record In addition the fixes for this and other bugs, there are also the following: * Various fixes to kerberos support, including GSS-TSIG * Various fixes to avoid leaking memory, and to problems that could prevent a clean shutdown of named Added: head/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.html - copied unchanged from r218352, vendor/bind9/dist/RELEASE-NOTES-BIND-9.6.3.html head/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.pdf - copied unchanged from r218352, vendor/bind9/dist/RELEASE-NOTES-BIND-9.6.3.pdf head/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.txt - copied unchanged from r218352, vendor/bind9/dist/RELEASE-NOTES-BIND-9.6.3.txt Deleted: head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.html head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.pdf head/contrib/bind9/RELEASE-NOTES-BIND-9.6-ESV.txt head/contrib/bind9/release-notes.css Modified: head/contrib/bind9/CHANGES head/contrib/bind9/COPYRIGHT head/contrib/bind9/README head/contrib/bind9/bin/check/check-tool.c head/contrib/bind9/bin/check/check-tool.h head/contrib/bind9/bin/check/named-checkconf.c head/contrib/bind9/bin/check/named-checkzone.c head/contrib/bind9/bin/dig/dig.c head/contrib/bind9/bin/dig/dighost.c head/contrib/bind9/bin/dig/host.c head/contrib/bind9/bin/dig/nslookup.1 head/contrib/bind9/bin/dig/nslookup.docbook head/contrib/bind9/bin/dig/nslookup.html head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8 head/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html head/contrib/bind9/bin/dnssec/dnssec-keygen.html head/contrib/bind9/bin/dnssec/dnssec-signzone.c head/contrib/bind9/bin/dnssec/dnssec-signzone.html head/contrib/bind9/bin/named/builtin.c head/contrib/bind9/bin/named/client.c head/contrib/bind9/bin/named/control.c head/contrib/bind9/bin/named/include/named/globals.h head/contrib/bind9/bin/named/include/named/query.h head/contrib/bind9/bin/named/main.c head/contrib/bind9/bin/named/query.c head/contrib/bind9/bin/named/server.c head/contrib/bind9/bin/named/update.c head/contrib/bind9/bin/named/xfrout.c head/contrib/bind9/bin/nsupdate/nsupdate.1 head/contrib/bind9/bin/nsupdate/nsupdate.c head/contrib/bind9/bin/nsupdate/nsupdate.docbook head/contrib/bind9/bin/nsupdate/nsupdate.html head/contrib/bind9/config.h.in head/contrib/bind9/config.threads.in head/contrib/bind9/configure.in head/contrib/bind9/doc/arm/Bv9ARM-book.xml head/contrib/bind9/doc/arm/Bv9ARM.ch06.html head/contrib/bind9/doc/arm/Bv9ARM.ch07.html head/contrib/bind9/doc/arm/Bv9ARM.ch08.html head/contrib/bind9/doc/arm/Bv9ARM.ch09.html head/contrib/bind9/doc/arm/Bv9ARM.html head/contrib/bind9/doc/arm/Bv9ARM.pdf head/contrib/bind9/doc/arm/man.dig.html head/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html head/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html head/contrib/bind9/doc/arm/man.dnssec-keygen.html head/contrib/bind9/doc/arm/man.dnssec-signzone.html head/contrib/bind9/doc/arm/man.host.html head/contrib/bind9/doc/arm/man.named-checkconf.html head/contrib/bind9/doc/arm/man.named-checkzone.html head/contrib/bind9/doc/arm/man.named.html head/contrib/bind9/doc/arm/man.nsupdate.html head/contrib/bind9/doc/arm/man.rndc-confgen.html head/contrib/bind9/doc/arm/man.rndc.conf.html head/contrib/bind9/doc/arm/man.rndc.html head/contrib/bind9/doc/misc/options head/contrib/bind9/lib/bind9/api head/contrib/bind9/lib/bind9/check.c head/contrib/bind9/lib/dns/Makefile.in head/contrib/bind9/lib/dns/adb.c head/contrib/bind9/lib/dns/api head/contrib/bind9/lib/dns/dst_api.c head/contrib/bind9/lib/dns/dst_internal.h head/contrib/bind9/lib/dns/gssapictx.c head/contrib/bind9/lib/dns/include/dns/diff.h head/contrib/bind9/lib/dns/include/dns/events.h head/contrib/bind9/lib/dns/include/dns/name.h head/contrib/bind9/lib/dns/include/dns/ncache.h head/contrib/bind9/lib/dns/include/dns/rdataset.h head/contrib/bind9/lib/dns/include/dns/resolver.h head/contrib/bind9/lib/dns/include/dns/result.h head/contrib/bind9/lib/dns/include/dns/tsig.h head/contrib/bind9/lib/dns/include/dns/types.h head/contrib/bind9/lib/dns/include/dns/validator.h head/contrib/bind9/lib/dns/include/dns/view.h head/contrib/bind9/lib/dns/include/dns/zone.h head/contrib/bind9/lib/dns/include/dst/dst.h head/contrib/bind9/lib/dns/journal.c head/contrib/bind9/lib/dns/message.c head/contrib/bind9/lib/dns/name.c head/contrib/bind9/lib/dns/ncache.c head/contrib/bind9/lib/dns/openssl_link.c head/contrib/bind9/lib/dns/rbtdb.c head/contrib/bind9/lib/dns/rdata.c head/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c head/contrib/bind9/lib/dns/rdata/generic/nsec_47.c head/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c head/contrib/bind9/lib/dns/rdatalist.c head/contrib/bind9/lib/dns/rdataset.c head/contrib/bind9/lib/dns/rdataslab.c head/contrib/bind9/lib/dns/resolver.c head/contrib/bind9/lib/dns/result.c head/contrib/bind9/lib/dns/rootns.c head/contrib/bind9/lib/dns/sdb.c head/contrib/bind9/lib/dns/sdlz.c head/contrib/bind9/lib/dns/time.c head/contrib/bind9/lib/dns/tkey.c head/contrib/bind9/lib/dns/tsig.c head/contrib/bind9/lib/dns/validator.c head/contrib/bind9/lib/dns/view.c head/contrib/bind9/lib/dns/zone.c head/contrib/bind9/lib/isc/Makefile.in head/contrib/bind9/lib/isc/api head/contrib/bind9/lib/isc/entropy.c head/contrib/bind9/lib/isc/include/isc/mem.h head/contrib/bind9/lib/isc/include/isc/platform.h.in head/contrib/bind9/lib/isc/include/isc/task.h head/contrib/bind9/lib/isc/mem.c head/contrib/bind9/lib/isc/nothreads/Makefile.in head/contrib/bind9/lib/isc/print.c head/contrib/bind9/lib/isc/pthreads/mutex.c head/contrib/bind9/lib/isc/task.c head/contrib/bind9/lib/isc/unix/socket.c head/contrib/bind9/lib/isccfg/api head/contrib/bind9/lib/isccfg/namedconf.c head/contrib/bind9/lib/lwres/man/lwres.html head/contrib/bind9/lib/lwres/man/lwres_buffer.html head/contrib/bind9/lib/lwres/man/lwres_config.html head/contrib/bind9/lib/lwres/man/lwres_context.html head/contrib/bind9/lib/lwres/man/lwres_gabn.html head/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html head/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html head/contrib/bind9/lib/lwres/man/lwres_gethostent.html head/contrib/bind9/lib/lwres/man/lwres_getipnode.html head/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html head/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html head/contrib/bind9/lib/lwres/man/lwres_gnba.html head/contrib/bind9/lib/lwres/man/lwres_hstrerror.html head/contrib/bind9/lib/lwres/man/lwres_inetntop.html head/contrib/bind9/lib/lwres/man/lwres_noop.html head/contrib/bind9/lib/lwres/man/lwres_packet.html head/contrib/bind9/lib/lwres/man/lwres_resutil.html head/contrib/bind9/lib/lwres/print_p.h head/contrib/bind9/version head/lib/bind/config.h head/lib/bind/dns/code.h head/lib/bind/dns/dns/enumclass.h head/lib/bind/dns/dns/enumtype.h head/lib/bind/dns/dns/rdatastruct.h head/lib/bind/isc/isc/platform.h Directory Properties: head/contrib/bind9/ (props changed) Modified: head/contrib/bind9/CHANGES ============================================================================== --- head/contrib/bind9/CHANGES Sun Feb 6 22:21:18 2011 (r218383) +++ head/contrib/bind9/CHANGES Sun Feb 6 22:46:07 2011 (r218384) @@ -1,5 +1,54 @@ + --- 9.6.3 released --- - --- 9.6-ESV-R3 released --- +3009. [bug] clients-per-query code didn't work as expected with + particular query patterns. [RT #22972] + + --- 9.6.3rc1 released --- + +3007. [bug] Named failed to preserve the case of domain names in + rdata which is not compressible when writing master + files. [RT #22863] + +3002. [bug] isc_mutex_init_errcheck() failed to destroy attr. + [RT #22766] + +2996. [security] Temporarily disable SO_ACCEPTFILTER support. + [RT #22589] + +2995. [bug] The Kerberos realm was not being correctly extracted + from the signer's identity. [RT #22770] + +2994. [port] NetBSD: use pthreads by default on NetBSD >= 5.0, and + do not use threads on earlier versions. Also kill + the unproven-pthreads, mit-pthreads, and ptl2 support. + +2984. [bug] Don't run MX checks when the target of the MX record + is ".". [RT #22645] + +2817. [cleanup] Removed unnecessary isc_task_endexclusive() calls. + [RT #20768] + + --- 9.6.3b1 released --- + +2982. [bug] Reference count dst keys. dst_key_attach() can be used + increment the reference count. + + Note: dns_tsigkey_createfromkey() callers should now + always call dst_key_free() rather than setting it + to NULL on success. [RT #22672] + +2979. [bug] named could deadlock during shutdown if two + "rndc stop" commands were issued at the same + time. [RT #22108] + +2978. [port] hpux: look for [RT #21919] + +2976. [bug] named could die on exit after negotiating a GSS-TSIG + key. [RT #22573] + +2975. [bug] rbtdb.c:cleanup_dead_nodes_callback() aquired the + wrong lock which could lead to server deadlock. + [RT #22614] 2972. [bug] win32: address windows socket errors. [RT #21906] @@ -36,6 +85,9 @@ justified character with a non zero width, (e.g. "%-1c"). [RT #22270] +2965. [func] Test HMAC functions using test data from RFC 2104 and + RFC 4634. [RT #21702] + 2964. [bug] view->queryacl was being overloaded. Seperate the usage into view->queryacl, view->cacheacl and view->queryonacl. [RT #22114] @@ -43,6 +95,25 @@ 2962. [port] win32: add more dependencies to BINDBuild.dsw. [RT #22062] +2960. [func] Check that named accepts non-authoritative answers. + [RT #21594] + +2959. [func] Check that named starts with a missing masterfile. + [RT #22076] + +2957. [bug] entropy_get() and entropy_getpseudo() failed to match + the API for RAND_bytes() and RAND_pseudo_bytes() + respectively. [RT #21962] + +2956. [port] Enable atomic operations on the PowerPC64. [RT #21899] + +2954. [bug] contrib: dlz_mysql_driver.c bad error handling on + build_sqldbinstance failure. [RT #21623] + +2953. [bug] Silence spurious "expected covering NSEC3, got an + exact match" message when returning a wildcard + no data response. [RT #21744] + 2952. [port] win32: named-checkzone and named-checkconf failed to initialise winsock. [RT #21932] @@ -50,7 +121,23 @@ in a optout, delegation only zone with no secure delegations. [RT #22007] - --- 9.6-ESV-R2 released --- +2950. [bug] named failed to perform a SOA up to date check when + falling back to TCP on UDP timeouts when + ixfr-from-differences was set. [RT #21595] + +2946. [doc] Document the default values for the minimum and maximum + zone refresh and retry values in the ARM. [RT #21886] + +2945. [doc] Update empty-zones list in ARM. [RT #21772] + +2944. [maint] Remove ORCHID prefix from built in empty zones. + [RT #21772] + +2942. [contrib] zone2sqlite failed to setup the entropy sources. + [RT #21610] + +2941. [bug] sdb and sdlz (dlz's zone database) failed to support + DNAME at the zone apex. [RT #21610] 2939. [func] Check that named successfully skips NSEC3 records that fail to match the NSEC3PARAM record currently @@ -73,31 +160,173 @@ likely that the bug happens only when enabling threads, but it's not confirmed yet. [RT #21818] +2935. [bug] nsupdate: improve 'file not found' error message. + [RT #21871] + +2934. [bug] Use ANSI C compliant shift range in lib/isc/entropy.c. + [RT #21871] + +2933. [bug] 'dig +nsid' used stack memory after it went out of + scope. This could potentially result in a unknown, + potentially malformed, EDNS option being sent instead + of the desired NSID option. [RT #21781] + +2932. [cleanup] Corrected a numbering error in the "dnssec" test. + [RT #21597] + +2931. [bug] Temporarily and partially disable change 2864 + because it would cause infinite attempts of RRSIG + queries. This is an urgent care fix; we'll + revisit the issue and complete the fix later. + [RT #21710] + +2929. [bug] Improved handling of GSS security contexts: + - added LRU expiration for generated TSIGs + - added the ability to use a non-default realm + - added new "realm" keyword in nsupdate + - limited lifetime of generated keys to 1 hour + or the lifetime of the context (whichever is + smaller) + [RT #19737] + 2925. [bug] Named failed to accept uncachable negative responses from insecure zones. [RT# 21555] +2923. [bug] 'dig +trace' could drop core after "connection + timeout". [RT #21514] + +2922. [contrib] Update zkt to version 1.0. + 2921. [bug] The resolver could attempt to destroy a fetch context too soon. [RT #19878] +2918. [maint] Add AAAA address for I.ROOT-SERVERS.NET. + +2916. [func] Add framework to use IPv6 in tests. + fd92:7065:b8e:ffff::1 ... fd92:7065:b8e:ffff::7 + +2915. [cleanup] Be smarter about which objects we attempt to compile + based on configure options. [RT #21444] + +2912. [func] Windows clients don't like UPDATE responses that clear + the zone section. [RT #20986] + +2911. [bug] dnssec-signzone didn't handle out of zone records well. + [RT #21367] + +2910. [func] Sanity check Kerberos credentials. [RT #20986] + +2908. [bug] It was possible for re-signing to stop after removing + a DNSKEY. [RT #21384] + +2905. [port] aix: set use_atomic=yes with native compiler. + [RT #21402] + +2904. [bug] When using DLV, sub-zones of the zones in the DLV, + could be incorrectly marked as insecure instead of + secure leading to negative proofs failing. This was + a unintended outcome from change 2890. [RT# 21392] + +2901. [port] Use AC_C_FLEXIBLE_ARRAY_MEMBER. [RT #21316] + 2900. [bug] The placeholder negative caching element was not - properly constructed triggering a INSIST in + properly constructed triggering a INSIST in dns_ncache_towire(). [RT #21346] - + +2899. [port] win32: Support linking against OpenSSL 1.0.0. + +2898. [bug] nslookup leaked memory when -domain=value was + specified. [RT #21301] + +2894. [contrib] DLZ LDAP support now use '$' not '%'. [RT #21294] + +2891. [maint] Update empty-zones list to match + draft-ietf-dnsop-default-local-zones-13. [RT# 21099] + 2890. [bug] Handle the introduction of new trusted-keys and DS, DLV RRsets better. [RT #21097] -2869. [bug] Fix arguments to dns_keytable_findnextkeynode() call. - [RT #20877] +2889. [bug] Elements of the grammar where not properly reported. + [RT #21046] + +2888. [bug] Only the first EDNS option was displayed. [RT #21273] + +2885. [bug] Improve -fno-strict-aliasing support probing in + configure. [RT #21080] + +2884. [bug] Insufficient validation in dns_name_getlabelsequence(). + [RT #21283] + +2883. [bug] 'dig +short' failed to handle really large datasets. + [RT #21113] + +2882. [bug] Remove memory context from list of active contexts + before clearing 'magic'. [RT #21274] + +2881. [bug] Reduce the amount of time the rbtdb write lock + is held when closing a version. [RT #21198] + +2879. [contrib] DLZ bdbhpt driver fails to close correct cursor. + [RT #21106] - --- 9.6-ESV-R1 released --- +2877. [bug] The validator failed to skip obviously mismatching + RRSIGs. [RT #21138] 2876. [bug] Named could return SERVFAIL for negative responses from unsigned zones. [RT #21131] - --- 9.6-ESV released --- +2875. [bug] dns_time64_fromtext() could accept non digits. + [RT #21033] + +2874. [bug] Cache lack of EDNS support only after the server + successfully responds to the query using plain DNS. + [RT #20930] + +2870. [maint] Add AAAA address for L.ROOT-SERVERS.NET. + +2869. [bug] Fix arguments to dns_keytable_findnextkeynode() call. + [RT #20877] + +2868. [cleanup] Run "make clean" at the end of configure to ensure + any changes made by configure are integrated. + Use --with-make-clean=no to disable. [RT #20994] + +2867. [bug] Don't set GSS_C_SEQUENCE_FLAG as Windows DNS servers + don't like it. [RT #20986] + +2866. [bug] Windows does not like the TSIG name being compressed. + [RT #20986] + +2865. [bug] memset to zero event.data. [RT #20986] + +2864. [bug] Direct SIG/RRSIG queries were not handled correctly. + [RT #21050] + +2863. [port] linux: disable IPv6 PMTUD and use network minimum MTU. + [RT #21056] + +2862. [bug] nsupdate didn't default to the parent zone when + updating DS records. [RT #20896] + +2859. [bug] When cancelling validation it was possible to leak + memory. [RT #20800] + +2858. [bug] RTT estimates were not being adjusted on ICMP errors. + [RT #20772] + +2857. [bug] named-checkconf did not fail on a bad trusted key. + [RT #20705] + +2856. [bug] The size of a memory allocation was not always properly + recorded. [RT #20927] + +2853. [bug] add_sigs() could run out of scratch space. [RT #21015] 2852. [bug] Handle broken DNSSEC trust chains better. [RT #15619] +2851. [doc] nslookup.1, removed from the docbook + source as it produced bad nroff. [RT #21007] + --- 9.6.2 released --- 2850. [bug] If isc_heap_insert() failed due to memory shortage @@ -138,10 +367,10 @@ 2823. [bug] rbtdb.c:getsigningtime() was missing locks. [RT #20781] -2819. [cleanup] Removed unnecessary DNS_POINTER_MAXHOPS define +2819. [cleanup] Removed unnecessary DNS_POINTER_MAXHOPS define. [RT #20771] -2818. [cleanup] rndc could return an incorrect error code +2818. [cleanup] rndc could return an incorrect error code when a zone was not found. [RT #20767] 2815. [bug] Exclusively lock the task when freezing a zone. @@ -357,7 +586,7 @@ 2621. [doc] Made copyright boilterplate consistent. [RT #19833] -2920. [bug] Delay thawing the zone until the reload of it has +2620. [bug] Delay thawing the zone until the reload of it has completed successfully. [RT #19750] 2618. [bug] The sdb and sdlz db_interator_seek() methods could Modified: head/contrib/bind9/COPYRIGHT ============================================================================== --- head/contrib/bind9/COPYRIGHT Sun Feb 6 22:21:18 2011 (r218383) +++ head/contrib/bind9/COPYRIGHT Sun Feb 6 22:46:07 2011 (r218384) @@ -1,4 +1,4 @@ -Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 1996-2003 Internet Software Consortium. Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -$Id: COPYRIGHT,v 1.14.176.2 2010/01/07 23:47:36 tbox Exp $ +$Id: COPYRIGHT,v 1.14.176.3 2011-01-04 23:45:42 tbox Exp $ Portions Copyright (C) 1996-2001 Nominum, Inc. Modified: head/contrib/bind9/README ============================================================================== --- head/contrib/bind9/README Sun Feb 6 22:21:18 2011 (r218383) +++ head/contrib/bind9/README Sun Feb 6 22:46:07 2011 (r218384) @@ -42,11 +42,9 @@ BIND 9 Stichting NLnet - NLnet Foundation Nominum, Inc. -BIND 9.6-ESV (Extended Support Version) +BIND 9.6.3 - BIND 9.6-ESV will be supported until March 31, 2013, at - which time you will need to upgrade to the current release - of BIND. + BIND 9.6.3 is a maintenance release, fixing bugs in 9.6.2. BIND 9.6.2 Copied: head/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.html (from r218352, vendor/bind9/dist/RELEASE-NOTES-BIND-9.6.3.html) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.html Sun Feb 6 22:46:07 2011 (r218384, copy of r218352, vendor/bind9/dist/RELEASE-NOTES-BIND-9.6.3.html) @@ -0,0 +1,165 @@ + + +
+ +

Introduction

+ +

+ BIND 9.6.3 is the current release of BIND 9.6. +

+

+ This document summarizes changes from BIND 9.6.2-P2 to BIND 9.6.3. + Please see the CHANGES file in the source code release for a + complete list of all changes. +

+
+ +

Download

+ +

+ The latest development version of BIND 9 software can always be found + on our web site at + http://www.isc.org/downloads/development. + There you will find additional information about each release, + source code, and some pre-compiled versions for certain operating + systems. +

+
+ +

Support

+ +

Product support information is available on + http://www.isc.org/services/support + for paid support options. Free support is provided by our user + community via a mailing list. Information on all public email + lists is available at + https://lists.isc.org/mailman/listinfo. +

+
+ +

New Features

+ +

9.6.3

+ +

None.

+
+
+ +

Feature Changes

+ +

9.6.3

+ +

None.

+
+
+ +

Security Fixes

+ +

9.6.2-P3

+ +
  • + Adding a NO DATA signed negative response to cache failed to clear + any matching RRSIG records already in cache. A subsequent lookup + of the cached NO DATA entry could crash named (INSIST) when the + unexpected RRSIG was also returned with the NO DATA cache entry. + [RT #22288] [CVE-2010-3613] [VU#706148] +
  • + BIND, acting as a DNSSEC validator, was determining if the NS RRset + is insecure based on a value that could mean either that the RRset + is actually insecure or that there wasn't a matching key for the RRSIG + in the DNSKEY RRset when resuming from validating the DNSKEY RRset. + This can happen when in the middle of a DNSKEY algorithm rollover, + when two different algorithms were used to sign a zone but only the + new set of keys are in the zone DNSKEY RRset. + [RT #22309] [CVE-2010-3614] [VU#837744] +
+
+
+ +

Bug Fixes

+ +

9.6.3

+ +
  • + BIND now builds with threads disabled in versions of NetBSD earlier + than 5.0 and with pthreads enabled by default in NetBSD versions 5.0 + and higher. Also removes support for unproven-pthreads, mit-pthreads + and ptl2. [RT #19203] +
  • + HPUX now correctly defaults to using /dev/poll, which should + increase performance. [RT #21919] +
  • + If named is running as a threaded application, after an "rndc stop" + command has been issued, other inbound TCP requests can cause named + to hang and never complete shutdown. [RT #22108] +
  • + When performing a GSS-TSIG signed dynamic zone update, memory could be + leaked. This causes an unclean shutdown and may affect long-running + servers. [RT #22573] +
  • + A bug in NetBSD and FreeBSD kernels with SO_ACCEPTFILTER enabled allows + for a TCP DoS attack. Until there is a kernel fix, ISC is disabling + SO_ACCEPTFILTER support in BIND. [RT #22589] +
  • + Corrected a defect where a combination of dynamic updates and zone + transfers incorrectly locked the in-memory zone database, causing + named to freeze. [RT #22614] +
  • + Don't run MX checks (check-mx) when the MX record points to ".". + [RT #22645] +
  • + DST key reference counts can now be incremented via dst_key_attach. + [RT #22672] +
  • + isc_mutex_init_errcheck() in phtreads/mutex.c failed to destroy attr. [RT #22766] +
  • + The Kerberos realm was being truncated when being pulled from the + the host prinicipal, make krb5-self updates fail. [RT #22770] +
  • + named failed to preserve the case of domain names in RDATA which is not compressible when writing master files. [RT #22863] +
  • +There was a bug in how the clients-per-query code worked with some +query patterns. This could result, in rare circumstances, in having all +the client query slots filled with queries for the same DNS label, +essentially ignoring the max-clients-per-query setting. +[RT #22972] +
+
+

9.6.2-P3

+ +
  • + Worked around a race condition in the cache database memory + handling. Without this fix a DNS cache DB or ADB could + incorrectly stay in an over memory state, effectively refusing + further caching, which subsequently made a BIND 9 caching + server unworkable. + [RT #21818] +
  • + Microsoft changed the behavior of sockets between NT/XP based + stacks vs Vista/windows7 stacks. Server 2003/2008 have the older + behavior, 2008r2 has the new behavior. With the change, different + error results are possible, so ISC adapted BIND to handle the new + error results. + This resolves an issue where sockets would shut down on + Windows servers causing named to stop responding to queries. + [RT #21906] +
  • + Windows has non-POSIX compliant behavior in its rename() and unlink() + calls. This caused journal compaction to fail on Windows BIND servers + with the log error: "dns_journal_compact failed: failure". + [RT #22434] +
+ +
+
+ +

Thank You

+ +

+ Thank you to everyone who assisted us in making this release possible. + If you would like to contribute to ISC to assist us in continuing to make + quality open source software, please visit our donations page at + http://www.isc.org/supportisc. +

+
+
Copied: head/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.pdf (from r218352, vendor/bind9/dist/RELEASE-NOTES-BIND-9.6.3.pdf) ============================================================================== Binary file (source and/or target). No diff available. Copied: head/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.txt (from r218352, vendor/bind9/dist/RELEASE-NOTES-BIND-9.6.3.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.txt Sun Feb 6 22:46:07 2011 (r218384, copy of r218352, vendor/bind9/dist/RELEASE-NOTES-BIND-9.6.3.txt) @@ -0,0 +1,118 @@ + __________________________________________________________________ + +Introduction + + BIND 9.6.3 is the current release of BIND 9.6. + + This document summarizes changes from BIND 9.6.2-P2 to BIND 9.6.3. + Please see the CHANGES file in the source code release for a complete + list of all changes. + +Download + + The latest development version of BIND 9 software can always be found + on our web site at http://www.isc.org/downloads/development. There you + will find additional information about each release, source code, and + some pre-compiled versions for certain operating systems. + +Support + + Product support information is available on + http://www.isc.org/services/support for paid support options. Free + support is provided by our user community via a mailing list. + Information on all public email lists is available at + https://lists.isc.org/mailman/listinfo. + +New Features + +9.6.3 + + None. + +Feature Changes + +9.6.3 + + None. + +Security Fixes + +9.6.2-P3 + + * Adding a NO DATA signed negative response to cache failed to clear + any matching RRSIG records already in cache. A subsequent lookup of + the cached NO DATA entry could crash named (INSIST) when the + unexpected RRSIG was also returned with the NO DATA cache entry. + [RT #22288] [CVE-2010-3613] [VU#706148] + * BIND, acting as a DNSSEC validator, was determining if the NS RRset + is insecure based on a value that could mean either that the RRset + is actually insecure or that there wasn't a matching key for the + RRSIG in the DNSKEY RRset when resuming from validating the DNSKEY + RRset. This can happen when in the middle of a DNSKEY algorithm + rollover, when two different algorithms were used to sign a zone + but only the new set of keys are in the zone DNSKEY RRset. [RT + #22309] [CVE-2010-3614] [VU#837744] + +Bug Fixes + +9.6.3 + + * BIND now builds with threads disabled in versions of NetBSD earlier + than 5.0 and with pthreads enabled by default in NetBSD versions + 5.0 and higher. Also removes support for unproven-pthreads, + mit-pthreads and ptl2. [RT #19203] + * HPUX now correctly defaults to using /dev/poll, which should + increase performance. [RT #21919] + * If named is running as a threaded application, after an "rndc stop" + command has been issued, other inbound TCP requests can cause named + to hang and never complete shutdown. [RT #22108] + * When performing a GSS-TSIG signed dynamic zone update, memory could + be leaked. This causes an unclean shutdown and may affect + long-running servers. [RT #22573] + * A bug in NetBSD and FreeBSD kernels with SO_ACCEPTFILTER enabled + allows for a TCP DoS attack. Until there is a kernel fix, ISC is + disabling SO_ACCEPTFILTER support in BIND. [RT #22589] + * Corrected a defect where a combination of dynamic updates and zone + transfers incorrectly locked the in-memory zone database, causing + named to freeze. [RT #22614] + * Don't run MX checks (check-mx) when the MX record points to ".". + [RT #22645] + * DST key reference counts can now be incremented via dst_key_attach. + [RT #22672] + * isc_mutex_init_errcheck() in phtreads/mutex.c failed to destroy + attr. [RT #22766] + * The Kerberos realm was being truncated when being pulled from the + the host prinicipal, make krb5-self updates fail. [RT #22770] + * named failed to preserve the case of domain names in RDATA which is + not compressible when writing master files. [RT #22863] + * There was a bug in how the clients-per-query code worked with some + query patterns. This could result, in rare circumstances, in having + all the client query slots filled with queries for the same DNS + label, essentially ignoring the max-clients-per-query setting. [RT + #22972] + +9.6.2-P3 + + * Worked around a race condition in the cache database memory + handling. Without this fix a DNS cache DB or ADB could incorrectly + stay in an over memory state, effectively refusing further caching, + which subsequently made a BIND 9 caching server unworkable. [RT + #21818] + * Microsoft changed the behavior of sockets between NT/XP based + stacks vs Vista/windows7 stacks. Server 2003/2008 have the older + behavior, 2008r2 has the new behavior. With the change, different + error results are possible, so ISC adapted BIND to handle the new + error results. This resolves an issue where sockets would shut down + on Windows servers causing named to stop responding to queries. [RT + #21906] + * Windows has non-POSIX compliant behavior in its rename() and + unlink() calls. This caused journal compaction to fail on Windows + BIND servers with the log error: "dns_journal_compact failed: + failure". [RT #22434] + +Thank You + + Thank you to everyone who assisted us in making this release possible. + If you would like to contribute to ISC to assist us in continuing to + make quality open source software, please visit our donations page at + http://www.isc.org/supportisc. Modified: head/contrib/bind9/bin/check/check-tool.c ============================================================================== --- head/contrib/bind9/bin/check/check-tool.c Sun Feb 6 22:21:18 2011 (r218383) +++ head/contrib/bind9/bin/check/check-tool.c Sun Feb 6 22:46:07 2011 (r218384) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check-tool.c,v 1.35.36.3.24.2 2010/09/07 23:46:25 tbox Exp $ */ +/* $Id: check-tool.c,v 1.35.36.5 2010-09-07 23:46:05 tbox Exp $ */ /*! \file */ Modified: head/contrib/bind9/bin/check/check-tool.h ============================================================================== --- head/contrib/bind9/bin/check/check-tool.h Sun Feb 6 22:21:18 2011 (r218383) +++ head/contrib/bind9/bin/check/check-tool.h Sun Feb 6 22:46:07 2011 (r218384) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check-tool.h,v 1.14.628.2 2010/09/07 23:46:26 tbox Exp $ */ +/* $Id: check-tool.h,v 1.14.334.2 2010-09-07 23:46:05 tbox Exp $ */ #ifndef CHECK_TOOL_H #define CHECK_TOOL_H Modified: head/contrib/bind9/bin/check/named-checkconf.c ============================================================================== --- head/contrib/bind9/bin/check/named-checkconf.c Sun Feb 6 22:21:18 2011 (r218383) +++ head/contrib/bind9/bin/check/named-checkconf.c Sun Feb 6 22:46:07 2011 (r218384) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named-checkconf.c,v 1.46.222.2.24.2 2010/09/07 23:46:26 tbox Exp $ */ +/* $Id: named-checkconf.c,v 1.46.222.4 2010-09-07 23:46:05 tbox Exp $ */ /*! \file */ Modified: head/contrib/bind9/bin/check/named-checkzone.c ============================================================================== --- head/contrib/bind9/bin/check/named-checkzone.c Sun Feb 6 22:21:18 2011 (r218383) +++ head/contrib/bind9/bin/check/named-checkzone.c Sun Feb 6 22:46:07 2011 (r218384) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named-checkzone.c,v 1.51.34.4.10.2 2010/09/07 23:46:26 tbox Exp $ */ +/* $Id: named-checkzone.c,v 1.51.34.6 2010-09-07 23:46:06 tbox Exp $ */ /*! \file */ Modified: head/contrib/bind9/bin/dig/dig.c ============================================================================== --- head/contrib/bind9/bin/dig/dig.c Sun Feb 6 22:21:18 2011 (r218383) +++ head/contrib/bind9/bin/dig/dig.c Sun Feb 6 22:46:07 2011 (r218384) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dig.c,v 1.225.26.4 2009/05/06 10:18:33 fdupont Exp $ */ +/* $Id: dig.c,v 1.225.26.7 2010-05-13 00:43:37 marka Exp $ */ /*! \file */ @@ -306,6 +306,8 @@ say_message(dns_rdata_t *rdata, dig_quer ADD_STRING(buf, " "); } result = dns_rdata_totext(rdata, NULL, buf); + if (result == ISC_R_NOSPACE) + return (result); check_result(result, "dns_rdata_totext"); if (query->lookup->identify) { TIME_NOW(&now); @@ -328,10 +330,8 @@ short_answer(dns_message_t *msg, dns_mes { dns_name_t *name; dns_rdataset_t *rdataset; - isc_buffer_t target; isc_result_t result, loopresult; dns_name_t empty_name; - char t[4096]; dns_rdata_t rdata = DNS_RDATA_INIT; UNUSED(flags); @@ -347,8 +347,6 @@ short_answer(dns_message_t *msg, dns_mes name = NULL; dns_message_currentname(msg, DNS_SECTION_ANSWER, &name); - isc_buffer_init(&target, t, sizeof(t)); - for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; rdataset = ISC_LIST_NEXT(rdataset, link)) { @@ -357,6 +355,8 @@ short_answer(dns_message_t *msg, dns_mes dns_rdataset_current(rdataset, &rdata); result = say_message(&rdata, query, buf); + if (result == ISC_R_NOSPACE) + return (result); check_result(result, "say_message"); loopresult = dns_rdataset_next(rdataset); dns_rdata_reset(&rdata); @@ -505,6 +505,8 @@ printmessage(dig_query_t *query, dns_mes printf(" ad"); if ((msg->flags & DNS_MESSAGEFLAG_CD) != 0) printf(" cd"); + if ((msg->flags & 0x0040U) != 0) + printf("; MBZ: 0x4"); printf("; QUERY: %u, ANSWER: %u, " "AUTHORITY: %u, ADDITIONAL: %u\n", Modified: head/contrib/bind9/bin/dig/dighost.c ============================================================================== --- head/contrib/bind9/bin/dig/dighost.c Sun Feb 6 22:21:18 2011 (r218383) +++ head/contrib/bind9/bin/dig/dighost.c Sun Feb 6 22:46:07 2011 (r218384) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.311.70.11 2009/11/10 17:27:13 each Exp $ */ +/* $Id: dighost.c,v 1.311.70.17 2010-12-09 01:12:54 marka Exp $ */ /*! \file * \note @@ -246,7 +246,7 @@ isc_result_t opentmpkey(isc_mem_t *mct char **tempp, FILE **fp); isc_result_t removetmpkey(isc_mem_t *mctx, const char *file); void clean_trustedkey(void); -void insert_trustedkey(dst_key_t * key); +void insert_trustedkey(dst_key_t **key); #if DIG_SIGCHASE_BU isc_result_t getneededrr(dns_message_t *msg); void sigchase_bottom_up(dns_message_t *msg); @@ -970,7 +970,6 @@ setup_file_key(void) { keynametext, isc_result_totext(result)); goto failure; } - dstkey = NULL; failure: if (dstkey != NULL) dst_key_free(&dstkey); @@ -990,12 +989,21 @@ make_searchlist_entry(char *domain) { } static void +clear_searchlist(void) { + dig_searchlist_t *search; + while ((search = ISC_LIST_HEAD(search_list)) != NULL) { + ISC_LIST_UNLINK(search_list, search, link); + isc_mem_free(mctx, search); + } +} + +static void create_search_list(lwres_conf_t *confdata) { int i; dig_searchlist_t *search; debug("create_search_list()"); - ISC_LIST_INIT(search_list); + clear_searchlist(); for (i = 0; i < confdata->searchnxt; i++) { search = make_searchlist_entry(confdata->search[i]); @@ -1038,7 +1046,7 @@ setup_system(void) { else { /* No search list. Use the domain name if any */ if (lwconf->domainname != NULL) { domain = make_searchlist_entry(lwconf->domainname); - ISC_LIST_INITANDAPPEND(search_list, domain, link); + ISC_LIST_APPEND(search_list, domain, link); domain = NULL; } } @@ -1093,15 +1101,6 @@ setup_system(void) { } -static void -clear_searchlist(void) { - dig_searchlist_t *search; - while ((search = ISC_LIST_HEAD(search_list)) != NULL) { - ISC_LIST_UNLINK(search_list, search, link); - isc_mem_free(mctx, search); - } -} - /*% * Override the search list derived from resolv.conf by 'domain'. */ @@ -1201,14 +1200,15 @@ add_opt(dns_message_t *msg, isc_uint16_t if (dnssec) rdatalist->ttl |= DNS_MESSAGEEXTFLAG_DO; if (nsid) { - unsigned char data[4]; - isc_buffer_t buf; + isc_buffer_t *b = NULL; - isc_buffer_init(&buf, data, sizeof(data)); - isc_buffer_putuint16(&buf, DNS_OPT_NSID); - isc_buffer_putuint16(&buf, 0); - rdata->data = data; - rdata->length = sizeof(data); + result = isc_buffer_allocate(mctx, &b, 4); + check_result(result, "isc_buffer_allocate"); + isc_buffer_putuint16(b, DNS_OPT_NSID); + isc_buffer_putuint16(b, 0); + rdata->data = isc_buffer_base(b); + rdata->length = isc_buffer_usedlength(b); + dns_message_takebuffer(msg, &b); } else { rdata->data = NULL; rdata->length = 0; @@ -2218,6 +2218,15 @@ force_timeout(dig_lookup_t *l, dig_query isc_result_totext(ISC_R_NOMEMORY)); } isc_task_send(global_task, &event); + + /* + * The timer may have expired if, for example, get_address() takes + * long time and the timer was running on a different thread. + * We need to cancel the possible timeout event not to confuse + * ourselves due to the duplicate events. + */ + if (l->timer != NULL) + isc_timer_detach(&l->timer); } @@ -2241,7 +2250,7 @@ send_tcp_connect(dig_query_t *query) { query->waiting_connect = ISC_TRUE; query->lookup->current_query = query; result = get_address(query->servname, port, &query->sockaddr); - if (result == ISC_R_NOTFOUND) { + if (result != ISC_R_SUCCESS) { /* * This servname doesn't have an address. Try the next server * by triggering an immediate 'timeout' (we lie, but the effect @@ -2323,7 +2332,7 @@ send_udp(dig_query_t *query) { /* XXX Check the sense of this, need assertion? */ query->waiting_connect = ISC_FALSE; result = get_address(query->servname, port, &query->sockaddr); - if (result == ISC_R_NOTFOUND) { + if (result != ISC_R_SUCCESS) { /* This servname doesn't have an address. */ force_timeout(l, query); return; @@ -3858,14 +3867,15 @@ sigchase_scanname(dns_rdatatype_t type, } void -insert_trustedkey(dst_key_t * key) +insert_trustedkey(dst_key_t **keyp) { - if (key == NULL) + if (*keyp == NULL) return; if (tk_list.nb_tk >= MAX_TRUSTED_KEY) return; - tk_list.key[tk_list.nb_tk++] = key; + tk_list.key[tk_list.nb_tk++] = *keyp; + *keyp = NULL; return; } @@ -4039,11 +4049,12 @@ get_trusted_key(isc_mem_t *mctx) fclose(fp); return (ISC_R_FAILURE); } - insert_trustedkey(key); #if 0 dst_key_tofile(key, DST_TYPE_PUBLIC,"/tmp"); #endif - key = NULL; + insert_trustedkey(&key); + if (key != NULL) + dst_key_free(&key); } return (ISC_R_SUCCESS); } Modified: head/contrib/bind9/bin/dig/host.c ============================================================================== --- head/contrib/bind9/bin/dig/host.c Sun Feb 6 22:21:18 2011 (r218383) +++ head/contrib/bind9/bin/dig/host.c Sun Feb 6 22:46:07 2011 (r218384) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: host.c,v 1.116.216.3.10.2 2010/10/19 23:46:25 tbox Exp $ */ +/* $Id: host.c,v 1.116.216.5 2010-10-19 23:45:58 tbox Exp $ */ /*! \file */ Modified: head/contrib/bind9/bin/dig/nslookup.1 ============================================================================== --- head/contrib/bind9/bin/dig/nslookup.1 Sun Feb 6 22:21:18 2011 (r218383) +++ head/contrib/bind9/bin/dig/nslookup.1 Sun Feb 6 22:46:07 2011 (r218384) @@ -1,4 +1,4 @@ -.\" Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (C) 2004-2007, 2010 Internet Systems Consortium, Inc. ("ISC") .\" .\" Permission to use, copy, modify, and/or distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above @@ -12,7 +12,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: nslookup.1,v 1.14.354.1 2009/07/11 01:55:20 tbox Exp $ +.\" $Id: nslookup.1,v 1.14.354.2 2010-02-23 01:56:02 tbox Exp $ .\" .hy 0 .ad l @@ -54,7 +54,13 @@ when the first argument is a hyphen (\-) Non\-interactive mode is used when the name or Internet address of the host to be looked up is given as the first argument. The optional second argument specifies the host name or address of a name server. .PP Options can also be specified on the command line if they precede the arguments and are prefixed with a hyphen. For example, to change the default query type to host information, and the initial timeout to 10 seconds, type: -.sp .RS 4 .nf nslookup \-query=hinfo \-timeout=10 .fi .RE +.sp +.RS 4 +.nf +nslookup \-query=hinfo \-timeout=10 +.fi +.RE +.sp .SH "INTERACTIVE COMMANDS" .PP \fBhost\fR [server] @@ -248,5 +254,5 @@ Try the next nameserver if a nameserver .PP Andrew Cherenson .SH "COPYRIGHT" -Copyright \(co 2004\-2007 Internet Systems Consortium, Inc. ("ISC") +Copyright \(co 2004\-2007, 2010 Internet Systems Consortium, Inc. ("ISC") .br Modified: head/contrib/bind9/bin/dig/nslookup.docbook ============================================================================== --- head/contrib/bind9/bin/dig/nslookup.docbook Sun Feb 6 22:21:18 2011 (r218383) +++ head/contrib/bind9/bin/dig/nslookup.docbook Sun Feb 6 22:46:07 2011 (r218384) @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []> - +