From owner-svn-src-stable-6@FreeBSD.ORG Mon Jan 5 06:02:17 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 9A5341065672;
Mon, 5 Jan 2009 06:02:17 +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 865FA8FC12;
Mon, 5 Jan 2009 06:02:17 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0562HF1086720;
Mon, 5 Jan 2009 06:02:17 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0562HIo086716;
Mon, 5 Jan 2009 06:02:17 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <200901050602.n0562HIo086716@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 5 Jan 2009 06:02:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186762 - in stable/6/release/doc:
en_US.ISO8859-1/relnotes/common share/mk share/sgml
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2009 06:02:18 -0000
Author: hrs
Date: Mon Jan 5 06:02:17 2009
New Revision: 186762
URL: http://svn.freebsd.org/changeset/base/186762
Log:
- Trim old relnotes items.
- Remove {,no.}include.historic knob.
Modified:
stable/6/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
stable/6/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent
stable/6/release/doc/share/mk/doc.relnotes.mk
stable/6/release/doc/share/sgml/release.dsl
Modified: stable/6/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
==============================================================================
--- stable/6/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml Mon Jan 5 05:56:19 2009 (r186761)
+++ stable/6/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml Mon Jan 5 06:02:17 2009 (r186762)
@@ -15,6 +15,7 @@
<year>2006</year>
<year>2007</year>
<year>2008</year>
+ <year>2009</year>
<holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
</copyright>
@@ -133,11 +134,7 @@
<!-- Above this line, order boot loader changes by keyword-->
- <para arch="i386,amd64">The BTX kernel used by the boot
- loader has been changed to invoke BIOS routines from real
- mode. This change makes it possible to boot &os; from USB
- devices.</para>
-
+ <para></para>
</sect3>
<sect3 id="proc">
@@ -199,16 +196,7 @@
<sect2 id="contrib">
<title>Contributed Software</title>
- <para><application>bzip2</application> has been updated from 1.0.4
- to 1.0.5.</para>
-
- <para><application>sendmail</application> has been updated from
- 8.14.2 to 8.14.3.</para>
-
- <para>The timezone database has been updated from
- the <application>tzdata2007k</application> release to
- the <application>tzdata2008b</application> release.</para>
-
+ <para></para>
</sect2>
<sect2 id="ports">
@@ -221,11 +209,7 @@
<sect2 id="releng">
<title>Release Engineering and Integration</title>
- <para>The supported version of
- the <application>GNOME</application> desktop environment
- (<filename role="package">x11/gnome2</filename>) has been
- updated from 2.20.1 to 2.22.</para>
-
+ <para></para>
</sect2>
<sect2 id="doc">
Modified: stable/6/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent
==============================================================================
--- stable/6/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent Mon Jan 5 05:56:19 2009 (r186761)
+++ stable/6/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent Mon Jan 5 06:02:17 2009 (r186762)
@@ -2,11 +2,6 @@
<!-- $FreeBSD$ -->
-<!-- Text constants which probably don't need to be changed.-->
-
-<!ENTITY % include.historic "IGNORE">
-<!ENTITY % no.include.historic "IGNORE">
-
<!-- Files to be included -->
<!ENTITY art SYSTEM "../common/new.sgml">
Modified: stable/6/release/doc/share/mk/doc.relnotes.mk
==============================================================================
--- stable/6/release/doc/share/mk/doc.relnotes.mk Mon Jan 5 05:56:19 2009 (r186761)
+++ stable/6/release/doc/share/mk/doc.relnotes.mk Mon Jan 5 06:02:17 2009 (r186762)
@@ -11,23 +11,6 @@ DSLHTML?= ${RELN_ROOT}/share/sgml/defaul
DSLPRINT?= ${RELN_ROOT}/share/sgml/default.dsl
#
-# Tweakable Makefile variables
-#
-# INCLUDE_HISTORIC Used by relnotes document only. When set,
-# causes all release notes entries to be printed,
-# even those marked as "historic". If not set
-# (the default), only print "non-historic"
-# release note entries. To designate a release
-# note entry as "historic", add a role="historic"
-# attribute to the applicable element(s).
-#
-.if defined(INCLUDE_HISTORIC)
-JADEFLAGS+= -iinclude.historic
-.else
-JADEFLAGS+= -ino.include.historic
-.endif
-
-#
# Automatic device list generation:
#
.if exists(${RELN_ROOT}/../man4)
Modified: stable/6/release/doc/share/sgml/release.dsl
==============================================================================
--- stable/6/release/doc/share/sgml/release.dsl Mon Jan 5 05:56:19 2009 (r186761)
+++ stable/6/release/doc/share/sgml/release.dsl Mon Jan 5 06:02:17 2009 (r186762)
@@ -3,8 +3,6 @@
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY % output.html "IGNORE">
<!ENTITY % output.print "IGNORE">
-<!ENTITY % include.historic "IGNORE">
-<!ENTITY % no.include.historic "IGNORE">
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL>
<!ENTITY % release.ent PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
%release.ent;
@@ -14,14 +12,6 @@
<style-specification use="docbook">
<style-specification-body>
-; Configure behavior of this stylesheet
-<![ %include.historic; [
- (define %include-historic% #t)
-]]>
-<![ %no.include.historic; [
- (define %include-historic% #f)
-]]>
-
; String manipulation functions
(define (split-string-to-list STR)
;; return list of STR separated with char #\ or #\,
@@ -60,13 +50,6 @@
(for-arch (entity-text "arch")))
(cond
- ; If role=historic, and we're not printing historic things, then
- ; don't output this element.
- ((and (equal? role "historic")
- (not %include-historic%))
- (empty-sosofo))
-
-
; If arch= not specified, then print unconditionally. This clause
; handles the majority of cases.
((or (equal? arch #f) (equal? arch ""))
@@ -103,13 +86,6 @@
(for-arch (entity-text "arch")))
(cond
- ; If role=historic, and we're not printing historic things, then
- ; don't output this element.
- ((and (equal? role "historic")
- (not %include-historic%))
- (empty-sosofo))
-
-
; If arch= not specified, then print unconditionally. This clause
; handles the majority of cases.
((or (equal? arch #f) (equal? arch ""))
@@ -171,7 +147,6 @@
(u (string-append "&release.man.url;?query="
(data r) "&" "sektion=" (data m))))
(case v
- (("xfree86") (string-append u "&" "manpath=XFree86+&release.manpath.xfree86;" ))
(("xorg") (string-append u "&" "manpath=Xorg+&release.manpath.xorg;" ))
(("netbsd") (string-append u "&" "manpath=NetBSD+&release.manpath.netbsd;"))
(("ports") (string-append u "&" "manpath=FreeBSD+&release.manpath.freebsd-ports;"))
From owner-svn-src-stable-6@FreeBSD.ORG Mon Jan 5 13:06:03 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id BF7171065678;
Mon, 5 Jan 2009 13:06:03 +0000 (UTC)
(envelope-from rafan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id AD13E8FC17;
Mon, 5 Jan 2009 13:06:03 +0000 (UTC)
(envelope-from rafan@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n05D63Nq096963;
Mon, 5 Jan 2009 13:06:03 GMT (envelope-from rafan@svn.freebsd.org)
Received: (from rafan@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n05D63et096962;
Mon, 5 Jan 2009 13:06:03 GMT (envelope-from rafan@svn.freebsd.org)
Message-Id: <200901051306.n05D63et096962@svn.freebsd.org>
From: Rong-En Fan <rafan@FreeBSD.org>
Date: Mon, 5 Jan 2009 13:06:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186772 - stable/6/usr.sbin/rpc.yppasswdd
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2009 13:06:04 -0000
Author: rafan
Date: Mon Jan 5 13:06:03 2009
New Revision: 186772
URL: http://svn.freebsd.org/changeset/base/186772
Log:
MFC r184459
- Whenever a password/shell is changed via rpc.yppasswdd, the daemon leaves
one zombie process because it does not do the cleanup. For a long running
NIS/YP server, it will have lots of zombie processes on it. Fix that by
ignoring the SIGCHLD signal since we don't really care about the exit
status in this case.
PR: bin/91980
Reported by: Arjan van der Velde <dj_noresult at hotmail.com>
Submitted by: Jui-Nan Lin" <jnlin at csie.nctu.edu.tw>
Reviewed by: delphij
Modified:
stable/6/usr.sbin/rpc.yppasswdd/ (props changed)
stable/6/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
Modified: stable/6/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
==============================================================================
--- stable/6/usr.sbin/rpc.yppasswdd/yppasswdd_main.c Mon Jan 5 12:58:43 2009 (r186771)
+++ stable/6/usr.sbin/rpc.yppasswdd/yppasswdd_main.c Mon Jan 5 13:06:03 2009 (r186772)
@@ -165,6 +165,7 @@ main(int argc, char *argv[])
struct sockaddr_in saddr;
socklen_t asize = sizeof (saddr);
struct netconfig *nconf;
+ struct sigaction sa;
void *localhandle;
int ch;
char *mastername;
@@ -268,6 +269,9 @@ the %s domain -- aborting", yppasswd_dom
}
}
openlog("rpc.yppasswdd", LOG_PID, LOG_DAEMON);
+ memset(&sa, 0, sizeof(sa));
+ sa.sa_flags = SA_NOCLDWAIT;
+ sigaction(SIGCHLD, &sa, NULL);
rpcb_unset(YPPASSWDPROG, YPPASSWDVERS, NULL);
rpcb_unset(MASTER_YPPASSWDPROG, MASTER_YPPASSWDVERS, NULL);
From owner-svn-src-stable-6@FreeBSD.ORG Tue Jan 6 00:30:24 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id CE3A9106564A;
Tue, 6 Jan 2009 00:30:24 +0000 (UTC)
(envelope-from danger@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 7CFE08FC1E;
Tue, 6 Jan 2009 00:30:24 +0000 (UTC)
(envelope-from danger@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n060UO9x016566;
Tue, 6 Jan 2009 00:30:24 GMT (envelope-from danger@svn.freebsd.org)
Received: (from danger@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n060UOCe016565;
Tue, 6 Jan 2009 00:30:24 GMT (envelope-from danger@svn.freebsd.org)
Message-Id: <200901060030.n060UOCe016565@svn.freebsd.org>
From: Daniel Gerzo <danger@FreeBSD.org>
Date: Tue, 6 Jan 2009 00:30:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186803 - in stable/6/usr.sbin/ntp: . doc
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2009 00:30:25 -0000
Author: danger (doc committer)
Date: Tue Jan 6 00:30:24 2009
New Revision: 186803
URL: http://svn.freebsd.org/changeset/base/186803
Log:
MFC r185072:
- fix typo
PR: docs/128973
Submitted by: tabthorpe
Approved by: roberto
Modified:
stable/6/usr.sbin/ntp/ (props changed)
stable/6/usr.sbin/ntp/doc/ (props changed)
stable/6/usr.sbin/ntp/doc/ntp-keygen.8
Modified: stable/6/usr.sbin/ntp/doc/ntp-keygen.8
==============================================================================
--- stable/6/usr.sbin/ntp/doc/ntp-keygen.8 Tue Jan 6 00:20:11 2009 (r186802)
+++ stable/6/usr.sbin/ntp/doc/ntp-keygen.8 Tue Jan 6 00:30:24 2009 (r186803)
@@ -123,7 +123,7 @@ The safest way to run the
program is logged in directly as root.
The recommended procedure is change to the keys directory,
usually
-.Pa /ust/local/etc ,
+.Pa /usr/local/etc ,
then run the program. When run for the first time,
or if all
.Cm ntpkey
From owner-svn-src-stable-6@FreeBSD.ORG Tue Jan 6 12:12:39 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id AF6511065672;
Tue, 6 Jan 2009 12:12:39 +0000 (UTC)
(envelope-from danger@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 9CA108FC12;
Tue, 6 Jan 2009 12:12:39 +0000 (UTC)
(envelope-from danger@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n06CCdRa030278;
Tue, 6 Jan 2009 12:12:39 GMT (envelope-from danger@svn.freebsd.org)
Received: (from danger@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n06CCdYg030277;
Tue, 6 Jan 2009 12:12:39 GMT (envelope-from danger@svn.freebsd.org)
Message-Id: <200901061212.n06CCdYg030277@svn.freebsd.org>
From: Daniel Gerzo <danger@FreeBSD.org>
Date: Tue, 6 Jan 2009 12:12:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186812 - in stable/6/lib/libc: . inet sys
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2009 12:12:40 -0000
Author: danger (doc committer)
Date: Tue Jan 6 12:12:39 2009
New Revision: 186812
URL: http://svn.freebsd.org/changeset/base/186812
Log:
MFC r180534:
- Update the definition of modspecific structure
PR: docs/125630
Submitted by: Mateusz Guzik <mjguzik@gmail.com>
Modified:
stable/6/lib/libc/ (props changed)
stable/6/lib/libc/inet/inet_net_pton.c (props changed)
stable/6/lib/libc/sys/ (props changed)
stable/6/lib/libc/sys/modstat.2
Modified: stable/6/lib/libc/sys/modstat.2
==============================================================================
--- stable/6/lib/libc/sys/modstat.2 Tue Jan 6 12:10:23 2009 (r186811)
+++ stable/6/lib/libc/sys/modstat.2 Tue Jan 6 12:12:39 2009 (r186812)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 13, 2007
+.Dd July 15, 2008
.Dt MODSTAT 2
.Os
.Sh NAME
@@ -55,9 +55,9 @@ struct module_stat {
};
typedef union modspecific {
int intval;
- u_int u_intval;
+ u_int uintval;
long longval;
- u_long u_longval;
+ u_long ulongval;
} modspecific_t;
.Ed
.Pp
From owner-svn-src-stable-6@FreeBSD.ORG Tue Jan 6 12:39:28 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 751FE1065676;
Tue, 6 Jan 2009 12:39:28 +0000 (UTC)
(envelope-from danger@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 6201B8FC12;
Tue, 6 Jan 2009 12:39:28 +0000 (UTC)
(envelope-from danger@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n06CdS1O031071;
Tue, 6 Jan 2009 12:39:28 GMT (envelope-from danger@svn.freebsd.org)
Received: (from danger@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n06CdSJC031069;
Tue, 6 Jan 2009 12:39:28 GMT (envelope-from danger@svn.freebsd.org)
Message-Id: <200901061239.n06CdSJC031069@svn.freebsd.org>
From: Daniel Gerzo <danger@FreeBSD.org>
Date: Tue, 6 Jan 2009 12:39:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186816 - in stable/6/usr.sbin/wpa: . wpa_supplicant
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2009 12:39:29 -0000
Author: danger (doc committer)
Date: Tue Jan 6 12:39:28 2009
New Revision: 186816
URL: http://svn.freebsd.org/changeset/base/186816
Log:
MFC r180158:
- install the example wpa_supplicant.conf file to the share/examples/etc
directory [1]
- add the FILES section to the wpa_supplicant.conf.5 file, so that people
will be able to detect the example configuration file easier. [2]
PR: docs/121821 [2]
Submitted by: edwin [2]
Approved by: brooks [1]
Modified:
stable/6/usr.sbin/wpa/ (props changed)
stable/6/usr.sbin/wpa/wpa_supplicant/Makefile
stable/6/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
Modified: stable/6/usr.sbin/wpa/wpa_supplicant/Makefile
==============================================================================
--- stable/6/usr.sbin/wpa/wpa_supplicant/Makefile Tue Jan 6 12:23:19 2009 (r186815)
+++ stable/6/usr.sbin/wpa/wpa_supplicant/Makefile Tue Jan 6 12:39:28 2009 (r186816)
@@ -11,6 +11,11 @@ SRCS= config.c eloop.c common.c md5.c rc
MAN= wpa_supplicant.8 wpa_supplicant.conf.5
+.if ${MK_EXAMPLES} != "no"
+FILESDIR= ${SHAREDIR}/examples/etc
+FILES= wpa_supplicant.conf
+.endif
+
CFLAGS+= -I${.CURDIR} -I${WPA_SUPPLICANT_DISTDIR}
CFLAGS+= -DCONFIG_DRIVER_BSD
CFLAGS+= -DCONFIG_DRIVER_NDIS
Modified: stable/6/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
==============================================================================
--- stable/6/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 Tue Jan 6 12:23:19 2009 (r186815)
+++ stable/6/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 Tue Jan 6 12:39:28 2009 (r186816)
@@ -514,6 +514,11 @@ network={
wep_key0=42FEEDDEAFBABEDEAFBEEFAA55
}
.Ed
+.Sh FILES
+.Bl -tag -width ".Pa /usr/share/examples/etc/wpa_supplicant.conf" -compact
+.It Pa /etc/wpa_supplicant.conf
+.It Pa /usr/share/examples/etc/wpa_supplicant.conf
+.El
.Sh SEE ALSO
.Xr wpa_cli 8 ,
.Xr wpa_passphrase 8 ,
From owner-svn-src-stable-6@FreeBSD.ORG Tue Jan 6 13:12:26 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id CE84C106566C;
Tue, 6 Jan 2009 13:12:26 +0000 (UTC)
(envelope-from danger@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id BBCA08FC13;
Tue, 6 Jan 2009 13:12:26 +0000 (UTC)
(envelope-from danger@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n06DCQGZ031965;
Tue, 6 Jan 2009 13:12:26 GMT (envelope-from danger@svn.freebsd.org)
Received: (from danger@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n06DCQuj031964;
Tue, 6 Jan 2009 13:12:26 GMT (envelope-from danger@svn.freebsd.org)
Message-Id: <200901061312.n06DCQuj031964@svn.freebsd.org>
From: Daniel Gerzo <danger@FreeBSD.org>
Date: Tue, 6 Jan 2009 13:12:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186820 - in stable/6/lib/libc: . inet net sys
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2009 13:12:27 -0000
Author: danger (doc committer)
Date: Tue Jan 6 13:12:26 2009
New Revision: 186820
URL: http://svn.freebsd.org/changeset/base/186820
Log:
MFC r180162:
- AI_ALL and AI_V4MAPPED flags are currently not supported
PR: docs/120248
Submitted by: Heiko Wundram <wundram (a) beenic.net>
Modified:
stable/6/lib/libc/ (props changed)
stable/6/lib/libc/inet/inet_net_pton.c (props changed)
stable/6/lib/libc/net/getaddrinfo.3
stable/6/lib/libc/sys/ (props changed)
Modified: stable/6/lib/libc/net/getaddrinfo.3
==============================================================================
--- stable/6/lib/libc/net/getaddrinfo.3 Tue Jan 6 13:10:15 2009 (r186819)
+++ stable/6/lib/libc/net/getaddrinfo.3 Tue Jan 6 13:12:26 2009 (r186820)
@@ -18,7 +18,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 6, 2007
+.Dd July 1, 2008
.Dt GETADDRINFO 3
.Os
.Sh NAME
@@ -237,6 +237,11 @@ flag shall be ignored unless
.Fa ai_family
equals
.Dv AF_INET6 .
+Note: this flag is currently
+.Em not
+supported, see the
+.Sx BUGS
+section.
.El
.El
.Pp
@@ -485,6 +490,18 @@ freeaddrinfo(res0);
.%B "Proceedings of the freenix track: 2000 USENIX annual technical conference"
.%D June 2000
.Re
+.Sh BUGS
+The
+.Nm
+function as implemented in
+.Fx
+currently does not support
+.Dv AI_ALL
+and
+.Dv AI_V4MAPPED
+flags and returns
+.Dv EAI_BADFLAGS
+if one of them is specified.
.Sh STANDARDS
The
.Fn getaddrinfo
From owner-svn-src-stable-6@FreeBSD.ORG Tue Jan 6 20:19:51 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 9789D1065673;
Tue, 6 Jan 2009 20:19:51 +0000 (UTC)
(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 84E108FC0C;
Tue, 6 Jan 2009 20:19:51 +0000 (UTC)
(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n06KJo70041003;
Tue, 6 Jan 2009 20:19:50 GMT (envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n06KJoDL041002;
Tue, 6 Jan 2009 20:19:50 GMT (envelope-from brueffer@svn.freebsd.org)
Message-Id: <200901062019.n06KJoDL041002@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Tue, 6 Jan 2009 20:19:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186838 - stable/6/usr.sbin/wpa/wpa_supplicant
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2009 20:19:52 -0000
Author: brueffer
Date: Tue Jan 6 20:19:49 2009
New Revision: 186838
URL: http://svn.freebsd.org/changeset/base/186838
Log:
Unbreak build by fixing the conditional.
Approved by: bz
Pointy Hat To: danger
Modified:
stable/6/usr.sbin/wpa/wpa_supplicant/Makefile
Modified: stable/6/usr.sbin/wpa/wpa_supplicant/Makefile
==============================================================================
--- stable/6/usr.sbin/wpa/wpa_supplicant/Makefile Tue Jan 6 19:52:40 2009 (r186837)
+++ stable/6/usr.sbin/wpa/wpa_supplicant/Makefile Tue Jan 6 20:19:49 2009 (r186838)
@@ -11,7 +11,7 @@ SRCS= config.c eloop.c common.c md5.c rc
MAN= wpa_supplicant.8 wpa_supplicant.conf.5
-.if ${MK_EXAMPLES} != "no"
+.if !defined(NO_SHARE)
FILESDIR= ${SHAREDIR}/examples/etc
FILES= wpa_supplicant.conf
.endif
From owner-svn-src-stable-6@FreeBSD.ORG Wed Jan 7 14:00:45 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 22B2B1065672;
Wed, 7 Jan 2009 14:00:45 +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 0FA288FC36;
Wed, 7 Jan 2009 14:00:45 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n07E0iTO087773;
Wed, 7 Jan 2009 14:00:44 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n07E0ikM087772;
Wed, 7 Jan 2009 14:00:44 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200901071400.n07E0ikM087772@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 7 Jan 2009 14:00:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186861 - in stable/6/sys: . kern
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2009 14:00:47 -0000
Author: kib
Date: Wed Jan 7 14:00:44 2009
New Revision: 186861
URL: http://svn.freebsd.org/changeset/base/186861
Log:
MFC r186600:
In r185557, the check for existing negative entry for the given name
did not compared nc_dvp with supplied parent directory vnode pointer.
Add the check and note that now branches for vp != NULL and vp == NULL
are the same, thus can be merged.
Modified:
stable/6/sys/ (props changed)
stable/6/sys/kern/vfs_cache.c
Modified: stable/6/sys/kern/vfs_cache.c
==============================================================================
--- stable/6/sys/kern/vfs_cache.c Wed Jan 7 12:44:03 2009 (r186860)
+++ stable/6/sys/kern/vfs_cache.c Wed Jan 7 14:00:44 2009 (r186861)
@@ -526,28 +526,18 @@ cache_enter(dvp, vp, cnp)
CACHE_LOCK();
/*
- * See if this vnode is already in the cache with this name.
- * This can happen with concurrent lookups of the same path
- * name.
+ * See if this vnode or negative entry is already in the cache
+ * with this name. This can happen with concurrent lookups of
+ * the same path name.
*/
- if (vp) {
- TAILQ_FOREACH(n2, &vp->v_cache_dst, nc_dst) {
- if (n2->nc_dvp == dvp &&
- n2->nc_nlen == cnp->cn_namelen &&
- !bcmp(n2->nc_name, cnp->cn_nameptr, n2->nc_nlen)) {
- CACHE_UNLOCK();
- cache_free(ncp);
- return;
- }
- }
- } else {
- TAILQ_FOREACH(n2, &ncneg, nc_dst) {
- if (n2->nc_nlen == cnp->cn_namelen &&
- !bcmp(n2->nc_name, cnp->cn_nameptr, n2->nc_nlen)) {
- CACHE_UNLOCK();
- cache_free(ncp);
- return;
- }
+ ncpp = NCHHASH(hash);
+ LIST_FOREACH(n2, ncpp, nc_hash) {
+ if (n2->nc_dvp == dvp &&
+ n2->nc_nlen == cnp->cn_namelen &&
+ !bcmp(n2->nc_name, cnp->cn_nameptr, n2->nc_nlen)) {
+ CACHE_UNLOCK();
+ cache_free(ncp);
+ return;
}
}
@@ -565,7 +555,6 @@ cache_enter(dvp, vp, cnp)
* Insert the new namecache entry into the appropriate chain
* within the cache entries table.
*/
- ncpp = NCHHASH(hash);
LIST_INSERT_HEAD(ncpp, ncp, nc_hash);
if (LIST_EMPTY(&dvp->v_cache_src)) {
hold = 1;
From owner-svn-src-stable-6@FreeBSD.ORG Wed Jan 7 20:17:59 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 84DDE1065674;
Wed, 7 Jan 2009 20:17:59 +0000 (UTC)
(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 6DF218FC22;
Wed, 7 Jan 2009 20:17:59 +0000 (UTC)
(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n07KHxRd098534;
Wed, 7 Jan 2009 20:17:59 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n07KHxHj098531;
Wed, 7 Jan 2009 20:17:59 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200901072017.n07KHxHj098531@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Wed, 7 Jan 2009 20:17:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186872 - head/contrib/lukemftpd/src
head/crypto/openssl/apps head/crypto/openssl/ssl releng/6.3
releng/6.3/contrib/lukemftpd/src
releng/6.3/crypto/openssl/apps releng/6.3/crypto/openss...
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2009 20:18:01 -0000
Author: simon
Date: Wed Jan 7 20:17:55 2009
New Revision: 186872
URL: http://svn.freebsd.org/changeset/base/186872
Log:
Prevent cross-site forgery attacks on lukemftpd(8) due to splitting
long commands into multiple requests. [09:01]
Fix incorrect OpenSSL checks for malformed signatures due to invalid
check of return value from EVP_VerifyFinal(), DSA_verify, and
DSA_do_verify. [09:02]
Security: FreeBSD-SA-09:01.lukemftpd
Security: FreeBSD-SA-09:02.openssl
Obtained from: NetBSD [SA-09:01]
Obtained from: OpenSSL Project [SA-09:02]
Approved by: so (simon)
Modified:
stable/6/contrib/lukemftpd/src/extern.h
stable/6/contrib/lukemftpd/src/ftpcmd.y
stable/6/contrib/lukemftpd/src/ftpd.c
Changes in other areas also in this revision:
Modified:
head/contrib/lukemftpd/src/extern.h
head/contrib/lukemftpd/src/ftpcmd.y
head/contrib/lukemftpd/src/ftpd.c
head/crypto/openssl/apps/speed.c
head/crypto/openssl/apps/spkac.c
head/crypto/openssl/apps/verify.c
head/crypto/openssl/apps/x509.c
head/crypto/openssl/ssl/s2_clnt.c
head/crypto/openssl/ssl/s2_srvr.c
head/crypto/openssl/ssl/s3_clnt.c
head/crypto/openssl/ssl/s3_srvr.c
head/crypto/openssl/ssl/ssltest.c
releng/6.3/UPDATING
releng/6.3/contrib/lukemftpd/src/extern.h
releng/6.3/contrib/lukemftpd/src/ftpcmd.y
releng/6.3/contrib/lukemftpd/src/ftpd.c
releng/6.3/crypto/openssl/apps/speed.c
releng/6.3/crypto/openssl/apps/spkac.c
releng/6.3/crypto/openssl/apps/verify.c
releng/6.3/crypto/openssl/apps/x509.c
releng/6.3/crypto/openssl/ssl/s2_clnt.c
releng/6.3/crypto/openssl/ssl/s2_srvr.c
releng/6.3/crypto/openssl/ssl/s3_clnt.c
releng/6.3/crypto/openssl/ssl/s3_srvr.c
releng/6.3/sys/conf/newvers.sh
releng/6.4/UPDATING
releng/6.4/contrib/lukemftpd/src/extern.h
releng/6.4/contrib/lukemftpd/src/ftpcmd.y
releng/6.4/contrib/lukemftpd/src/ftpd.c
releng/6.4/crypto/openssl/apps/speed.c
releng/6.4/crypto/openssl/apps/spkac.c
releng/6.4/crypto/openssl/apps/verify.c
releng/6.4/crypto/openssl/apps/x509.c
releng/6.4/crypto/openssl/ssl/s2_clnt.c
releng/6.4/crypto/openssl/ssl/s2_srvr.c
releng/6.4/crypto/openssl/ssl/s3_clnt.c
releng/6.4/crypto/openssl/ssl/s3_srvr.c
releng/6.4/sys/conf/newvers.sh
releng/7.0/UPDATING
releng/7.0/contrib/lukemftpd/src/extern.h
releng/7.0/contrib/lukemftpd/src/ftpcmd.y
releng/7.0/contrib/lukemftpd/src/ftpd.c
releng/7.0/crypto/openssl/apps/speed.c
releng/7.0/crypto/openssl/apps/spkac.c
releng/7.0/crypto/openssl/apps/verify.c
releng/7.0/crypto/openssl/apps/x509.c
releng/7.0/crypto/openssl/ssl/s2_clnt.c
releng/7.0/crypto/openssl/ssl/s2_srvr.c
releng/7.0/crypto/openssl/ssl/s3_clnt.c
releng/7.0/crypto/openssl/ssl/s3_srvr.c
releng/7.0/crypto/openssl/ssl/ssltest.c
releng/7.0/sys/conf/newvers.sh
releng/7.1/UPDATING
releng/7.1/contrib/lukemftpd/src/extern.h
releng/7.1/contrib/lukemftpd/src/ftpcmd.y
releng/7.1/contrib/lukemftpd/src/ftpd.c
releng/7.1/crypto/openssl/apps/speed.c
releng/7.1/crypto/openssl/apps/spkac.c
releng/7.1/crypto/openssl/apps/verify.c
releng/7.1/crypto/openssl/apps/x509.c
releng/7.1/crypto/openssl/ssl/s2_clnt.c
releng/7.1/crypto/openssl/ssl/s2_srvr.c
releng/7.1/crypto/openssl/ssl/s3_clnt.c
releng/7.1/crypto/openssl/ssl/s3_srvr.c
releng/7.1/crypto/openssl/ssl/ssltest.c
releng/7.1/sys/conf/newvers.sh
stable/7/contrib/lukemftpd/src/extern.h
stable/7/contrib/lukemftpd/src/ftpcmd.y
stable/7/contrib/lukemftpd/src/ftpd.c
stable/7/crypto/openssl/apps/speed.c
stable/7/crypto/openssl/apps/spkac.c
stable/7/crypto/openssl/apps/verify.c
stable/7/crypto/openssl/apps/x509.c
stable/7/crypto/openssl/ssl/s2_clnt.c
stable/7/crypto/openssl/ssl/s2_srvr.c
stable/7/crypto/openssl/ssl/s3_clnt.c
stable/7/crypto/openssl/ssl/s3_srvr.c
stable/7/crypto/openssl/ssl/ssltest.c
Modified: stable/6/contrib/lukemftpd/src/extern.h
==============================================================================
--- stable/6/contrib/lukemftpd/src/extern.h Wed Jan 7 18:37:07 2009 (r186871)
+++ stable/6/contrib/lukemftpd/src/extern.h Wed Jan 7 20:17:55 2009 (r186872)
@@ -139,7 +139,7 @@ void feat(void);
void format_path(char *, const char *);
int ftpd_pclose(FILE *);
FILE *ftpd_popen(char *[], const char *, int);
-char *getline(char *, int, FILE *);
+int getline(char *, int, FILE *);
void init_curclass(void);
void logxfer(const char *, off_t, const char *, const char *,
const struct timeval *, const char *);
Modified: stable/6/contrib/lukemftpd/src/ftpcmd.y
==============================================================================
--- stable/6/contrib/lukemftpd/src/ftpcmd.y Wed Jan 7 18:37:07 2009 (r186871)
+++ stable/6/contrib/lukemftpd/src/ftpcmd.y Wed Jan 7 20:17:55 2009 (r186872)
@@ -1363,8 +1363,12 @@ lookup(struct tab *p, const char *cmd)
/*
* getline - a hacked up version of fgets to ignore TELNET escape codes.
+ * `s' is the buffer to read into.
+ * `n' is the 1 less than the size of the buffer, to allow trailing NUL
+ * `iop' is the FILE to read from.
+ * Returns 0 on success, -1 on EOF, -2 if the command was too long.
*/
-char *
+int
getline(char *s, int n, FILE *iop)
{
int c;
@@ -1379,7 +1383,7 @@ getline(char *s, int n, FILE *iop)
if (ftpd_debug)
syslog(LOG_DEBUG, "command: %s", s);
tmpline[0] = '\0';
- return(s);
+ return(0);
}
if (c == 0)
tmpline[0] = '\0';
@@ -1418,11 +1422,25 @@ getline(char *s, int n, FILE *iop)
}
}
*cs++ = c;
- if (--n <= 0 || c == '\n')
+ if (--n <= 0) {
+ /*
+ * If command doesn't fit into buffer, discard the
+ * rest of the command and indicate truncation.
+ * This prevents the command to be split up into
+ * multiple commands.
+ */
+ if (ftpd_debug)
+ syslog(LOG_DEBUG,
+ "command too long, last char: %d", c);
+ while (c != '\n' && (c = getc(iop)) != EOF)
+ continue;
+ return (-2);
+ }
+ if (c == '\n')
break;
}
if (c == EOF && cs == s)
- return (NULL);
+ return (-1);
*cs++ = '\0';
if (ftpd_debug) {
if ((curclass.type != CLASS_GUEST &&
@@ -1444,7 +1462,7 @@ getline(char *s, int n, FILE *iop)
syslog(LOG_DEBUG, "command: %.*s", len, s);
}
}
- return (s);
+ return (0);
}
void
@@ -1458,15 +1476,20 @@ ftp_handle_line(char *cp)
void
ftp_loop(void)
{
+ int ret;
while (1) {
(void) alarm(curclass.timeout);
- if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
+ ret = getline(cbuf, sizeof(cbuf)-1, stdin);
+ (void) alarm(0);
+ if (ret == -1) {
reply(221, "You could at least say goodbye.");
dologout(0);
+ } else if (ret == -2) {
+ reply(500, "Command too long.");
+ } else {
+ ftp_handle_line(cbuf);
}
- (void) alarm(0);
- ftp_handle_line(cbuf);
}
/*NOTREACHED*/
}
Modified: stable/6/contrib/lukemftpd/src/ftpd.c
==============================================================================
--- stable/6/contrib/lukemftpd/src/ftpd.c Wed Jan 7 18:37:07 2009 (r186871)
+++ stable/6/contrib/lukemftpd/src/ftpd.c Wed Jan 7 20:17:55 2009 (r186872)
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpd.c,v 1.176 2006/05/09 20:18:06 mrg Exp $ */
+/* $NetBSD: ftpd.c,v 1.187 2008/09/13 03:30:35 lukem Exp $ */
/*
* Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -2896,6 +2896,7 @@ static int
handleoobcmd()
{
char *cp;
+ int ret;
if (!urgflag)
return (0);
@@ -2904,9 +2905,14 @@ handleoobcmd()
if (!transflag)
return (0);
cp = tmpline;
- if (getline(cp, sizeof(tmpline), stdin) == NULL) {
+ ret = getline(cp, sizeof(tmpline)-1, stdin);
+ if (ret == -1) {
reply(221, "You could at least say goodbye.");
dologout(0);
+ } else if (ret == -2) {
+ /* Ignore truncated command */
+ /* XXX: abort xfer with "500 command too long", & return 1 ? */
+ return 0;
}
/*
* Manually parse OOB commands, because we can't
From owner-svn-src-stable-6@FreeBSD.ORG Wed Jan 7 21:03:42 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 3071F1065677;
Wed, 7 Jan 2009 21:03:42 +0000 (UTC)
(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 1D3948FC1C;
Wed, 7 Jan 2009 21:03:42 +0000 (UTC)
(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n07L3gad099486;
Wed, 7 Jan 2009 21:03:42 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n07L3fLP099478;
Wed, 7 Jan 2009 21:03:41 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200901072103.n07L3fLP099478@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Wed, 7 Jan 2009 21:03:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186873 - in stable/6/crypto/openssl: apps ssl
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2009 21:03:43 -0000
Author: simon
Date: Wed Jan 7 21:03:41 2009
New Revision: 186873
URL: http://svn.freebsd.org/changeset/base/186873
Log:
This time really commit the OpenSSL part of the advisory round to
stable/6:
Fix incorrect OpenSSL checks for malformed signatures due to invalid
check of return value from EVP_VerifyFinal(), DSA_verify, and
DSA_do_verify.
Security: FreeBSD-SA-09:02.openssl
Obtained from: OpenSSL Project
Modified:
stable/6/crypto/openssl/apps/speed.c
stable/6/crypto/openssl/apps/spkac.c
stable/6/crypto/openssl/apps/verify.c
stable/6/crypto/openssl/apps/x509.c
stable/6/crypto/openssl/ssl/s2_clnt.c
stable/6/crypto/openssl/ssl/s2_srvr.c
stable/6/crypto/openssl/ssl/s3_clnt.c
stable/6/crypto/openssl/ssl/s3_srvr.c
Modified: stable/6/crypto/openssl/apps/speed.c
==============================================================================
--- stable/6/crypto/openssl/apps/speed.c Wed Jan 7 20:17:55 2009 (r186872)
+++ stable/6/crypto/openssl/apps/speed.c Wed Jan 7 21:03:41 2009 (r186873)
@@ -1486,7 +1486,7 @@ int MAIN(int argc, char **argv)
{
ret=RSA_verify(NID_md5_sha1, buf,36, buf2,
rsa_num, rsa_key[j]);
- if (ret == 0)
+ if (ret <= 0)
{
BIO_printf(bio_err,
"RSA verify failure\n");
Modified: stable/6/crypto/openssl/apps/spkac.c
==============================================================================
--- stable/6/crypto/openssl/apps/spkac.c Wed Jan 7 20:17:55 2009 (r186872)
+++ stable/6/crypto/openssl/apps/spkac.c Wed Jan 7 21:03:41 2009 (r186873)
@@ -284,7 +284,7 @@ bad:
pkey = NETSCAPE_SPKI_get_pubkey(spki);
if(verify) {
i = NETSCAPE_SPKI_verify(spki, pkey);
- if(i) BIO_printf(bio_err, "Signature OK\n");
+ if (i > 0) BIO_printf(bio_err, "Signature OK\n");
else {
BIO_printf(bio_err, "Signature Failure\n");
ERR_print_errors(bio_err);
Modified: stable/6/crypto/openssl/apps/verify.c
==============================================================================
--- stable/6/crypto/openssl/apps/verify.c Wed Jan 7 20:17:55 2009 (r186872)
+++ stable/6/crypto/openssl/apps/verify.c Wed Jan 7 21:03:41 2009 (r186873)
@@ -275,7 +275,7 @@ static int check(X509_STORE *ctx, char *
ret=0;
end:
- if (i)
+ if (i > 0)
{
fprintf(stdout,"OK\n");
ret=1;
@@ -365,4 +365,3 @@ static int MS_CALLBACK cb(int ok, X509_S
ERR_clear_error();
return(ok);
}
-
Modified: stable/6/crypto/openssl/apps/x509.c
==============================================================================
--- stable/6/crypto/openssl/apps/x509.c Wed Jan 7 20:17:55 2009 (r186872)
+++ stable/6/crypto/openssl/apps/x509.c Wed Jan 7 21:03:41 2009 (r186873)
@@ -1113,7 +1113,7 @@ static int x509_certify(X509_STORE *ctx,
/* NOTE: this certificate can/should be self signed, unless it was
* a certificate request in which case it is not. */
X509_STORE_CTX_set_cert(&xsc,x);
- if (!reqfile && !X509_verify_cert(&xsc))
+ if (!reqfile && X509_verify_cert(&xsc) <= 0)
goto end;
if (!X509_check_private_key(xca,pkey))
Modified: stable/6/crypto/openssl/ssl/s2_clnt.c
==============================================================================
--- stable/6/crypto/openssl/ssl/s2_clnt.c Wed Jan 7 20:17:55 2009 (r186872)
+++ stable/6/crypto/openssl/ssl/s2_clnt.c Wed Jan 7 21:03:41 2009 (r186873)
@@ -1062,7 +1062,7 @@ int ssl2_set_certificate(SSL *s, int typ
i=ssl_verify_cert_chain(s,sk);
- if ((s->verify_mode != SSL_VERIFY_NONE) && (!i))
+ if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0))
{
SSLerr(SSL_F_SSL2_SET_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
goto err;
Modified: stable/6/crypto/openssl/ssl/s2_srvr.c
==============================================================================
--- stable/6/crypto/openssl/ssl/s2_srvr.c Wed Jan 7 20:17:55 2009 (r186872)
+++ stable/6/crypto/openssl/ssl/s2_srvr.c Wed Jan 7 21:03:41 2009 (r186873)
@@ -1070,7 +1070,7 @@ static int request_certificate(SSL *s)
i=ssl_verify_cert_chain(s,sk);
- if (i) /* we like the packet, now check the chksum */
+ if (i > 0) /* we like the packet, now check the chksum */
{
EVP_MD_CTX ctx;
EVP_PKEY *pkey=NULL;
@@ -1099,7 +1099,7 @@ static int request_certificate(SSL *s)
EVP_PKEY_free(pkey);
EVP_MD_CTX_cleanup(&ctx);
- if (i)
+ if (i > 0)
{
if (s->session->peer != NULL)
X509_free(s->session->peer);
Modified: stable/6/crypto/openssl/ssl/s3_clnt.c
==============================================================================
--- stable/6/crypto/openssl/ssl/s3_clnt.c Wed Jan 7 20:17:55 2009 (r186872)
+++ stable/6/crypto/openssl/ssl/s3_clnt.c Wed Jan 7 21:03:41 2009 (r186873)
@@ -833,7 +833,7 @@ static int ssl3_get_server_certificate(S
}
i=ssl_verify_cert_chain(s,sk);
- if ((s->verify_mode != SSL_VERIFY_NONE) && (!i)
+ if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0)
#ifndef OPENSSL_NO_KRB5
&& (s->s3->tmp.new_cipher->algorithms & (SSL_MKEY_MASK|SSL_AUTH_MASK))
!= (SSL_aKRB5|SSL_kKRB5)
@@ -1206,7 +1206,7 @@ static int ssl3_get_key_exchange(SSL *s)
EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
EVP_VerifyUpdate(&md_ctx,param,param_len);
- if (!EVP_VerifyFinal(&md_ctx,p,(int)n,pkey))
+ if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0)
{
/* bad signature */
al=SSL_AD_DECRYPT_ERROR;
Modified: stable/6/crypto/openssl/ssl/s3_srvr.c
==============================================================================
--- stable/6/crypto/openssl/ssl/s3_srvr.c Wed Jan 7 20:17:55 2009 (r186872)
+++ stable/6/crypto/openssl/ssl/s3_srvr.c Wed Jan 7 21:03:41 2009 (r186873)
@@ -2015,7 +2015,7 @@ static int ssl3_get_client_certificate(S
else
{
i=ssl_verify_cert_chain(s,sk);
- if (!i)
+ if (i <= 0)
{
al=ssl_verify_alarm_type(s->verify_result);
SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATE_RETURNED);
From owner-svn-src-stable-6@FreeBSD.ORG Fri Jan 9 11:21:26 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 25019106566C;
Fri, 9 Jan 2009 11:21:26 +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 117518FC25;
Fri, 9 Jan 2009 11:21:25 +0000 (UTC)
(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n09BLPZ3055160;
Fri, 9 Jan 2009 11:21:25 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n09BLP32055158;
Fri, 9 Jan 2009 11:21:25 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200901091121.n09BLP32055158@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 9 Jan 2009 11:21:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186938 - stable/6/usr.sbin/mergemaster
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2009 11:21:27 -0000
Author: dougb
Date: Fri Jan 9 11:21:25 2009
New Revision: 186938
URL: http://svn.freebsd.org/changeset/base/186938
Log:
MFC the changes from r179725, documentation of the AUTO_UPGRADE knob,
and 186677:186749:
o Removal of 184781, 184804, and 184832 (automatic installation of files
that differ only by VCS Id)
o Fix cross-platform builds
o Various improvements to the mtree (-U) feature
o Remove the last of the MAKEDEV stuff
o Switch to using the top level (e.g., /usr/src) Makefile, and specify
that we should use the *.mk files from the source directory instead of
the installed versions.
o Check for the deprecated 'nodev' option in /etc/fstab
o Add support for the IGNORE_FILES variable
o Before installing a file check to make sure that the target does not
already exist as a directory
o Check to be sure that the file installed and error out if not
o We only need to check for the presence of the target of $PAGER
if that variable is actually set
Modified:
stable/6/usr.sbin/mergemaster/ (props changed)
stable/6/usr.sbin/mergemaster/mergemaster.8
stable/6/usr.sbin/mergemaster/mergemaster.sh
Modified: stable/6/usr.sbin/mergemaster/mergemaster.8
==============================================================================
--- stable/6/usr.sbin/mergemaster/mergemaster.8 Fri Jan 9 11:20:51 2009 (r186937)
+++ stable/6/usr.sbin/mergemaster/mergemaster.8 Fri Jan 9 11:21:25 2009 (r186938)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2003 Douglas Barton
+.\" Copyright (c) 1998-2009 Douglas Barton
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 4, 2006
+.Dd January 2, 2009
.Dt MERGEMASTER 8
.Os
.Sh NAME
@@ -32,14 +32,14 @@
.Nd merge configuration files, et al during an upgrade
.Sh SYNOPSIS
.Nm
-.Op Fl scrvahipCPU
+.Op Fl achiprsvCPU
+.Op Fl A Ar Target architecture
+.Op Fl D Ar /destdir/path
.Op Fl m Ar /path/to/sources
.Op Fl t Ar /path/to/temp/root
.Op Fl d
.Op Fl u Ar N
.Op Fl w Ar N
-.Op Fl A Ar architecture
-.Op Fl D Ar /path
.Sh DESCRIPTION
The
.Nm
@@ -54,7 +54,7 @@ recommended that you back up your
directory before beginning this process.
.Pp
The script uses
-.Pa /usr/src/etc/Makefile
+.Pa /usr/src/Makefile
to build a temporary root environment from
.Pa /
down, populating that environment with the various
@@ -218,6 +218,14 @@ Specify the path to the directory where
.Xr make 1 .
(In other words, where your sources are, but -s was already
taken.)
+In previous versions of
+.Nm
+you needed to specify the path all the way to
+.Pa src/etc .
+Starting with r186678 you only need to specify the path to
+.Pa src .
+.Nm
+will convert the path for you if you use the old method.
.It Fl t Ar /path/to/temp/root
Create the temporary root environment in
.Pa /path/to/temp/root
@@ -236,7 +244,7 @@ Supply an alternate screen width to the
.Xr sdiff 1
command in numbers of columns.
The default is 80.
-.It Fl A Ar architecture
+.It Fl A Ar Target architecture
Specify an alternative
.Ev TARGET_ARCH
architecture name.
@@ -294,24 +302,33 @@ with all values commented out:
# These are options for mergemaster, with their default values listed
# The following options have command line overrides
#
+# The target architecture (unset by default)
+#ARCHSTRING='TARGET_ARCH=<foo>'
+#
+# Sourcedir is the directory to do the 'make' in (where the new files are)
+#SOURCEDIR='/usr/src'
+#
# Directory to install the temporary root environment into
#TEMPROOT='/var/tmp/temproot'
#
+# Specify the destination directory for the installed files
+#DESTDIR=
+#
# Strict comparison bypasses the CVS $Id tests and compares every file
#STRICT=no
#
# Type of diff, such as unified, context, etc.
#DIFF_FLAG='-u'
#
-# Additional options for diff. This will get unset when using -s.
-#DIFF_OPTIONS='-I$\&FreeBSD:.*[$]' # Ignores CVS Id tags
-#
# Verbose mode includes more details and additional checks
#VERBOSE=
#
# Automatically install files that do not exist on the system already
#AUTO_INSTALL=
#
+# Automatically upgrade files that have not been user modified
+#AUTO_UPGRADE=
+#
# Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf
#COMP_CONFS=yes
#
@@ -319,25 +336,26 @@ with all values commented out:
#PRESERVE_FILES=yes
#PRESERVE_FILES_DIR=/var/tmp/mergemaster/preserved-files-`date +%y%m%d-%H%M%S`
#
-# Sourcedir is the directory to do the 'make' in (where the new files are)
-#SOURCEDIR='/usr/src/etc'
-#
# The umask for mergemaster to compare the default file's modes to
#NEW_UMASK=022
#
-# Specify the destination directory for the installed files
-#DESTDIR=
-#
# The following options have no command line overrides
+#
+# Files to always avoid comparing
+#IGNORE_FILES='/etc/motd /etc/printcap foo bar'
+#
+# Additional options for diff. This will get unset when using -s.
+#DIFF_OPTIONS='-I$\&FreeBSD:.*[$]' # Ignores CVS Id tags
+#
+# Location to store the list of mtree values for AUTO_UPGRADE purposes
+#MTREEDB='/var/db'
+#
# For those who just cannot stand including the full path to PAGER
#DONT_CHECK_PAGER=
#
# If you set 'yes' above, make sure to include the PATH to your pager
#PATH=/bin:/usr/bin:/usr/sbin
#
-# Don't compare the old and new motd files
-#IGNORE_MOTD=yes
-#
# Specify the path to scripts to run before the comparison starts,
# and/or after the script has finished its work
#MM_PRE_COMPARE_SCRIPT=
@@ -354,6 +372,11 @@ Invalid command line option
Failure to create the temporary root environment
.Pp
Failure to populate the temporary root
+.Pp
+Presence of the 'nodev' option in
+.Pa <DESTDIR>/etc/fstab
+.Pp
+Failure to install a file
.Sh EXAMPLES
Typically all you will need to do is type
.Nm
Modified: stable/6/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/6/usr.sbin/mergemaster/mergemaster.sh Fri Jan 9 11:20:51 2009 (r186937)
+++ stable/6/usr.sbin/mergemaster/mergemaster.sh Fri Jan 9 11:21:25 2009 (r186938)
@@ -5,7 +5,7 @@
# Compare files created by /usr/src/etc/Makefile (or the directory
# the user specifies) with the currently installed copies.
-# Copyright 1998-2004 Douglas Barton
+# Copyright 1998-2009 Douglas Barton
# DougB@FreeBSD.org
# $FreeBSD$
@@ -244,10 +244,6 @@ press_to_continue () {
#
TEMPROOT='/var/tmp/temproot'
-# Assign the location of the mtree database
-#
-MTREEDB='/var/db/mergemaster.mtree'
-
# Read /etc/mergemaster.rc first so the one in $HOME can override
#
if [ -r /etc/mergemaster.rc ]; then
@@ -260,12 +256,17 @@ if [ -r "$HOME/.mergemasterrc" ]; then
. "$HOME/.mergemasterrc"
fi
+# Assign the location of the mtree database
+#
+MTREEDB=${MTREEDB:-/var/db}
+MTREEFILE="${MTREEDB}/mergemaster.mtree"
+
# Check the command line options
#
while getopts ":ascrvhipCPm:t:du:w:D:A:U" COMMAND_LINE_ARGUMENT ; do
case "${COMMAND_LINE_ARGUMENT}" in
A)
- ARCHSTRING='MACHINE_ARCH='${OPTARG}
+ ARCHSTRING='TARGET_ARCH='${OPTARG}
;;
U)
AUTO_UPGRADE=yes
@@ -338,10 +339,30 @@ if [ -n "${PRESERVE_FILES}" -a -z "${PRE
PRESERVE_FILES_DIR=/var/tmp/mergemaster/preserved-files-`date +%y%m%d-%H%M%S`
fi
-# Check the for the mtree database in DESTDIR.
-if [ ! -f ${DESTDIR}${MTREEDB} ]; then
- echo "*** Unable to find mtree database. Skipping auto-upgrade."
- unset AUTO_UPGRADE
+# Check for the mtree database in DESTDIR
+case "${AUTO_UPGRADE}" in
+'') ;; # If the option is not set no need to run the test or warn the user
+*)
+ if [ ! -f "${DESTDIR}${MTREEFILE}" ]; then
+ echo ''
+ echo "*** Unable to find mtree database. Skipping auto-upgrade."
+ echo ''
+ press_to_continue
+ unset AUTO_UPGRADE
+ fi
+ ;;
+esac
+
+if [ -e "${DESTDIR}/etc/fstab" ]; then
+ if grep -q nodev ${DESTDIR}/etc/fstab; then
+ echo ''
+ echo "*** You have the deprecated 'nodev' option in ${DESTDIR}/etc/fstab."
+ echo " This can prevent the filesystem from being mounted on reboot."
+ echo " Please update your fstab before continuing."
+ echo " See fstab(5) for more information."
+ echo ''
+ exit 1
+ fi
fi
echo ''
@@ -350,7 +371,8 @@ echo ''
#
case "${DONT_CHECK_PAGER}" in
'')
- while ! type "${PAGER%% *}" >/dev/null && [ -n "${PAGER}" ]; do
+check_pager () {
+ while ! type "${PAGER%% *}" >/dev/null; do
echo " *** Your PAGER environment variable specifies '${PAGER}', but"
echo " due to the limited PATH that I use for security reasons,"
echo " I cannot execute it. So, what would you like to do?"
@@ -392,6 +414,10 @@ case "${DONT_CHECK_PAGER}" in
esac
echo ''
done
+}
+ if [ -n "${PAGER}" ]; then
+ check_pager
+ fi
;;
esac
@@ -412,14 +438,25 @@ DIFF_FLAG=${DIFF_FLAG:--u}
# Assign the source directory
#
-SOURCEDIR=${SOURCEDIR:-/usr/src/etc}
+SOURCEDIR=${SOURCEDIR:-/usr/src}
+if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a \
+ -f ${SOURCEDIR}/../Makefile.inc1 ]; then
+ echo " *** The source directory you specified (${SOURCEDIR})"
+ echo " will be reset to ${SOURCEDIR}/.."
+ echo ''
+ sleep 3
+ SOURCEDIR=${SOURCEDIR}/..
+fi
+
+# Setup make to use system files from SOURCEDIR
+MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk"
# Check DESTDIR against the mergemaster mtree database to see what
# files the user changed from the reference files.
#
CHANGED=
-if [ -n "${AUTO_UPGRADE}" -a -f "${DESTDIR}${MTREEDB}" ]; then
- for file in `mtree -eq -f ${DESTDIR}${MTREEDB} -p ${DESTDIR}/ \
+if [ -n "${AUTO_UPGRADE}" -a -f "${DESTDIR}${MTREEFILE}" ]; then
+ for file in `mtree -eq -f ${DESTDIR}${MTREEFILE} -p ${DESTDIR}/ \
2>/dev/null | awk '($2 == "changed") {print $1}'`; do
if [ -f "${DESTDIR}/$file" ]; then
CHANGED="${CHANGED} ${DESTDIR}/$file"
@@ -552,14 +589,14 @@ case "${RERUN}" in
case "${DESTDIR}" in
'') ;;
*)
- make DESTDIR=${DESTDIR} ${ARCHSTRING} distrib-dirs
+ ${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs
;;
esac
- make DESTDIR=${TEMPROOT} ${ARCHSTRING} distrib-dirs &&
- MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj make ${ARCHSTRING} obj &&
- MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj make ${ARCHSTRING} all &&
- MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj make ${ARCHSTRING} \
- DESTDIR=${TEMPROOT} distribution;} ||
+ od=${TEMPROOT}/usr/obj
+ ${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs &&
+ MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc &&
+ MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc &&
+ MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} ||
{ echo '';
echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to";
echo " the temproot environment";
@@ -569,8 +606,8 @@ case "${RERUN}" in
*)
# Only set up files that are crucial to {build|install}world
{ mkdir -p ${TEMPROOT}/etc &&
- cp -p ${SOURCEDIR}/master.passwd ${TEMPROOT}/etc &&
- cp -p ${SOURCEDIR}/group ${TEMPROOT}/etc;} ||
+ cp -p ${SOURCEDIR}/etc/master.passwd ${TEMPROOT}/etc &&
+ cp -p ${SOURCEDIR}/etc/group ${TEMPROOT}/etc;} ||
{ echo '';
echo ' *** FATAL ERROR: Cannot copy files to the temproot environment';
echo '';
@@ -599,17 +636,17 @@ case "${RERUN}" in
esac
# Avoid comparing the motd if the user specifies it in .mergemasterrc
+ # Compatibility shim to be removed in FreeBSD 9.x
case "${IGNORE_MOTD}" in
'') ;;
- *) rm -f ${TEMPROOT}/etc/motd
+ *) IGNORE_FILES="${IGNORE_FILES} /etc/motd"
;;
esac
- # Avoid trying to update MAKEDEV if /dev is on a devfs
- if /sbin/sysctl vfs.devfs.generation > /dev/null 2>&1 ; then
- rm -f ${TEMPROOT}/dev/MAKEDEV ${TEMPROOT}/dev/MAKEDEV.local
- fi
-
+ # Avoid comparing the following user specified files
+ for file in ${IGNORE_FILES}; do
+ test -e ${TEMPROOT}/${file} && unlink ${TEMPROOT}/${file}
+ done
;; # End of the "RERUN" test
esac
@@ -626,9 +663,9 @@ find ${TEMPROOT}/usr/obj -type f -delete
find ${TEMPROOT} -type f -size 0 -delete 2>/dev/null
# Build the mtree database in a temporary location.
-# TODO: Possibly use mktemp instead for security reasons?
+MTREENEW=`mktemp -t mergemaster.mtree`
case "${PRE_WORLD}" in
-'') mtree -ci -p ${TEMPROOT} -k size,md5digest > ${DESTDIR}${MTREEDB}.new 2>/dev/null
+'') mtree -ci -p ${TEMPROOT} -k size,md5digest > ${DESTDIR}${MTREENEW} 2>/dev/null
;;
*) # We don't want to mess with the mtree database on a pre-world run.
;;
@@ -647,7 +684,7 @@ if [ -z "${NEW_UMASK}" -a -z "${AUTO_RUN
echo ''
echo " *** Your umask is currently set to ${USER_UMASK}. By default, this script"
echo " installs all files with the same user, group and modes that"
- echo " they are created with by ${SOURCEDIR}/Makefile, compared to"
+ echo " they are created with by ${SOURCEDIR}/etc/Makefile, compared to"
echo " a umask of 022. This umask allows world read permission when"
echo " the file's default permissions have it."
echo ''
@@ -714,6 +751,12 @@ esac
# Use the umask/mode information to install the files
# Create directories as needed
#
+install_error () {
+ echo "*** FATAL ERROR: Unable to install ${1} to ${2}"
+ echo ''
+ exit 1
+}
+
do_install_and_rm () {
case "${PRESERVE_FILES}" in
[Yy][Ee][Ss])
@@ -724,8 +767,15 @@ do_install_and_rm () {
;;
esac
- install -m "${1}" "${2}" "${3}" &&
- rm -f "${2}"
+ if [ ! -d "${3}/${2##*/}" ]; then
+ if install -m ${1} ${2} ${3}; then
+ unlink ${2}
+ else
+ install_error ${2} ${3}
+ fi
+ else
+ install_error ${2} ${3}
+ fi
}
# 4095 = "obase=10;ibase=8;07777" | bc
@@ -828,11 +878,6 @@ mm_install () {
;;
esac
else # File matched -x
- case "${1#.}" in
- /dev/MAKEDEV)
- NEED_MAKEDEV=yes
- ;;
- esac
do_install_and_rm "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}"
fi
return $?
@@ -904,7 +949,7 @@ if [ -r "${MM_PRE_COMPARE_SCRIPT}" ]; th
fi
# Using -size +0 avoids uselessly checking the empty log files created
-# by ${SOURCEDIR}/Makefile and the device entries in ./dev, but does
+# by ${SOURCEDIR}/etc/Makefile and the device entries in ./dev, but does
# check the scripts in ./dev, as we'd like (assuming no devfs of course).
#
for COMPFILE in `find . -type f -size +0`; do
@@ -947,25 +992,6 @@ for COMPFILE in `find . -type f -size +0
echo " *** Temp ${COMPFILE} and installed have the same CVS Id, deleting"
rm "${COMPFILE}"
;;
-
- *)
- tempfoo=`basename $0`
- TMPFILE1=`mktemp -t ${tempfoo}` || break
- TMPFILE2=`mktemp -t ${tempfoo}` || break
- sed "s/[$]${CVS_ID_TAG}:.*[$]//g" "${DESTDIR}${COMPFILE#.}" > "${TMPFILE1}"
- sed "s/[$]${CVS_ID_TAG}:.*[$]//g" "${COMPFILE}" > "${TMPFILE2}"
- if diff -q ${DIFF_OPTIONS} "${TMPFILE1}" "${TMPFILE2}" > \
- /dev/null 2>&1; then
- echo " *** Temp ${COMPFILE} and installed are the same except CVS Id, replacing"
- if mm_install "${COMPFILE}"; then
- echo " *** ${COMPFILE} upgraded successfully"
- echo ''
- else
- echo " *** Problem upgrading ${COMPFILE}, it will remain to merge by hand"
- fi
- fi
- rm -f "${TMPFILE1}" "${TMPFILE2}"
- ;;
esac
;;
esac
@@ -1005,9 +1031,10 @@ done # This is for the do way up there a
echo ''
echo "*** Comparison complete"
-if [ -f "${DESTDIR}${MTREEDB}.new" ]; then
+if [ -f "${DESTDIR}${MTREENEW}" ]; then
echo "*** Saving mtree database for future upgrades"
- mv -f ${DESTDIR}${MTREEDB}.new ${DESTDIR}${MTREEDB} 2>/dev/null
+ test -e "${MTREEFILE}" && unlink ${MTREEFILE}
+ mv ${DESTDIR}${MTREENEW} ${DESTDIR}${MTREEFILE}
fi
echo ''
@@ -1115,16 +1142,6 @@ run_it_now () {
esac
}
-case "${NEED_MAKEDEV}" in
-'') ;;
-*)
- echo ''
- echo "*** You installed a new ${DESTDIR}/dev/MAKEDEV script, so make sure that you run"
- echo " 'cd ${DESTDIR}/dev && /bin/sh MAKEDEV all' to rebuild your devices"
- run_it_now "cd ${DESTDIR}/dev && /bin/sh MAKEDEV all"
- ;;
-esac
-
case "${NEED_NEWALIASES}" in
'') ;;
*)
@@ -1206,7 +1223,7 @@ esac
case "${PRE_WORLD}" in
'') ;;
*)
- MAKE_CONF="${SOURCEDIR%etc}share/examples/etc/make.conf"
+ MAKE_CONF="${SOURCEDIR}/share/examples/etc/make.conf"
(echo ''
echo '*** Comparing make variables'
From owner-svn-src-stable-6@FreeBSD.ORG Fri Jan 9 15:13:47 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 418C61065691;
Fri, 9 Jan 2009 15:13:47 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 2F2AC8FC0A;
Fri, 9 Jan 2009 15:13:47 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n09FDlLY060242;
Fri, 9 Jan 2009 15:13:47 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n09FDluo060241;
Fri, 9 Jan 2009 15:13:47 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <200901091513.n09FDluo060241@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Fri, 9 Jan 2009 15:13:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186954 - in stable/6/sys: . kern
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2009 15:13:48 -0000
Author: pho
Date: Fri Jan 9 15:13:46 2009
New Revision: 186954
URL: http://svn.freebsd.org/changeset/base/186954
Log:
MFC r186510:
Prevent overflow of uio_resid.
Approved by: kib
Modified:
stable/6/sys/ (props changed)
stable/6/sys/kern/vfs_syscalls.c
Modified: stable/6/sys/kern/vfs_syscalls.c
==============================================================================
--- stable/6/sys/kern/vfs_syscalls.c Fri Jan 9 14:41:36 2009 (r186953)
+++ stable/6/sys/kern/vfs_syscalls.c Fri Jan 9 15:13:46 2009 (r186954)
@@ -3697,6 +3697,8 @@ getdirentries(td, uap)
int error, eofflag;
AUDIT_ARG(fd, uap->fd);
+ if (uap->count > INT_MAX)
+ return (EINVAL);
if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0)
return (error);
if ((fp->f_flag & FREAD) == 0) {
From owner-svn-src-stable-6@FreeBSD.ORG Fri Jan 9 23:54:15 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id E69DA106564A;
Fri, 9 Jan 2009 23:54:15 +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 D31B88FC1F;
Fri, 9 Jan 2009 23:54:15 +0000 (UTC)
(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n09NsFGT072643;
Fri, 9 Jan 2009 23:54:15 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n09NsFvH072638;
Fri, 9 Jan 2009 23:54:15 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200901092354.n09NsFvH072638@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 9 Jan 2009 23:54:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186985 - in stable/6/lib/bind: dns dns/dns lwres/lwres
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2009 23:54:16 -0000
Author: dougb
Date: Fri Jan 9 23:54:15 2009
New Revision: 186985
URL: http://svn.freebsd.org/changeset/base/186985
Log:
Non-functional changes to comments, copyrights, and VCS Ids related
to the 9.3.6-P1 import
Modified:
stable/6/lib/bind/dns/code.h
stable/6/lib/bind/dns/dns/enumclass.h
stable/6/lib/bind/dns/dns/enumtype.h
stable/6/lib/bind/dns/dns/rdatastruct.h
stable/6/lib/bind/lwres/lwres/platform.h
Modified: stable/6/lib/bind/dns/code.h
==============================================================================
--- stable/6/lib/bind/dns/code.h Fri Jan 9 22:35:25 2009 (r186984)
+++ stable/6/lib/bind/dns/code.h Fri Jan 9 23:54:15 2009 (r186985)
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*
- * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
Modified: stable/6/lib/bind/dns/dns/enumclass.h
==============================================================================
--- stable/6/lib/bind/dns/dns/enumclass.h Fri Jan 9 22:35:25 2009 (r186984)
+++ stable/6/lib/bind/dns/dns/enumclass.h Fri Jan 9 23:54:15 2009 (r186985)
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*
- * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
Modified: stable/6/lib/bind/dns/dns/enumtype.h
==============================================================================
--- stable/6/lib/bind/dns/dns/enumtype.h Fri Jan 9 22:35:25 2009 (r186984)
+++ stable/6/lib/bind/dns/dns/enumtype.h Fri Jan 9 23:54:15 2009 (r186985)
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*
- * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
Modified: stable/6/lib/bind/dns/dns/rdatastruct.h
==============================================================================
--- stable/6/lib/bind/dns/dns/rdatastruct.h Fri Jan 9 22:35:25 2009 (r186984)
+++ stable/6/lib/bind/dns/dns/rdatastruct.h Fri Jan 9 23:54:15 2009 (r186985)
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*
- * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -1044,10 +1044,10 @@ typedef struct dns_rdata_loc {
#endif /* GENERIC_LOC_29_H */
/*
- * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2002 Internet Software Consortium.
+ * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2003 Internet Software Consortium.
*
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
@@ -1063,7 +1063,7 @@ typedef struct dns_rdata_loc {
#ifndef GENERIC_NXT_30_H
#define GENERIC_NXT_30_H 1
-/* $Id: nxt_30.h,v 1.18.12.3 2004/03/08 09:04:41 marka Exp $ */
+/* $Id: nxt_30.h,v 1.18.12.6 2007/08/28 07:19:15 tbox Exp $ */
/* RFC 2535 */
@@ -1336,10 +1336,10 @@ dns_rdata_opt_current(dns_rdata_opt_t *,
#endif /* GENERIC_OPT_41_H */
/*
- * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2002 Internet Software Consortium.
+ * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2002, 2003 Internet Software Consortium.
*
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
@@ -1355,7 +1355,7 @@ dns_rdata_opt_current(dns_rdata_opt_t *,
#ifndef IN_1_APL_42_H
#define IN_1_APL_42_H 1
-/* $Id: apl_42.h,v 1.1.202.3 2004/03/08 09:04:44 marka Exp $ */
+/* $Id: apl_42.h,v 1.1.202.6 2007/08/28 07:19:15 tbox Exp $ */
typedef struct dns_rdata_apl_ent {
isc_boolean_t negative;
@@ -1499,10 +1499,10 @@ typedef struct dns_rdata_rrsig {
#endif /* GENERIC_DNSSIG_46_H */
/*
- * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2003 Internet Software Consortium.
*
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
@@ -1518,9 +1518,10 @@ typedef struct dns_rdata_rrsig {
#ifndef GENERIC_NSEC_47_H
#define GENERIC_NSEC_47_H 1
-/* $Id: nsec_47.h,v 1.4.2.1 2004/03/08 02:08:03 marka Exp $ */
+/* $Id: nsec_47.h,v 1.4.2.3 2008/07/15 23:45:44 tbox Exp $ */
-/* draft-ietf-dnsext-nsec-rdata-01.txt */
+/*!
+ * \brief Per RFC 3845 */
typedef struct dns_rdata_nsec {
dns_rdatacommon_t common;
Modified: stable/6/lib/bind/lwres/lwres/platform.h
==============================================================================
--- stable/6/lib/bind/lwres/lwres/platform.h Fri Jan 9 22:35:25 2009 (r186984)
+++ stable/6/lib/bind/lwres/lwres/platform.h Fri Jan 9 23:54:15 2009 (r186985)
@@ -1,10 +1,10 @@
/* $FreeBSD$ */
/*
- * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001 Internet Software Consortium.
+ * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2003 Internet Software Consortium.
*
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: platform.h.in,v 1.12.2.1.10.5 2005/06/08 02:08:32 marka Exp $ */
+/* $Id: platform.h.in,v 1.12.2.1.10.8 2007/08/28 07:19:18 tbox Exp $ */
#ifndef LWRES_PLATFORM_H
#define LWRES_PLATFORM_H 1
From owner-svn-src-stable-6@FreeBSD.ORG Sat Jan 10 04:30:28 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 1597E106566B;
Sat, 10 Jan 2009 04:30:28 +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 F25258FC0A;
Sat, 10 Jan 2009 04:30:27 +0000 (UTC)
(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0A4URN7079554;
Sat, 10 Jan 2009 04:30:27 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0A4UR2c079552;
Sat, 10 Jan 2009 04:30:27 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200901100430.n0A4UR2c079552@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 10 Jan 2009 04:30:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186999 - in stable/6/contrib/bind9: . bin/dig
bin/dnssec bin/named bin/named/include/named bin/named/unix
bin/named/unix/include/named bin/nsupdate bin/rndc doc/arm
doc/misc doc/rfc li...
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2009 04:30:28 -0000
Author: dougb
Date: Sat Jan 10 04:30:27 2009
New Revision: 186999
URL: http://svn.freebsd.org/changeset/base/186999
Log:
Merge from vendor/bind9/dist-9.3 as of the 9.3.6-P1 import
Added:
stable/6/contrib/bind9/aclocal.m4
- copied unchanged from r186989, vendor/bind9/dist-9.3/aclocal.m4
stable/6/contrib/bind9/bin/nsupdate/nsupdate.1
- copied unchanged from r186989, vendor/bind9/dist-9.3/bin/nsupdate/nsupdate.1
stable/6/contrib/bind9/config.h.in
- copied unchanged from r186989, vendor/bind9/dist-9.3/config.h.in
stable/6/contrib/bind9/doc/rfc/rfc4648.txt
- copied unchanged from r186989, vendor/bind9/dist-9.3/doc/rfc/rfc4648.txt
stable/6/contrib/bind9/doc/rfc/rfc4701.txt
- copied unchanged from r186989, vendor/bind9/dist-9.3/doc/rfc/rfc4701.txt
stable/6/contrib/bind9/doc/rfc/rfc5155.txt
- copied unchanged from r186989, vendor/bind9/dist-9.3/doc/rfc/rfc5155.txt
stable/6/contrib/bind9/lib/bind/aclocal.m4
- copied unchanged from r186989, vendor/bind9/dist-9.3/lib/bind/aclocal.m4
stable/6/contrib/bind9/lib/bind/config.h.in
- copied unchanged from r186989, vendor/bind9/dist-9.3/lib/bind/config.h.in
stable/6/contrib/bind9/lib/isc/include/isc/portset.h
- copied unchanged from r186989, vendor/bind9/dist-9.3/lib/isc/include/isc/portset.h
stable/6/contrib/bind9/lib/isc/portset.c
- copied unchanged from r186989, vendor/bind9/dist-9.3/lib/isc/portset.c
Deleted:
stable/6/contrib/bind9/bin/nsupdate/nsupdate.8
Modified:
stable/6/contrib/bind9/ (props changed)
stable/6/contrib/bind9/CHANGES
stable/6/contrib/bind9/FAQ
stable/6/contrib/bind9/FAQ.xml
stable/6/contrib/bind9/README
stable/6/contrib/bind9/bin/dig/dig.1
stable/6/contrib/bind9/bin/dig/dig.c
stable/6/contrib/bind9/bin/dig/dig.docbook
stable/6/contrib/bind9/bin/dig/dig.html
stable/6/contrib/bind9/bin/dig/dighost.c
stable/6/contrib/bind9/bin/dig/host.1
stable/6/contrib/bind9/bin/dig/host.docbook
stable/6/contrib/bind9/bin/dig/host.html
stable/6/contrib/bind9/bin/dnssec/dnssec-keygen.8
stable/6/contrib/bind9/bin/dnssec/dnssec-keygen.docbook
stable/6/contrib/bind9/bin/dnssec/dnssec-keygen.html
stable/6/contrib/bind9/bin/dnssec/dnssec-signzone.8
stable/6/contrib/bind9/bin/dnssec/dnssec-signzone.c
stable/6/contrib/bind9/bin/dnssec/dnssec-signzone.docbook
stable/6/contrib/bind9/bin/dnssec/dnssec-signzone.html
stable/6/contrib/bind9/bin/named/client.c
stable/6/contrib/bind9/bin/named/config.c
stable/6/contrib/bind9/bin/named/controlconf.c
stable/6/contrib/bind9/bin/named/include/named/globals.h
stable/6/contrib/bind9/bin/named/interfacemgr.c
stable/6/contrib/bind9/bin/named/lwresd.8
stable/6/contrib/bind9/bin/named/lwresd.c
stable/6/contrib/bind9/bin/named/lwresd.docbook
stable/6/contrib/bind9/bin/named/lwresd.html
stable/6/contrib/bind9/bin/named/main.c
stable/6/contrib/bind9/bin/named/named.8
stable/6/contrib/bind9/bin/named/named.conf.5
stable/6/contrib/bind9/bin/named/named.conf.docbook
stable/6/contrib/bind9/bin/named/named.conf.html
stable/6/contrib/bind9/bin/named/named.docbook
stable/6/contrib/bind9/bin/named/named.html
stable/6/contrib/bind9/bin/named/query.c
stable/6/contrib/bind9/bin/named/server.c
stable/6/contrib/bind9/bin/named/unix/include/named/os.h
stable/6/contrib/bind9/bin/named/unix/os.c
stable/6/contrib/bind9/bin/named/update.c
stable/6/contrib/bind9/bin/nsupdate/Makefile.in
stable/6/contrib/bind9/bin/nsupdate/nsupdate.docbook
stable/6/contrib/bind9/bin/nsupdate/nsupdate.html
stable/6/contrib/bind9/bin/rndc/rndc-confgen.c
stable/6/contrib/bind9/bin/rndc/rndc.c
stable/6/contrib/bind9/configure.in
stable/6/contrib/bind9/doc/arm/Bv9ARM-book.xml
stable/6/contrib/bind9/doc/arm/Bv9ARM.ch02.html
stable/6/contrib/bind9/doc/arm/Bv9ARM.ch04.html
stable/6/contrib/bind9/doc/arm/Bv9ARM.ch06.html
stable/6/contrib/bind9/doc/arm/Bv9ARM.ch07.html
stable/6/contrib/bind9/doc/arm/Bv9ARM.ch08.html
stable/6/contrib/bind9/doc/arm/Bv9ARM.ch09.html
stable/6/contrib/bind9/doc/arm/Bv9ARM.html
stable/6/contrib/bind9/doc/arm/Bv9ARM.pdf
stable/6/contrib/bind9/doc/misc/options
stable/6/contrib/bind9/doc/rfc/index
stable/6/contrib/bind9/lib/bind/api
stable/6/contrib/bind9/lib/bind/bsd/Makefile.in
stable/6/contrib/bind9/lib/bind/bsd/strerror.c
stable/6/contrib/bind9/lib/bind/bsd/strtoul.c
stable/6/contrib/bind9/lib/bind/configure.in
stable/6/contrib/bind9/lib/bind/dst/Makefile.in
stable/6/contrib/bind9/lib/bind/dst/dst_api.c
stable/6/contrib/bind9/lib/bind/dst/hmac_link.c
stable/6/contrib/bind9/lib/bind/dst/support.c
stable/6/contrib/bind9/lib/bind/include/arpa/nameser.h
stable/6/contrib/bind9/lib/bind/include/isc/assertions.h
stable/6/contrib/bind9/lib/bind/include/isc/misc.h
stable/6/contrib/bind9/lib/bind/include/resolv.h
stable/6/contrib/bind9/lib/bind/inet/Makefile.in
stable/6/contrib/bind9/lib/bind/inet/inet_net_pton.c
stable/6/contrib/bind9/lib/bind/irs/Makefile.in
stable/6/contrib/bind9/lib/bind/irs/dns_ho.c
stable/6/contrib/bind9/lib/bind/irs/irp.c
stable/6/contrib/bind9/lib/bind/isc/Makefile.in
stable/6/contrib/bind9/lib/bind/isc/assertions.c
stable/6/contrib/bind9/lib/bind/isc/bitncmp.c
stable/6/contrib/bind9/lib/bind/isc/ctl_clnt.c
stable/6/contrib/bind9/lib/bind/isc/ctl_srvr.c
stable/6/contrib/bind9/lib/bind/nameser/Makefile.in
stable/6/contrib/bind9/lib/bind/port_after.h.in
stable/6/contrib/bind9/lib/bind/resolv/Makefile.in
stable/6/contrib/bind9/lib/bind/resolv/res_debug.c
stable/6/contrib/bind9/lib/bind/resolv/res_mkquery.c
stable/6/contrib/bind9/lib/bind/resolv/res_query.c
stable/6/contrib/bind9/lib/bind9/api
stable/6/contrib/bind9/lib/bind9/check.c
stable/6/contrib/bind9/lib/dns/adb.c
stable/6/contrib/bind9/lib/dns/api
stable/6/contrib/bind9/lib/dns/cache.c
stable/6/contrib/bind9/lib/dns/dispatch.c
stable/6/contrib/bind9/lib/dns/include/dns/dispatch.h
stable/6/contrib/bind9/lib/dns/journal.c
stable/6/contrib/bind9/lib/dns/masterdump.c
stable/6/contrib/bind9/lib/dns/message.c
stable/6/contrib/bind9/lib/dns/openssldsa_link.c
stable/6/contrib/bind9/lib/dns/opensslrsa_link.c
stable/6/contrib/bind9/lib/dns/rbt.c
stable/6/contrib/bind9/lib/dns/rdata/generic/nsec_47.c
stable/6/contrib/bind9/lib/dns/rdata/generic/nsec_47.h
stable/6/contrib/bind9/lib/dns/rdata/generic/txt_16.c
stable/6/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c
stable/6/contrib/bind9/lib/dns/request.c
stable/6/contrib/bind9/lib/dns/resolver.c
stable/6/contrib/bind9/lib/dns/validator.c
stable/6/contrib/bind9/lib/dns/view.c
stable/6/contrib/bind9/lib/dns/xfrin.c
stable/6/contrib/bind9/lib/isc/Makefile.in
stable/6/contrib/bind9/lib/isc/api
stable/6/contrib/bind9/lib/isc/assertions.c
stable/6/contrib/bind9/lib/isc/include/isc/assertions.h
stable/6/contrib/bind9/lib/isc/include/isc/mem.h
stable/6/contrib/bind9/lib/isc/include/isc/msgs.h
stable/6/contrib/bind9/lib/isc/include/isc/platform.h.in
stable/6/contrib/bind9/lib/isc/include/isc/resource.h
stable/6/contrib/bind9/lib/isc/include/isc/socket.h
stable/6/contrib/bind9/lib/isc/include/isc/timer.h
stable/6/contrib/bind9/lib/isc/include/isc/types.h
stable/6/contrib/bind9/lib/isc/mem.c
stable/6/contrib/bind9/lib/isc/print.c
stable/6/contrib/bind9/lib/isc/pthreads/mutex.c
stable/6/contrib/bind9/lib/isc/timer.c
stable/6/contrib/bind9/lib/isc/unix/app.c
stable/6/contrib/bind9/lib/isc/unix/include/isc/net.h
stable/6/contrib/bind9/lib/isc/unix/net.c
stable/6/contrib/bind9/lib/isc/unix/resource.c
stable/6/contrib/bind9/lib/isc/unix/socket.c
stable/6/contrib/bind9/lib/isc/unix/socket_p.h
stable/6/contrib/bind9/lib/isc/unix/time.c
stable/6/contrib/bind9/lib/isccfg/api
stable/6/contrib/bind9/lib/isccfg/namedconf.c
stable/6/contrib/bind9/version
Modified: stable/6/contrib/bind9/CHANGES
==============================================================================
--- stable/6/contrib/bind9/CHANGES Sat Jan 10 03:04:21 2009 (r186998)
+++ stable/6/contrib/bind9/CHANGES Sat Jan 10 04:30:27 2009 (r186999)
@@ -1,14 +1,154 @@
- --- 9.3.5-P2 released ---
+ --- 9.3.6-P1 released ---
-2406. [bug] Some operating systems have FD_SETSIZE set to a
- low value by default, which can cause resource
- exhaustion when many simultaneous connections are
- open. Linux in particular makes it difficult to
- increase this value. To use more sockets with
- select(), set ISC_SOCKET_FDSETSIZE. Example:
- STD_CDEFINES="-DISC_SOCKET_FDSETSIZE=4096" ./configure
- (This should not be necessary in most cases, and
- never for an authoritative-only server.) [RT #18328]
+2522. [security] Handle -1 from DSA_do_verify().
+
+2498. [bug] Removed a bogus function argument used with
+ ISC_SOCKET_USE_POLLWATCH: it could cause compiler
+ warning or crash named with the debug 1 level
+ of logging. [RT #18917]
+
+ --- 9.3.6 released ---
+
+2490. [port] aix: work around a kernel bug where IPV6_RECVPKTINFO
+ is cleared when IPV6_V6ONLY is set. [RT #18785]
+
+2489. [port] solaris: Workaround Solaris's kernel bug about
+ /dev/poll:
+ http://bugs.opensolaris.org/view_bug.do?bug_id=6724237
+ Define ISC_SOCKET_USE_POLLWATCH at build time to enable
+ this workaround. [RT #18870]
+
+ --- 9.3.6rc1 released ---
+
+2473. [port] linux: raise the limit on open files to the possible
+ maximum value before spawning threads; 'files'
+ specified in named.conf doesn't seem to work with
+ threads as expected. [RT #18784]
+
+2472. [port] linux: check the number of available cpu's before
+ calling chroot as it depends on "/proc". [RT #16923]
+
+2469. [port] solaris: Work around Solaris's select() limitations.
+ [RT #18769]
+
+2468. [bug] Resolver could try unreachable servers multiple times.
+ [RT #18739]
+
+2467. [bug] Failure of fcntl(F_DUPFD) wasn't logged. [RT #18740]
+
+2465. [bug] Adb's handling of lame addresses was different
+ for IPv4 and IPv6. [RT #18738]
+
+2463. [port] linux: POSIX doesn't include the IPv6 Advanced Socket
+ API and glibc hides parts of the IPv6 Advanced Socket
+ API as a result. This is stupid as it breaks how the
+ two halves (Basic and Advanced) of the IPv6 Socket API were designed to be used but we have to live with it.
+ Define _GNU_SOURCE to pull in the IPv6 Advanced Socket
+ API. [RT #18388]
+
+2462. [doc] Document -m (enable memory usage debugging)
+ option for dig. [RT #18757]
+
+2461. [port] sunos: Change #2363 was not complete. [RT #17513]
+
+2458. [doc] ARM: update and correction for max-cache-size.
+ [RT #18294]
+
+2455. [bug] Stop metadata being transfered via axfr/ixfr.
+ [RT #18639]
+
+2453. [bug] Remove NULL pointer dereference in dns_journal_print().
+ [RT #18316]
+
+2449. [bug] libbind: Out of bounds reference in dns_ho.c:addrsort.
+ [RT #18044]
+
+2444. [port] Linux, FreeBSD, AIX: Turn off path mtu discovery
+ (clear DF) for UDP responses and requests.
+
+ --- 9.3.6b1 released ---
+
+2443. [bug] win32: UDP connect() would not generate an event,
+ and so connected UDP sockets would never clean up.
+ Fix this by doing an immediate WSAConnect() rather
+ than an io completion port type for UDP.
+
+2438. [bug] Timeouts could be logged incorrectly under win32.
+ [RT #18617]
+
+2437. [bug] Sockets could be closed too early, leading to
+ inconsistent states in the socket module. [RT #18298]
+
+2436. [security] win32: UDP client handler can be shutdown. [RT #18576]
+
+2432. [bug] More Windows socket handling improvements. Stop
+ using I/O events and use IO Completion Ports
+ throughout. Rewrite the receive path logic to make
+ it easier to support multiple simultaneous
+ requestrs in the future. Add stricter consistency
+ checking as a compile-time option (define
+ ISC_SOCKET_CONSISTENCY_CHECKS; defaults to off).
+
+2430. [bug] win32: isc_interval_set() could round down to
+ zero if the input was less than NS_INTERVAL
+ nanoseconds. Round up instead. [RT #18549]
+
+2429. [doc] nsupdate should be in section 1 of the man pages.
+ [RT #18283]
+
+2426. [bug] libbind: inet_net_pton() can sometimes return the
+ wrong value if excessively large netmasks are
+ supplied. [RT #18512]
+
+2425. [bug] named didn't detect unavailable query source addresses
+ at load time. [RT #18536]
+
+2424. [port] configure now probes for a working epoll
+ implementation. Allow the use of kqueue,
+ epoll and /dev/poll to be selected at compile
+ time. [RT #18277]
+
+2422. [bug] Handle the special return value of a empty node as
+ if it was a NXRRSET in the validator. [RT #18447]
+
+2421. [func] Add new command line option '-S' for named to specify
+ the max number of sockets. [RT #18493]
+ Use caution: this option may not work for some
+ operating systems without rebuilding named.
+
+2420. [bug] Windows socket handling cleanup. Let the io
+ completion event send out cancelled read/write
+ done events, which keeps us from writing to memeory
+ we no longer have ownership of. Add debugging
+ socket_log() function. Rework TCP socket handling
+ to not leak sockets.
+
+2417. [bug] Connecting UDP sockets for outgoing queries could
+ unexpectedly fail with an 'address already in use'
+ error. [RT #18411]
+
+2416. [func] Log file descriptors that cause exceeding the
+ internal maximum. [RT #18460]
+
+2414. [bug] A masterdump context held the database lock too long,
+ causing various troubles such as dead lock and
+ recursive lock acquisition. [RT #18311, #18456]
+
+2413. [bug] Fixed an unreachable code path in socket.c. [RT #18442]
+
+2412. [bug] win32: address a resourse leak. [RT #18374]
+
+2411. [bug] Allow using a larger number of sockets than FD_SETSIZE
+ for select(). To enable this, set ISC_SOCKET_MAXSOCKETS
+ at compilation time. [RT #18433]
+
+2410. [bug] Correctly delete m_versionInfo. [RT #18432]
+
+2408. [bug] A duplicate TCP dispatch event could be sent, which
+ could then trigger an assertion failure in
+ resquery_response(). [RT #18275]
+
+2407. [port] hpux: test for sys/dyntune.h. [RT #18421]
2404. [port] hpux: files unlimited support.
@@ -22,7 +162,7 @@
2399. [bug] Abort timeout queries to reduce the number of open
UDP sockets. [RT #18367]
-2398. [bug] Improve file descriptor management. New,
+2398. [bug] Improve file descriptor management. New,
temporary, named.conf option reserved-sockets,
default 512. [RT #18344]
@@ -39,11 +179,111 @@
2392. [bug] remove 'grep -q' from acl test script, some platforms
don't support it. [RT #18253]
- --- 9.3.5-P1 released ---
+2391 [port] hpux: cover additional recvmsg() error codes.
+ [RT #18301]
+
+2390 [bug] dispatch.c could make a false warning on 'odd socket'.
+ [RT #18301].
+
+2389 [bug] Move the "working directory writable" check to after
+ the ns_os_changeuser() call. [RT #18326]
+
+2386. [func] Add warning about too small 'open files' limit.
+ [RT #18269]
+
+2385. [bug] A condition variable in socket.c could leak in
+ rare error handling [RT #17968].
+
+2384. [security] Additional support for query port randomization (change
+ #2375) including performance improvement and port range
+ specification. [RT #17949, #18098]
+
+2383. [bug] named could double queries when they resulted in
+ SERVFAIL due to overkilling EDNS0 failure detection.
+ [RT #18182]
+
+2382. [doc] Add a description SSHFP to ARM.
+
+2380. [bug] dns_view_find() was not returning NXDOMAIN/NXRRSET
+ proofs which, in turn, caused validation failures
+ for insecure zones immediately below a secure zone
+ the server was authoritative for. [RT #18112]
-2375. [security] Fully randomize UDP query ports to improve
+2379. [contrib] queryperf/gen-data-queryperf.py: removed redundant
+ TLDs and supported RRs with TTLs [RT #17972]
+
+2377. [bug] Address race condition in dnssec-signzone. [RT #18142]
+
+2376. [bug] Change #2144 was not complete.
+
+2375. [security] Fully randomize UDP query ports to improve
forgery resilience. [RT #17949]
+2369. [bug] libbind: Array bounds overrun on read in bitncmp().
+ [RT #18054]
+
+2364. [bug] named could trigger an assertion when serving a
+ malformed signed zone. [RT #17828]
+
+2363. [port] sunos: pre-set "lt_cv_sys_max_cmd_len=4096;".
+ [RT #17513]
+
+2361. [bug] "recursion" statistics counter could be counted
+ multiple times for a single query. [RT #17990]
+
+2358. [doc] Update host's default query description. [RT #17934]
+
+2356. [bug] Built in mutex profiler was not scalable enough.
+ [RT #17436]
+
+2353. [func] libbind: nsid support. [RT #17091]
+
+2350. [port] win32: IPv6 support. [RT #17797]
+
+2347. [bug] Delete now traverses the RB tree in the canonical
+ order. [RT #17451]
+
+2345. [bug] named-checkconf failed to detect when forwarders
+ were set at both the options/view level and in
+ a root zone. [RT #17671]
+
+2344. [bug] Improve "logging{ file ...; };" documentation.
+ [RT #17888]
+
+2343. [bug] (Seemingly) duplicate IPv6 entries could be
+ created in ADB. [RT #17837]
+
+2341. [bug] libbind: add missing -I../include for off source
+ tree builds. [RT #17606]
+
+2340. [port] openbsd: interface configuration. [RT #17700]
+
+2335. [port] sunos: libbind and *printf() support for long long.
+ [RT #17513]
+
+2334. [bug] Bad REQUIRES in fromstruct_in_naptr(), off by one
+ bug in fromstruct_txt(). [RT #17609]
+
+2333. [bug] Fix off by one error in isc_time_nowplusinterval().
+ [RT #17608]
+
+2332. [contrib] query-loc-0.4.0. [RT #17602]
+
+2331. [bug] Failure to regenerate any signatures was not being
+ reported nor being past back to the UPDATE client.
+ [RT #17570]
+
+2330. [bug] Remove potential race condition when handling
+ over memory events. [RT #17572]
+
+ WARNING: API CHANGE: over memory callback
+ function now needs to call isc_mem_waterack().
+ See <isc/mem.h> for details.
+
+2329. [bug] Clearer help text for dig's '-x' and '-i' options.
+
+2325. [port] Linux: use capset() function if available. [RT #17557]
+
--- 9.3.5 released ---
--- 9.3.5rc2 released ---
@@ -65,11 +305,11 @@
2322. [port] MacOS: work around the limitation of setrlimit()
for RLIMIT_NOFILE. [RT #17526]
-2321. [bug] Silence Coverity warnings in lib/dns/master.c,
+2321. [bug] Silence Coverity warnings in lib/dns/master.c,
lib/dns/rbtdb.c, lib/isccfg/namedconf.c,
lib/dns/tsig.c and bin/dnssec/dnssec-signzone.c.
-2319. [bug] Silence Coverity warnings in
+2319. [bug] Silence Coverity warnings in
lib/dns/rdata/in_1/apl_42.c. [RT #17469]
2318. [port] sunos fixes for libbind. [RT #17514]
@@ -83,7 +323,7 @@
2312. [cleanup] Silence Coverity warning in lib/isc/unix/socket.c.
[RT #17458]
-2311. [func] Update ACL regression test. [RT #17462]
+2311. [func] Update ACL regression test. [RT #17462]
2310. [bug] dig, host, nslookup: flush stdout before emitting
debug/fatal messages. [RT #17501]
@@ -106,7 +346,7 @@
2301. [bug] Remove resource leak and fix error messages in
bin/tests/system/lwresd/lwtest.c. [RT #17474]
-2300. [bug] Fixed failure to close open file in
+2300. [bug] Fixed failure to close open file in
bin/tests/names/t_names.c. [RT #17473]
2299. [bug] Remove unnecessary NULL check in
@@ -129,7 +369,7 @@
2292. [bug] Log if the working directory is not writable.
[RT #17312]
-2291. [bug] PR_SET_DUMPABLE may be set too late. Also report
+2291. [bug] PR_SET_DUMPABLE may be set too late. Also report
failure to set PR_SET_DUMPABLE. [RT #17312]
2290. [bug] Let AD in the query signal that the client wants AD
@@ -148,7 +388,7 @@
memory context rather than the clients memory
context. [RT #17377]
-2279. [bug] Use setsockopt(SO_NOSIGPIPE), when available,
+2279. [bug] Use setsockopt(SO_NOSIGPIPE), when available,
to protect applications from receiving spurious
SIGPIPE signals when using the resolver.
@@ -157,7 +397,7 @@
--- 9.3.5b1 released ---
-2273. [bug] Adjust log level to WARNING when saving inconsistant
+2273. [bug] Adjust log level to WARNING when saving inconsistent
stub/slave master and journal files. [RT# 17279]
2272. [bug] Handle illegal dnssec-lookaside trust-anchor names.
@@ -194,10 +434,10 @@
reality. Note there is behaviour change for BIND 9.5.
[RT #17113]
-2249. [bug] Only set Authentic Data bit if client requested
+2249. [bug] Only set Authentic Data bit if client requested
DNSSEC, per RFC 3655 [RT #17175]
-2248. [cleanup] Fix several errors reported by Coverity. [RT #17160]
+2248. [cleanup] Fix several errors reported by Coverity. [RT #17160]
2247. [doc] Sort doc/misc/options. [RT #17067]
@@ -208,18 +448,18 @@
working. [RT #17151]
2238. [bug] It was possible to trigger a REQUIRE when a
- validation was cancelled. [RT #17106]
+ validation was canceled. [RT #17106]
2237. [bug] libbind: res_init() was not thread aware. [RT #17123]
2236. [bug] dnssec-signzone failed to preserve the case of
of wildcard owner names. [RT #17085]
-2234. [port] Correct some compiler warnings on SCO OSr5 [RT #17134]
-
+2234. [port] Correct some compiler warnings on SCO OSr5 [RT #17134]
+
2229. [bug] Null pointer dereference on query pool creation
- failure. [RT #17133]
-
+ failure. [RT #17133]
+
2232. [bug] dns_adb_findaddrinfo() could fail and return
ISC_R_SUCCESS. [RT #17137]
@@ -230,10 +470,10 @@
2227. [cleanup] Tidied up the FAQ. [RT #17121]
-2226. [bug] Fix build error. [RT #17124]
+2226. [bug] Fix build error. [RT #17124]
2225. [bug] More support for systems with no IPv4 addresses.
- [RT #17111]
+ [RT #17111]
2224. [bug] Defer journal compaction if a xfrin is in progress.
[RT #17119]
@@ -247,12 +487,12 @@
2220. [bug] win32: Address a race condition in final shutdown of
the Windows socket code. [RT #17028]
-
+
2218. [bug] Remove unnecessary REQUIRE from dns_validator_create().
[RT #16976]
2216. [cleanup] Fix a number of errors reported by Coverity.
- [RT #17094]
+ [RT #17094]
2214. [bug] Deregister OpenSSL lock callback when cleaning
up. [RT #17098]
@@ -297,7 +537,7 @@
2187. [bug] query_addds(), query_addwildcardproof() and
query_addnxrrsetnsec() should take a version
- arguement. [RT #16368]
+ argument. [RT #16368]
2186. [port] cygwin: libbind: check for struct sockaddr_storage
independently of IPv6. [RT #16482]
@@ -324,7 +564,7 @@
debug level 10+. [RT #16798]
2176. [contrib] dbus update to handle race condition during
- initialisation (Bugzilla 235809). [RT #16842]
+ initialization (Bugzilla 235809). [RT #16842]
2175. [bug] win32: windows broadcast condition variable support
was broken. [RT #16592]
@@ -444,7 +684,7 @@
2111. [bug] Fix a number of errors reported by Coverity.
[RT #16507]
-2110. [bug] "minimal-response yes;" interacted badly with BIND 8
+2110. [bug] "minimal-responses yes;" interacted badly with BIND 8
priming queries. [RT #16491]
2109. [port] libbind: silence aix 5.3 compiler warnings. [RT #16502]
@@ -453,7 +693,7 @@
2203. [security] Query id generation was cryptographically weak.
[RT # 16915]
-
+
2193. [port] win32: BINDInstall.exe is now linked statically.
[RT #16906]
@@ -463,7 +703,7 @@
--- 9.3.4 released ---
-2126. [security] Serialise validation of type ANY responses. [RT #16555]
+2126. [security] Serialize validation of type ANY responses. [RT #16555]
2124. [security] It was possible to dereference a freed fetch
context. [RT #16584]
@@ -477,14 +717,14 @@
2103. [port] Add /usr/sfw to list of locations for OpenSSL
under Solaris.
-2102. [port] Silence solaris 10 warnings.
+2102. [port] Silence Solaris 10 warnings.
2101. [bug] OpenSSL version checks were not quite right.
[RT #16476]
2100. [port] win32: copy libeay32.dll to Build\Debug.
-2099. [port] win32: more manifiest issues.
+2099. [port] win32: more manifest issues.
--- 9.3.3rc3 released ---
@@ -493,12 +733,12 @@
2095. [port] libbind: alway prototype inet_cidr_ntop_ipv6() and
net_cidr_ntop_ipv6(). [RT #16388]
-
+
2094. [contrib] Update named-bootconf. [RT# 16404]
2092. [bug] win32: dig, host, nslookup. Use registry config
if resolv.conf does not exist or no nameservers
- listed. [RT #15877]
+ listed. [RT #15877]
2091. [port] dighost.c: race condition on cleanup. [RT #16417]
@@ -588,7 +828,7 @@
[RT #16287]
2049. [bug] Restore SOA before AXFR when falling back from
- a attempted IXFR when transfering in a zone.
+ a attempted IXFR when transferring in a zone.
Allow a initial SOA query before attempting
a AXFR to be requested. [RT #16156]
@@ -597,7 +837,7 @@
the OS always returned the same local port.
[RT #16182]
-2047. [bug] Failed to initialise the interface flags to zero.
+2047. [bug] Failed to initialize the interface flags to zero.
[RT #16245]
2043. [port] nsupdate/nslookup: Force the flushing of the prompt
@@ -626,7 +866,7 @@
2029. [bug] host printed out the server multiple times when
specified on the command line. [RT #15992]
-2028. [port] linux: socket.c compatability for old systems.
+2028. [port] linux: socket.c compatibility for old systems.
[RT #16015]
2027. [port] libbind: Solaris x86 support. [RT #16020]
@@ -634,7 +874,7 @@
2026. [bug] Rate limit the two recursive client exceeded messages.
[RT #16044]
-2024. [bug] named emited spurious "zone serial unchanged"
+2024. [bug] named emitted spurious "zone serial unchanged"
messages on reload. [RT #16027]
2023. [bug] "make install" should create ${localstatedir}/run and
@@ -647,7 +887,7 @@
2013. [bug] Handle unexpected TSIGs on unsigned AXFR/IXFR
responses more gracefully. [RT #15941]
-2009. [bug] libbind: coverity fixes. [RT #15808]
+2009. [bug] libbind: Coverity fixes. [RT #15808]
2005. [bug] libbind: Retransmission timeouts should be
based on which attempt it is to the nameserver
@@ -679,16 +919,16 @@
1994. [port] OpenSSL 0.9.8 support. [RT #15694]
-1993. [bug] Log messsage, via syslog, were missing the space
+1993. [bug] Log messages, via syslog, were missing the space
after the timestamp if "print-time yes" was specified.
[RT #15844]
1991. [cleanup] The configuration data, once read, should be treated
- as readonly. Expand the use of const to enforce this
+ as read only. Expand the use of const to enforce this
at compile time. [RT #15813]
1990. [bug] libbind: isc's override of broken gettimeofday()
- implementions was not always effective.
+ implementations was not always effective.
[RT #15709]
1989. [bug] win32: don't check the service password when
@@ -703,7 +943,7 @@
server for the zone. Also any zones that contain
DLV records should be removed when upgrading a slave
zone. You do not however have to upgrade all
- servers for a zone with DLV records simultaniously.
+ servers for a zone with DLV records simultaneously.
1982. [bug] DNSKEY was being accepted on the parent side of
a delegation. KEY is still accepted there for
@@ -728,7 +968,7 @@
1974. [doc] List each of the zone types and associated zone
options separately in the ARM.
-1972. [contrib] DBUS dynamic forwarders integation from
+1972. [contrib] DBUS dynamic forwarders integration from
Jason Vas Dias <jvdias@redhat.com>.
1971. [port] linux: make detection of missing IF_NAMESIZE more
@@ -745,7 +985,7 @@
1966. [bug] Don't set CD when we have fallen back to plain DNS.
[RT #15727]
-1963. [port] Tru64 4.0E doesn't support send() and recv().
+1963. [port] Tru64 4.0E doesn't support send() and recv().
[RT #15586]
1962. [bug] Named failed to clear old update-policy when it
@@ -767,7 +1007,7 @@
by native compiler. See README for additional
cross compile support information. [RT #15148]
-1955. [bug] Pre-allocate the cache cleaning interator. [RT #14998]
+1955. [bug] Pre-allocate the cache cleaning iterator. [RT #14998]
1952. [port] hpux: tell the linker to build a runtime link
path "-Wl,+b:". [RT #14816].
@@ -775,7 +1015,7 @@
1951. [security] Drop queries from particular well known ports.
Don't return FORMERR to queries from particular
well known ports. [RT #15636]
-
+
1950. [port] Solaris 2.5.1 and earlier cannot bind() then connect()
a TCP socket. This prevents the source address being
set for TCP connections. [RT #15628]
@@ -803,7 +1043,7 @@
1940. [bug] Fixed a number of error conditions reported by
Coverity.
-1939. [bug] The resolver could dereference a null pointer after
+1939. [bug] The resolver could dereference a null pointer after
validation if all the queries have timed out.
[RT #15528]
@@ -848,7 +1088,7 @@
1914. [protocol] DS is required to accept mnemonic algorithms
(RFC 4034). Still emit numeric algorithms for
- compatability with RFC 3658. [RT #15354]
+ compatibility with RFC 3658. [RT #15354]
1911. [bug] Update windows socket code. [RT #14965]
@@ -892,7 +1132,7 @@
1881. [func] Add a system test for named-checkconf. [RT #14931]
1877. [bug] Fix unreasonably low quantum on call to
- dns_rbt_destroy2(). Remove unnecessay unhash_node()
+ dns_rbt_destroy2(). Remove unnecessary unhash_node()
call. [RT #14919]
1875. [bug] process_dhtkey() was using the wrong memory context
@@ -951,24 +1191,24 @@
1850. [bug] Memory leak in lwres_getipnodebyaddr(). [RT #14591]
1849. [doc] All forms of the man pages (docbook, man, html) should
- have consistant copyright dates.
+ have consistent copyright dates.
1848. [bug] Improve SMF integration. [RT #13238]
1847. [bug] isc_ondestroy_init() is called too late in
- dns_rbtdb_create()/dns_rbtdb64_create().
+ dns_rbtdb_create()/dns_rbtdb64_create().
[RT #13661]
-
+
1846. [contrib] query-loc-0.3.0 from Stephane Bortzmeyer
<bortzmeyer@nic.fr>.
-1845. [bug] Improve error reporting to distingish between
+1845. [bug] Improve error reporting to distinguish between
accept()/fcntl() and socket()/fcntl() errors.
[RT #13745]
1844. [bug] inet_pton() accepted more that 4 hexadecimal digits
for each 16 bit piece of the IPv6 address. The text
- representation of a IPv6 address has been tighted
+ representation of a IPv6 address has been tightened
to disallow this (draft-ietf-ipv6-addr-arch-v4-02.txt).
[RT #5662]
@@ -1026,7 +1266,7 @@
1822. [bug] check-names test for RT was reversed. [RT #13382]
-1821. [doc] acls definitions are no longer required to be
+1821. [doc] acls definitions are no longer required to be
in named.conf prior to reference. They can be
defined after being referenced.
@@ -1052,7 +1292,7 @@
1807. [bug] When forwarding (forward only) set the active domain
from the forward zone name. [RT #13526]
-
+
1804. [bug] Ensure that if we are queried for glue that it fits
in the additional section or TC is set to tell the
client to retry using TCP. [RT #10114]
@@ -1165,7 +1405,7 @@
1765. [bug] configure --with-openssl=auto failed. [RT #12937]
1764. [bug] dns_zone_replacedb failed to emit a error message
- if there was no SOA record in the replacment db.
+ if there was no SOA record in the replacement db.
[RT #13016]
1762. [bug] isc_interfaceiter_create() could return ISC_R_SUCCESS
@@ -1180,7 +1420,7 @@
1759. [bug] Named failed to startup if the OS supported IPv6
but had no IPv6 interfaces configured. [RT #12942]
-1754. [bug] We wern't always attempting to query the parent
+1754. [bug] We weren't always attempting to query the parent
server for the DS records at the zone cut.
[RT #12774]
@@ -1199,7 +1439,7 @@
1749. [bug] 'check-names response ignore;' failed to ignore.
[RT #12866]
-1747. [bug] BIND 8 compatability: named/named-checkconf failed
+1747. [bug] BIND 8 compatibility: named/named-checkconf failed
to parse "host-statistics-max" in named.conf.
1745. [bug] Dig/host/nslookup accept replies from link locals
@@ -1213,7 +1453,7 @@
requested number of worker threads then destruction
of the manager would trigger an INSIST() failure.
[RT #12790]
-
+
1742. [bug] Deleting all records at a node then adding a
previously existing record, in a single UPDATE
transaction, failed to leave / regenerate the
@@ -1224,7 +1464,7 @@
1740. [bug] Replace rbt's hash algorithm as it performed badly
with certain zones. [RT #12729]
-
+
NOTE: a hash context now needs to be established
via isc_hash_create() if the application was not
already doing this.
@@ -1239,7 +1479,7 @@
1736. [bug] dst_key_fromnamedfile() could fail to read a
public key. [RT #12687]
-
+
1735. [bug] 'dig +sigtrace' could die with a REQUIRE failure.
[RE #12688]
@@ -1277,7 +1517,7 @@
[RT #12519]
1721. [bug] Error message from the journal processing were not
- always identifing the relevent journal. [RT #12519]
+ always identifying the relevant journal. [RT #12519]
1720. [bug] 'dig +chase' did not terminate on a RFC 2308 Type 1
negative response. [RT #12506]
@@ -1330,7 +1570,7 @@
1703. [bug] named would loop sending NOTIFY messages when it
failed to receive a response. [RT #12322]
-1702. [bug] also-notify should not be applied to builtin zones.
+1702. [bug] also-notify should not be applied to built in zones.
[RT #12323]
1701. [doc] A minimal named.conf man page.
@@ -1402,7 +1642,7 @@
1675. [bug] named would sometimes add extra NSEC records to
the authority section.
-
+
1674. [port] linux: increase buffer size used to scan
/proc/net/if_inet6.
@@ -1473,7 +1713,7 @@
1648. [func] Update dnssec-lookaside named.conf syntax to support
multiple dnssec-lookaside namespaces (not yet
- implemented).
+ implemented).
1647. [bug] It was possible trigger a INSIST when chasing a DS
record that required walking back over a empty node.
@@ -1486,7 +1726,7 @@
masters with keys are specified.
1644. [bug] Update the journal modification time after a
- sucessfull refresh query. [RT #11436]
+ successful refresh query. [RT #11436]
1643. [bug] dns_db_closeversion() could leak memory / node
references. [RT #11163]
@@ -1505,11 +1745,11 @@
1638. [bug] "ixfr-from-differences" could generate a REQUIRE
failure if the journal open failed. [RT #11347]
-
+
1637. [bug] Node reference leak on error in addnoqname().
1636. [bug] The dump done callback could get ISC_R_SUCCESS even if
- a error had occured. The database version no longer
+ a error had occurred. The database version no longer
matched the version of the database that was dumped.
1635. [bug] Memory leak on error in query_addds().
@@ -1542,7 +1782,7 @@
1625. [bug] named failed to load/transfer RFC2535 signed zones
which contained CNAMES. [RT# 11237]
-1606. [bug] DLV insecurity proof was failing.
+1606. [bug] DLV insecurity proof was failing.
1605. [func] New dns_db_find() option DNS_DBFIND_COVERINGNSEC.
@@ -1618,14 +1858,14 @@
1604. [bug] A xfrout_ctx_create() failure would result in
xfrout_ctx_destroy() being called with a
partially initialized structure.
-
+
1603. [bug] nsupdate: set interactive based on isatty().
[RT# 10929]
1602. [bug] Logging to a file failed unless a size was specified.
[RT# 10925]
-1601. [bug] Silence spurious warning 'both "recursion no;" and
+1601. [bug] Silence spurious warning 'both "recursion no;" and
"allow-recursion" active' warning from view "_bind".
[RT# 10920]
@@ -1860,7 +2100,7 @@
type, class and responding nameserver.
1511. [bug] delegation-only was generating false positives
- on negative answers from subzones.
+ on negative answers from sub-zones.
1510. [func] New view option "root-delegation-only". Apply
delegation-only check to all TLDs and root.
@@ -3568,7 +3808,7 @@
954. [bug] When requesting AXFRs or IXFRs using dig, host, or
nslookup, the RD bit should not be set as zone
- transfers are inherently nonrecursive. [RT #1575]
+ transfers are inherently non-recursive. [RT #1575]
953. [func] The /var/run/named.key file from change #843
has been replaced by /etc/rndc.key. Both
@@ -3841,7 +4081,7 @@
860. [func] Drop cross class glue in zone transfers.
859. [bug] Cache cleaning now won't swamp the CPU if there
- is a persistent overlimit condition.
+ is a persistent over limit condition.
858. [func] isc_mem_setwater() no longer requires that when the
callback function is non-NULL then its hi_water
@@ -4017,7 +4257,7 @@
811. [bug] Parentheses were not quoted in zone dumps. [RT #1194]
810. [bug] The signer name in SIG records was not properly
- downcased when signing/verifying records. [RT #1186]
+ down-cased when signing/verifying records. [RT #1186]
809. [bug] Configuring a non-local address as a transfer-source
could cause an assertion failure during load.
@@ -4029,9 +4269,9 @@
ignored like it should be.
806. [bug] DNS_R_SEENINCLUDE was failing to propagate back up
- the calling stack to the zone maintence level, causing
- zones to not reload when an included file was touched
- but the top-level zone file was not.
+ the calling stack to the zone maintenance level,
+ causing zones to not reload when an included file was
+ touched but the top-level zone file was not.
805. [bug] When using "forward only", missing root hints should
not cause queries to fail. [RT #1143]
@@ -4071,7 +4311,7 @@
in rndc.conf.
793. [cleanup] The DNSSEC tools could create filenames that were
- illegal or contained shell metacharacters. They
+ illegal or contained shell meta-characters. They
now use a different text encoding of names that
doesn't have these problems. [RT #1101]
@@ -4095,7 +4335,7 @@
names when mapping them into file names.
786. [bug] When DNSSEC signing/verifying data, owner names were
- not properly downcased.
+ not properly down-cased.
785. [bug] A race condition in the resolver could cause
an assertion failure. [RT #673, #872, #1048]
@@ -4114,7 +4354,7 @@
780. [bug] Error handling code dealing with out of memory or
other rare errors could lead to assertion failures
- by calling functions on unitialized names. [RT #1065]
+ by calling functions on uninitialized names. [RT #1065]
779. [func] Added the "minimal-responses" option.
@@ -4257,7 +4497,7 @@
735. [doc] Add BIND 4 migration notes.
734. [bug] An attempt to re-lock the zone lock could occur if
- the server was shutdown during a zone tranfer.
+ the server was shutdown during a zone transfer.
[RT #830]
733. [bug] Reference counts of dns_acl_t objects need to be
@@ -4397,7 +4637,7 @@
688. [func] "make tags" now works on systems with the
"Exuberant Ctags" etags.
- 687. [bug] Only say we have IPv6, with sufficent functionality,
+ 687. [bug] Only say we have IPv6, with sufficient functionality,
if it has actually been tested. [RT #586]
686. [bug] dig and nslookup can now be properly aborted during
@@ -4713,7 +4953,7 @@
--- 9.1.0b1 released ---
591. [bug] Work around non-reentrancy in openssl by disabling
- precomputation in keys.
+ pre-computation in keys.
590. [doc] There are now man pages for the lwres library in
doc/man/lwres.
@@ -4762,7 +5002,7 @@
source address for notify messages.
577. [func] Log illegal RDATA combinations. e.g. multiple
- singlton types, cname and other data.
+ singleton types, cname and other data.
576. [doc] isc_log_create() description did not match reality.
@@ -4773,7 +5013,7 @@
have their responses validated and would leak memory.
573. [bug] The journal files of IXFRed slave zones were
- inadvertantly discarded on server reload, causing
+ inadvertently discarded on server reload, causing
"journal out of sync with zone" errors on subsequent
reloads. [RT #482]
@@ -4938,7 +5178,7 @@
others).
519. [bug] dns_name_split() would improperly split some bitstring
- labels, zeroing a few of the least signficant bits in
+ labels, zeroing a few of the least significant bits in
the prefix part. When such an improperly created
prefix was returned to the RBT database, the bogus
label was dutifully stored, corrupting the tree.
@@ -4966,7 +5206,7 @@
513. [func] New functionality added to rdnc and server to allow
individual zones to be refreshed or reloaded.
- 512. [bug] The zone transfer code could throw an execption with
+ 512. [bug] The zone transfer code could throw an exception with
an invalid IXFR stream.
511. [bug] The message code could throw an assertion on an
@@ -5157,7 +5397,7 @@
452. [bug] Warn if the unimplemented option "statistics-file"
is specified in named.conf. [RT #301]
- 451. [func] Update forwarding implememted.
+ 451. [func] Update forwarding implemented.
450. [func] New function ns_client_sendraw().
@@ -5258,7 +5498,7 @@
e.g. due to corrupt zones with multiple SOA records.
[RT #279]
- 423. [bug] When responding to a recusive query, errors that occur
+ 423. [bug] When responding to a recursive query, errors that occur
after following a CNAME should cause the query to fail.
[RT #274]
@@ -5303,7 +5543,7 @@
409. [bug] If named was shut down early in the startup
process, ns_omapi_shutdown() would attempt to lock
- an unintialized mutex. [RT #262]
+ an uninitialized mutex. [RT #262]
408. [bug] stub zones could leak memory and reference counts if
all the masters were unreachable.
@@ -5370,7 +5610,7 @@
making the functions dns_zone_adddbarg()
and dns_zone_cleardbargs() unnecessary.
- 389. [bug] Attempting to send a reqeust over IPv6 using
+ 389. [bug] Attempting to send a request over IPv6 using
dns_request_create() on a system without IPv6
support caused an assertion failure [RT #235].
@@ -5427,7 +5667,7 @@
of a very large RRset could cause an assertion failure
during logging.
- 370. [bug] The error messages for rollforward failures were
+ 370. [bug] The error messages for roll-forward failures were
overly terse.
369. [func] Support new named.conf options, view and zone
@@ -5569,7 +5809,7 @@
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-stable-6@FreeBSD.ORG Sat Jan 10 04:33:33 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id DEA7A106566B;
Sat, 10 Jan 2009 04:33:33 +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 CCC9B8FC08;
Sat, 10 Jan 2009 04:33:33 +0000 (UTC)
(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0A4XXjV079661;
Sat, 10 Jan 2009 04:33:33 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0A4XXgI079660;
Sat, 10 Jan 2009 04:33:33 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200901100433.n0A4XXgI079660@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 10 Jan 2009 04:33:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r187000 - stable/6/lib/bind/isc
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2009 04:33:34 -0000
Author: dougb
Date: Sat Jan 10 04:33:33 2009
New Revision: 187000
URL: http://svn.freebsd.org/changeset/base/187000
Log:
Add the relevant object and include files for the update to 9.3.6-P1
Modified:
stable/6/lib/bind/isc/Makefile
Modified: stable/6/lib/bind/isc/Makefile
==============================================================================
--- stable/6/lib/bind/isc/Makefile Sat Jan 10 04:30:27 2009 (r186999)
+++ stable/6/lib/bind/isc/Makefile Sat Jan 10 04:33:33 2009 (r187000)
@@ -30,7 +30,7 @@ SRCS+= inet_pton.c \
hash.c heap.c hex.c hmacmd5.c \
lex.c lfsr.c lib.c log.c md5.c \
mem.c mutexblock.c netaddr.c netscope.c ondestroy.c \
- parseint.c print.c quota.c random.c \
+ parseint.c portset.c print.c quota.c random.c \
ratelimiter.c region.c result.c rwlock.c \
serial.c sha1.c sockaddr.c string.c strtoul.c \
symtab.c task.c taskpool.c timer.c version.c
@@ -77,6 +77,7 @@ INCS= ${SRCDIR}/include/isc/app.h \
${SRCDIR}/include/isc/ondestroy.h \
${SRCDIR}/include/isc/os.h \
${SRCDIR}/include/isc/parseint.h \
+ ${SRCDIR}/include/isc/portset.h \
${SRCDIR}/include/isc/print.h \
${SRCDIR}/include/isc/quota.h \
${SRCDIR}/include/isc/random.h \
From owner-svn-src-stable-6@FreeBSD.ORG Sat Jan 10 04:34:20 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 508961065673;
Sat, 10 Jan 2009 04:34:20 +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 3D2BB8FC1D;
Sat, 10 Jan 2009 04:34:20 +0000 (UTC)
(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0A4YKto079715;
Sat, 10 Jan 2009 04:34:20 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0A4YJYQ079711;
Sat, 10 Jan 2009 04:34:19 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200901100434.n0A4YJYQ079711@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 10 Jan 2009 04:34:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r187001 - in stable/6/lib/bind: . bind isc/isc
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2009 04:34:21 -0000
Author: dougb
Date: Sat Jan 10 04:34:19 2009
New Revision: 187001
URL: http://svn.freebsd.org/changeset/base/187001
Log:
Substantive updates to generated files for 9.3.6-P1
Modified:
stable/6/lib/bind/bind/config.h
stable/6/lib/bind/bind/port_after.h
stable/6/lib/bind/config.h
stable/6/lib/bind/isc/isc/platform.h
Modified: stable/6/lib/bind/bind/config.h
==============================================================================
--- stable/6/lib/bind/bind/config.h Sat Jan 10 04:33:33 2009 (r187000)
+++ stable/6/lib/bind/bind/config.h Sat Jan 10 04:34:19 2009 (r187001)
@@ -1,6 +1,6 @@
/* $FreeBSD$ */
-/* config.h. Generated by configure. */
+/* config.h. Generated from config.h.in by configure. */
/* #undef _SOCKADDR_LEN */
#define HAVE_FCNTL_H 1
#define HAVE_PATHS_H 1
@@ -8,6 +8,7 @@
/* #undef HAVE_STROPTS_H */
#define HAVE_SYS_TIMERS_H 1
#define HAVE_SYS_SELECT_H 1
+#define HAVE_MEMORY_H 1
/* #undef SYS_CDEFS_H */
/* #undef _POSIX_PTHREAD_SEMANTICS */
/* #undef POSIX_GETPWUID_R */
@@ -16,14 +17,19 @@
/* #undef POSIX_GETGRNAM_R */
#define HAVE_MEMMOVE 1
#define HAVE_MEMCHR 1
+/* #undef SPRINTF_CHAR */
+/* #undef VSPRINTF_CHAR */
+#define USE_SYSERROR_LIST 1
+/* #undef NEED_STRTOUL */
+/* #undef NEED_SUN4PROTOS */
/* #undef NEED_SETGROUPENT */
/* #undef NEED_GETGROUPLIST */
/* define if prototype for getgrnam_r() is required */
-/* #undef NEED_GETGRNAM_R */
-/* #undef NEED_GETGRGID_R */
-/* #undef NEED_GETGRENT_R */
+/* #undef NEED_GETGRNAM_R */
+/* #undef NEED_GETGRGID_R */
+/* #undef NEED_GETGRENT_R */
#define NEED_SETGRENT_R 1
#define NEED_ENDGRENT_R 1
@@ -43,9 +49,10 @@
#define HAS_PW_CLASS 1
+/* #undef ssize_t */
/* #undef uintptr_t */
-/* Shut up warnings about sputaux in stdio.h on BSD/OS pre-4.1 */
+/* Shut up warnings about sputaux in stdio.h on BSD/OS pre-4.1 */
/* #undef SHUTUP_SPUTAUX */
#ifdef SHUTUP_SPUTAUX
struct __sFILE;
Modified: stable/6/lib/bind/bind/port_after.h
==============================================================================
--- stable/6/lib/bind/bind/port_after.h Sat Jan 10 04:33:33 2009 (r187000)
+++ stable/6/lib/bind/bind/port_after.h Sat Jan 10 04:34:19 2009 (r187001)
@@ -24,6 +24,10 @@
#undef NEED_DAEMON
#undef NEED_STRSEP
#undef NEED_STRERROR
+#ifdef NEED_STRERROR
+const char *isc_strerror(int);
+#define strerror isc_strerror
+#endif
#define HAS_INET6_STRUCTS 1
#define HAVE_SIN6_SCOPE_ID 1
#undef NEED_IN6ADDR_ANY
@@ -32,7 +36,6 @@
#undef NEED_GETTIMEOFDAY
#undef HAVE_STRNDUP
#undef USE_FIONBIO_IOCTL
-#undef USE_SYSERROR_LIST
#undef INNETGR_ARGS
#undef SETNETGRENT_ARGS
#define USE_IFNAMELINKID 1
@@ -421,4 +424,80 @@ setnetgrent_r(const char *netgroup, NGR_
NGR_R_SET_RETURN
setnetgrent_r(const char *netgroup);
#endif
+
+#ifdef NEED_STRTOUL
+unsigned long strtoul(const char *, char **, int);
+#endif
+
+#ifdef NEED_SUN4PROTOS
+#include <stdarg.h>
+#ifndef __SIZE_TYPE__
+#define __SIZE_TYPE__ int
+#endif
+struct sockaddr;
+struct iovec;
+struct timeval;
+struct timezone;
+int fprintf(FILE *, const char *, ...);
+int getsockname(int, struct sockaddr *, int *);
+int getpeername(int, struct sockaddr *, int *);
+int socket(int, int, int);
+int connect(int, const struct sockaddr *, int);
+int writev(int, struct iovec *, int);
+int readv(int, struct iovec *, int);
+int send(int, const char *, int, int);
+void bzero(char *, int);
+int recvfrom(int, char *, int, int, struct sockaddr *, int *);
+int syslog(int, const char *, ... );
+int printf(const char *, ...);
+__SIZE_TYPE__ fread(void *, __SIZE_TYPE__, __SIZE_TYPE__, FILE *);
+__SIZE_TYPE__ fwrite(const void *, __SIZE_TYPE__, __SIZE_TYPE__, FILE *);
+int fclose(FILE *);
+int ungetc(int, FILE *);
+int scanf(const char *, ...);
+int sscanf(const char *, const char *, ... );
+int tolower(int);
+int toupper(int);
+int strcasecmp(const char *, const char *);
+int strncasecmp(const char *, const char *, int);
+int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+#ifdef gettimeofday
+#undef gettimeofday
+int gettimeofday(struct timeval *, struct timezone *);
+#define gettimeofday isc__gettimeofday
+#else
+int gettimeofday(struct timeval *, struct timezone *);
+#endif
+long strtol(const char*, char **, int);
+int fseek(FILE *, long, int);
+int setsockopt(int, int, int, const char *, int);
+int bind(int, const struct sockaddr *, int);
+void bcopy(char *, char *, int);
+int fputc(char, FILE *);
+int listen(int, int);
+int accept(int, struct sockaddr *, int *);
+int getsockopt(int, int, int, char *, int *);
+int vfprintf(FILE *, const char *, va_list);
+int fflush(FILE *);
+int fgetc(FILE *);
+int fputs(const char *, FILE *);
+int fchown(int, int, int);
+void setbuf(FILE *, char *);
+int gethostname(char *, int);
+int rename(const char *, const char *);
+time_t time(time_t *);
+int fscanf(FILE *, const char *, ...);
+int sscanf(const char *, const char *, ...);
+int ioctl(int, int, caddr_t);
+void perror(const char *);
+
+#if !defined(__USE_FIXED_PROTOTYPES__) && !defined(__cplusplus) && !defined(__STRICT_ANSI__)
+/*
+ * 'gcc -ansi' changes the prototype for vsprintf().
+ * Use this prototype when 'gcc -ansi' is not in effect.
+ */
+char *vsprintf(char *, const char *, va_list);
+#endif
+#endif
+
#endif
Modified: stable/6/lib/bind/config.h
==============================================================================
--- stable/6/lib/bind/config.h Sat Jan 10 04:33:33 2009 (r187000)
+++ stable/6/lib/bind/config.h Sat Jan 10 04:34:19 2009 (r187001)
@@ -156,6 +156,12 @@ int sigwait(const unsigned int *set, int
/* Define if you cannot bind() before connect() for TCP sockets. */
/* #undef BROKEN_TCP_BIND_BEFORE_CONNECT */
+/* Solaris hack to get select_large_fdset. */
+/* #undef FD_SETSIZE */
+
+/* Define to 1 if you have the `capset' function. */
+/* #undef HAVE_CAPSET */
+
/* Define to 1 if you have the <dlfcn.h> header file. */
/* #undef HAVE_DLFCN_H */
@@ -207,6 +213,15 @@ int sigwait(const unsigned int *set, int
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
+/* Define to 1 if you have the <sys/capability.h> header file. */
+/* #undef HAVE_SYS_CAPABILITY_H */
+
+/* Define to 1 if you have the <sys/devpoll.h> header file. */
+/* #undef HAVE_SYS_DEVPOLL_H */
+
+/* Define to 1 if you have the <sys/dyntune.h> header file. */
+/* #undef HAVE_SYS_DYNTUNE_H */
+
/* Define to 1 if you have the <sys/param.h> header file. */
#define HAVE_SYS_PARAM_H 1
@@ -283,7 +298,7 @@ int sigwait(const unsigned int *set, int
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
-#define inline
+/* #undef inline */
#endif
/* Define to `unsigned int' if <sys/types.h> does not define. */
Modified: stable/6/lib/bind/isc/isc/platform.h
==============================================================================
--- stable/6/lib/bind/isc/isc/platform.h Sat Jan 10 04:33:33 2009 (r187000)
+++ stable/6/lib/bind/isc/isc/platform.h Sat Jan 10 04:34:19 2009 (r187001)
@@ -1,7 +1,7 @@
/* $FreeBSD$ */
/*
- * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: platform.h.in,v 1.24.2.1.10.13 2007/09/13 23:45:58 tbox Exp $ */
+/* $Id: platform.h.in,v 1.24.2.1.10.15 2008/06/25 23:45:37 tbox Exp $ */
#ifndef ISC_PLATFORM_H
#define ISC_PLATFORM_H 1
@@ -144,6 +144,21 @@
*** Printing.
***/
+/*! \brief
+ * Define if the system supports kqueue multiplexing
+ */
+#define ISC_PLATFORM_HAVEKQUEUE 1
+
+/*! \brief
+ * Define if the system supports epoll multiplexing
+ */
+#undef ISC_PLATFORM_HAVEEPOLL
+
+/*! \brief
+ * Define if the system supports /dev/poll multiplexing
+ */
+#undef ISC_PLATFORM_HAVEDEVPOLL
+
/*
* If this system needs vsnprintf() and snprintf(), ISC_PLATFORM_NEEDVSNPRINTF
* will be defined.
From owner-svn-src-stable-6@FreeBSD.ORG Sat Jan 10 04:35:13 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 015B91065674;
Sat, 10 Jan 2009 04:35:13 +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 E36AE8FC14;
Sat, 10 Jan 2009 04:35:12 +0000 (UTC)
(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0A4ZC6Z079773;
Sat, 10 Jan 2009 04:35:12 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0A4ZCLr079772;
Sat, 10 Jan 2009 04:35:12 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200901100435.n0A4ZCLr079772@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 10 Jan 2009 04:35:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r187002 - stable/6/usr.bin/nsupdate
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2009 04:35:14 -0000
Author: dougb
Date: Sat Jan 10 04:35:12 2009
New Revision: 187002
URL: http://svn.freebsd.org/changeset/base/187002
Log:
In 9.3.6-P1 the man page has moved to section 1
Modified:
stable/6/usr.bin/nsupdate/Makefile
Modified: stable/6/usr.bin/nsupdate/Makefile
==============================================================================
--- stable/6/usr.bin/nsupdate/Makefile Sat Jan 10 04:34:19 2009 (r187001)
+++ stable/6/usr.bin/nsupdate/Makefile Sat Jan 10 04:35:12 2009 (r187002)
@@ -17,7 +17,7 @@ CFLAGS+= -I${SRCDIR}/include
DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD}
LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD}
-MAN= nsupdate.8
+MAN= nsupdate.1
MANFILTER= sed -e "s@/etc/named\.conf@/etc/namedb/named.conf@g" \
-e "s@^\.HP [0-9]* @@"
From owner-svn-src-stable-6@FreeBSD.ORG Sat Jan 10 16:57:23 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 2F85C1065677;
Sat, 10 Jan 2009 16:57:23 +0000 (UTC)
(envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 1B5C88FC12;
Sat, 10 Jan 2009 16:57:23 +0000 (UTC)
(envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0AGvMmx003743;
Sat, 10 Jan 2009 16:57:22 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0AGvMMk003741;
Sat, 10 Jan 2009 16:57:22 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <200901101657.n0AGvMMk003741@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 10 Jan 2009 16:57:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r187026 - in stable/6: contrib/telnet
contrib/telnet/arpa include include/arpa
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2009 16:57:23 -0000
Author: antoine
Date: Sat Jan 10 16:57:22 2009
New Revision: 187026
URL: http://svn.freebsd.org/changeset/base/187026
Log:
MFC r183004 to stable/6:
Fix TELOPT(opt) when opt > TELOPT_TN3270E.
PR: 127194
Submitted by: Joost Bekkers
MFC after: 1 month
Modified:
stable/6/contrib/telnet/ (props changed)
stable/6/contrib/telnet/arpa/telnet.h
stable/6/include/ (props changed)
stable/6/include/arpa/telnet.h
Modified: stable/6/contrib/telnet/arpa/telnet.h
==============================================================================
--- stable/6/contrib/telnet/arpa/telnet.h Sat Jan 10 16:42:13 2009 (r187025)
+++ stable/6/contrib/telnet/arpa/telnet.h Sat Jan 10 16:57:22 2009 (r187026)
@@ -140,8 +140,8 @@ const char *telopts[NTELOPTS+1] = {
"TACACS UID", "OUTPUT MARKING", "TTYLOC",
"3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW",
"LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION",
- "ENCRYPT", "NEW-ENVIRON", "TN3270E", "CHARSET", "COM-PORT",
- "KERMIT",
+ "ENCRYPT", "NEW-ENVIRON", "TN3270E", "XAUTH", "CHARSET",
+ "RSP", "COM-PORT", "SLE", "STARTTLS", "KERMIT",
0
};
#define TELOPT_FIRST TELOPT_BINARY
Modified: stable/6/include/arpa/telnet.h
==============================================================================
--- stable/6/include/arpa/telnet.h Sat Jan 10 16:42:13 2009 (r187025)
+++ stable/6/include/arpa/telnet.h Sat Jan 10 16:57:22 2009 (r187026)
@@ -140,8 +140,8 @@ const char *telopts[NTELOPTS+1] = {
"TACACS UID", "OUTPUT MARKING", "TTYLOC",
"3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW",
"LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION",
- "ENCRYPT", "NEW-ENVIRON", "TN3270E", "CHARSET", "COM-PORT",
- "KERMIT",
+ "ENCRYPT", "NEW-ENVIRON", "TN3270E", "XAUTH", "CHARSET",
+ "RSP", "COM-PORT", "SLE", "STARTTLS", "KERMIT",
0
};
#define TELOPT_FIRST TELOPT_BINARY
From owner-svn-src-stable-6@FreeBSD.ORG Sat Jan 10 19:03:35 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id D41F7106567C;
Sat, 10 Jan 2009 19:03:35 +0000 (UTC)
(envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id C14798FC14;
Sat, 10 Jan 2009 19:03:35 +0000 (UTC)
(envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0AJ3Zch006411;
Sat, 10 Jan 2009 19:03:35 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0AJ3ZGS006410;
Sat, 10 Jan 2009 19:03:35 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <200901101903.n0AJ3ZGS006410@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 10 Jan 2009 19:03:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r187033 - in stable/6/etc: . periodic/security
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>,
<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2009 19:03:36 -0000
Author: antoine
Date: Sat Jan 10 19:03:35 2009
New Revision: 187033
URL: http://svn.freebsd.org/changeset/base/187033
Log:
MFC r181531 to stable/6:
Improve periodic/security/550.ipfwlimit a bit:
- don't run it if net.inet.ip.fw.verbose = 0 as it is pointless
- handle rules without logging limit correctly [1]
(those rules show up without logamount in "ipfw -a list")
PR: conf/126060 [1]
MFC after: 1 month
Modified:
stable/6/etc/ (props changed)
stable/6/etc/periodic/security/550.ipfwlimit
Modified: stable/6/etc/periodic/security/550.ipfwlimit
==============================================================================
--- stable/6/etc/periodic/security/550.ipfwlimit Sat Jan 10 19:01:29 2009 (r187032)
+++ stable/6/etc/periodic/security/550.ipfwlimit Sat Jan 10 19:03:35 2009 (r187033)
@@ -42,19 +42,16 @@ rc=0
case "$daily_status_security_ipfwlimit_enable" in
[Yy][Ee][Ss])
- IPFW_LOG_LIMIT=`sysctl -n net.inet.ip.fw.verbose_limit 2> /dev/null`
- if [ $? -ne 0 ]; then
+ IPFW_VERBOSE=`sysctl -n net.inet.ip.fw.verbose 2> /dev/null`
+ if [ $? -ne 0 ] || [ "$IPFW_VERBOSE" -eq 0 ]; then
exit 0
fi
TMP=`mktemp -t security`
ipfw -a list | grep " log " | \
grep '^[[:digit:]]\+[[:space:]]\+[[:digit:]]\+' | \
- awk -v limit="$IPFW_LOG_LIMIT" \
+ awk \
'{if ($6 == "logamount") {
if ($2 > $7)
- {print $0}
- } else {
- if ($2 > limit)
{print $0}}
}' > ${TMP}