From owner-svn-src-stable-7@FreeBSD.ORG Tue May 24 16:06:26 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D28A9106568B; Tue, 24 May 2011 16:06:26 +0000 (UTC) (envelope-from mdf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C18DE8FC1B; Tue, 24 May 2011 16:06:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4OG6QKH076565; Tue, 24 May 2011 16:06:26 GMT (envelope-from mdf@svn.freebsd.org) Received: (from mdf@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4OG6Qxt076561; Tue, 24 May 2011 16:06:26 GMT (envelope-from mdf@svn.freebsd.org) Message-Id: <201105241606.p4OG6Qxt076561@svn.freebsd.org> From: Matthew D Fleming Date: Tue, 24 May 2011 16:06:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222262 - in stable/7: share/man/man3 sys/sys X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 May 2011 16:06:26 -0000 Author: mdf Date: Tue May 24 16:06:26 2011 New Revision: 222262 URL: http://svn.freebsd.org/changeset/base/222262 Log: MFC r221843: Note that the _SWAP operation is supported for all list/queue types. Also place STAILQ_REMOVE_HEAD in alphabetical order. Lastly, document the _SWAP macros. PR: kern/143033 Modified: stable/7/share/man/man3/Makefile stable/7/share/man/man3/queue.3 stable/7/sys/sys/queue.h Directory Properties: stable/7/share/man/man3/ (props changed) stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/share/man/man3/Makefile ============================================================================== --- stable/7/share/man/man3/Makefile Tue May 24 16:04:35 2011 (r222261) +++ stable/7/share/man/man3/Makefile Tue May 24 16:06:26 2011 (r222262) @@ -50,6 +50,7 @@ MLINKS+= queue.3 LIST_EMPTY.3 \ queue.3 LIST_INSERT_HEAD.3 \ queue.3 LIST_NEXT.3 \ queue.3 LIST_REMOVE.3 \ + queue.3 LIST_SWAP.3 \ queue.3 SLIST_EMPTY.3 \ queue.3 SLIST_ENTRY.3 \ queue.3 SLIST_FIRST.3 \ @@ -64,6 +65,7 @@ MLINKS+= queue.3 LIST_EMPTY.3 \ queue.3 SLIST_REMOVE.3 \ queue.3 SLIST_REMOVE_AFTER.3 \ queue.3 SLIST_REMOVE_HEAD.3 \ + queue.3 SLIST_SWAP.3 \ queue.3 STAILQ_CONCAT.3 \ queue.3 STAILQ_EMPTY.3 \ queue.3 STAILQ_ENTRY.3 \ @@ -81,6 +83,7 @@ MLINKS+= queue.3 LIST_EMPTY.3 \ queue.3 STAILQ_REMOVE.3 \ queue.3 STAILQ_REMOVE_AFTER.3 \ queue.3 STAILQ_REMOVE_HEAD.3 \ + queue.3 STAILQ_SWAP.3 \ queue.3 TAILQ_CONCAT.3 \ queue.3 TAILQ_EMPTY.3 \ queue.3 TAILQ_ENTRY.3 \ @@ -99,7 +102,8 @@ MLINKS+= queue.3 LIST_EMPTY.3 \ queue.3 TAILQ_LAST.3 \ queue.3 TAILQ_NEXT.3 \ queue.3 TAILQ_PREV.3 \ - queue.3 TAILQ_REMOVE.3 + queue.3 TAILQ_REMOVE.3 \ + queue.3 TAILQ_SWAP.3 MLINKS+= stdarg.3 va_arg.3 \ stdarg.3 va_copy.3 \ stdarg.3 va_end.3 \ Modified: stable/7/share/man/man3/queue.3 ============================================================================== --- stable/7/share/man/man3/queue.3 Tue May 24 16:04:35 2011 (r222261) +++ stable/7/share/man/man3/queue.3 Tue May 24 16:06:26 2011 (r222262) @@ -32,7 +32,7 @@ .\" @(#)queue.3 8.2 (Berkeley) 1/24/94 .\" $FreeBSD$ .\" -.Dd March 24, 2006 +.Dd May 13, 2011 .Dt QUEUE 3 .Os .Sh NAME @@ -50,6 +50,7 @@ .Nm SLIST_REMOVE_AFTER , .Nm SLIST_REMOVE_HEAD , .Nm SLIST_REMOVE , +.Nm SLIST_SWAP , .Nm STAILQ_CONCAT , .Nm STAILQ_EMPTY , .Nm STAILQ_ENTRY , @@ -67,6 +68,7 @@ .Nm STAILQ_REMOVE_AFTER , .Nm STAILQ_REMOVE_HEAD , .Nm STAILQ_REMOVE , +.Nm STAILQ_SWAP , .Nm LIST_EMPTY , .Nm LIST_ENTRY , .Nm LIST_FIRST , @@ -80,6 +82,7 @@ .Nm LIST_INSERT_HEAD , .Nm LIST_NEXT , .Nm LIST_REMOVE , +.Nm LIST_SWAP , .Nm TAILQ_CONCAT , .Nm TAILQ_EMPTY , .Nm TAILQ_ENTRY , @@ -98,7 +101,8 @@ .Nm TAILQ_LAST , .Nm TAILQ_NEXT , .Nm TAILQ_PREV , -.Nm TAILQ_REMOVE +.Nm TAILQ_REMOVE , +.Nm TAILQ_SWAP .Nd implementations of singly-linked lists, singly-linked tail queues, lists and tail queues .Sh SYNOPSIS @@ -118,6 +122,7 @@ lists and tail queues .Fn SLIST_REMOVE_AFTER "TYPE *elm" "SLIST_ENTRY NAME" .Fn SLIST_REMOVE_HEAD "SLIST_HEAD *head" "SLIST_ENTRY NAME" .Fn SLIST_REMOVE "SLIST_HEAD *head" "TYPE *elm" "TYPE" "SLIST_ENTRY NAME" +.Fn SLIST_SWAP "SLIST_HEAD *head1" "SLIST_HEAD *head2" "SLIST_ENTRY NAME" .\" .Fn STAILQ_CONCAT "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" .Fn STAILQ_EMPTY "STAILQ_HEAD *head" @@ -136,6 +141,7 @@ lists and tail queues .Fn STAILQ_REMOVE_AFTER "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" .Fn STAILQ_REMOVE "STAILQ_HEAD *head" "TYPE *elm" "TYPE" "STAILQ_ENTRY NAME" +.Fn STAILQ_SWAP "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" "STAILQ_ENTRY NAME" .\" .Fn LIST_EMPTY "LIST_HEAD *head" .Fn LIST_ENTRY "TYPE" @@ -150,6 +156,7 @@ lists and tail queues .Fn LIST_INSERT_HEAD "LIST_HEAD *head" "TYPE *elm" "LIST_ENTRY NAME" .Fn LIST_NEXT "TYPE *elm" "LIST_ENTRY NAME" .Fn LIST_REMOVE "TYPE *elm" "LIST_ENTRY NAME" +.Fn LIST_SWAP "LIST_HEAD *head1" "LIST_HEAD *head2" "TYPE" "LIST_ENTRY NAME" .\" .Fn TAILQ_CONCAT "TAILQ_HEAD *head1" "TAILQ_HEAD *head2" "TAILQ_ENTRY NAME" .Fn TAILQ_EMPTY "TAILQ_HEAD *head" @@ -170,6 +177,7 @@ lists and tail queues .Fn TAILQ_NEXT "TYPE *elm" "TAILQ_ENTRY NAME" .Fn TAILQ_PREV "TYPE *elm" "HEADNAME" "TAILQ_ENTRY NAME" .Fn TAILQ_REMOVE "TAILQ_HEAD *head" "TYPE *elm" "TAILQ_ENTRY NAME" +.Fn TAILQ_SWAP "TAILQ_HEAD *head1" "TAILQ_HEAD *head2" "TYPE" "TAILQ_ENTRY NAME" .\" .Sh DESCRIPTION These macros define and operate on four types of data structures: @@ -184,6 +192,8 @@ Insertion of a new entry after any eleme O(1) removal of an entry from the head of the list. .It Forward traversal through the list. +.It +Swawpping the contents of two lists. .El .Pp Singly-linked lists are the simplest of the four data structures @@ -402,6 +412,13 @@ The macro removes the element .Fa elm from the list. +.Pp +The macro +.Nm SLIST_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . .Sh SINGLY-LINKED LIST EXAMPLE .Bd -literal SLIST_HEAD(slisthead, entry) head = @@ -584,6 +601,13 @@ The macro removes the element .Fa elm from the tail queue. +.Pp +The macro +.Nm STAILQ_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . .Sh SINGLY-LINKED TAIL QUEUE EXAMPLE .Bd -literal STAILQ_HEAD(stailhead, entry) head = @@ -743,6 +767,13 @@ The macro removes the element .Fa elm from the list. +.Pp +The macro +.Nm LIST_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . .Sh LIST EXAMPLE .Bd -literal LIST_HEAD(listhead, entry) head = @@ -942,6 +973,13 @@ The macro removes the element .Fa elm from the tail queue. +.Pp +The macro +.Nm TAILQ_SWAP +swaps the contents of +.Fa head1 +and +.Fa head2 . .Sh TAIL QUEUE EXAMPLE .Bd -literal TAILQ_HEAD(tailhead, entry) head = Modified: stable/7/sys/sys/queue.h ============================================================================== --- stable/7/sys/sys/queue.h Tue May 24 16:04:35 2011 (r222261) +++ stable/7/sys/sys/queue.h Tue May 24 16:06:26 2011 (r222262) @@ -99,6 +99,7 @@ * _REMOVE_AFTER + - + - * _REMOVE_HEAD + - + - * _REMOVE + + + + + * _SWAP + + + + * */ #ifdef QUEUE_MACRO_DEBUG @@ -301,18 +302,18 @@ struct { \ TRASHIT(*oldnext); \ } while (0) -#define STAILQ_REMOVE_HEAD(head, field) do { \ - if ((STAILQ_FIRST((head)) = \ - STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL) \ - (head)->stqh_last = &STAILQ_FIRST((head)); \ -} while (0) - #define STAILQ_REMOVE_AFTER(head, elm, field) do { \ if ((STAILQ_NEXT(elm, field) = \ STAILQ_NEXT(STAILQ_NEXT(elm, field), field)) == NULL) \ (head)->stqh_last = &STAILQ_NEXT((elm), field); \ } while (0) +#define STAILQ_REMOVE_HEAD(head, field) do { \ + if ((STAILQ_FIRST((head)) = \ + STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL) \ + (head)->stqh_last = &STAILQ_FIRST((head)); \ +} while (0) + #define STAILQ_SWAP(head1, head2, type) do { \ struct type *swap_first = STAILQ_FIRST(head1); \ struct type **swap_last = (head1)->stqh_last; \ From owner-svn-src-stable-7@FreeBSD.ORG Tue May 24 21:15:13 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E314106564A; Tue, 24 May 2011 21:15:13 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7D6468FC14; Tue, 24 May 2011 21:15:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4OLFDf5085984; Tue, 24 May 2011 21:15:13 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4OLFDCY085982; Tue, 24 May 2011 21:15:13 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201105242115.p4OLFDCY085982@svn.freebsd.org> From: Jilles Tjoelker Date: Tue, 24 May 2011 21:15:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222271 - stable/7/lib/libc/sys X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 May 2011 21:15:13 -0000 Author: jilles Date: Tue May 24 21:15:13 2011 New Revision: 222271 URL: http://svn.freebsd.org/changeset/base/222271 Log: MFC r222037: mq_setattr(2): Add missing const to man page. The declaration in the header file is correct. Modified: stable/7/lib/libc/sys/mq_setattr.2 Directory Properties: stable/7/lib/libc/ (props changed) stable/7/lib/libc/stdtime/ (props changed) Modified: stable/7/lib/libc/sys/mq_setattr.2 ============================================================================== --- stable/7/lib/libc/sys/mq_setattr.2 Tue May 24 21:12:52 2011 (r222270) +++ stable/7/lib/libc/sys/mq_setattr.2 Tue May 24 21:15:13 2011 (r222271) @@ -37,7 +37,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 29, 2005 +.Dd May 17, 2011 .Dt MQ_SETATTR 2 .Os .Sh NAME @@ -50,7 +50,7 @@ .Ft int .Fo mq_setattr .Fa "mqd_t mqdes" -.Fa "struct mq_attr *restrict mqstat" +.Fa "const struct mq_attr *restrict mqstat" .Fa "struct mq_attr *restrict omqstat" .Fc .Sh DESCRIPTION From owner-svn-src-stable-7@FreeBSD.ORG Thu May 26 00:09:57 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A332106566C; Thu, 26 May 2011 00:09:57 +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 48F348FC0A; Thu, 26 May 2011 00:09:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4Q09v3A036021; Thu, 26 May 2011 00:09:57 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4Q09vrf036019; Thu, 26 May 2011 00:09:57 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201105260009.p4Q09vrf036019@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 26 May 2011 00:09:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222296 - stable/7/sys/kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 May 2011 00:09:57 -0000 Author: kib Date: Thu May 26 00:09:56 2011 New Revision: 222296 URL: http://svn.freebsd.org/changeset/base/222296 Log: MFC r222086: The protection against the race with dev_rel(), introduced in r163328, should be extended to cover destroy_devl() calls for the children of the destroyed dev. Requested and tested by: Oliver Pinter Modified: stable/7/sys/kern/kern_conf.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/kern/kern_conf.c ============================================================================== --- stable/7/sys/kern/kern_conf.c Wed May 25 23:33:49 2011 (r222295) +++ stable/7/sys/kern/kern_conf.c Thu May 26 00:09:56 2011 (r222296) @@ -874,6 +874,8 @@ destroy_devl(struct cdev *dev) /* Remove name marking */ dev->si_flags &= ~SI_NAMED; + dev->si_refcount++; /* Avoid race with dev_rel() */ + /* If we are a child, remove us from the parents list */ if (dev->si_flags & SI_CHILD) { LIST_REMOVE(dev, si_siblings); @@ -890,7 +892,6 @@ destroy_devl(struct cdev *dev) dev->si_flags &= ~SI_CLONELIST; } - dev->si_refcount++; /* Avoid race with dev_rel() */ csw = dev->si_devsw; dev->si_devsw = NULL; /* already NULL for SI_ALIAS */ while (csw != NULL && csw->d_purge != NULL && dev->si_threadcount) { From owner-svn-src-stable-7@FreeBSD.ORG Thu May 26 15:38:11 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 864CC106566C; Thu, 26 May 2011 15:38:11 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5D9698FC17; Thu, 26 May 2011 15:38:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4QFcBM4070448; Thu, 26 May 2011 15:38:11 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4QFcBU4070444; Thu, 26 May 2011 15:38:11 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201105261538.p4QFcBU4070444@svn.freebsd.org> From: Jaakko Heinonen Date: Thu, 26 May 2011 15:38:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222311 - stable/7/sys/fs/devfs X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 May 2011 15:38:11 -0000 Author: jh Date: Thu May 26 15:38:11 2011 New Revision: 222311 URL: http://svn.freebsd.org/changeset/base/222311 Log: MFC r216461: - Assert that dm_lock is exclusively held in devfs_rules_apply() and in devfs_vmkdir() while adding the entry to de_list of the parent. - Apply devfs rules to newly created directories and symbolic links. PR: kern/125034 Modified: stable/7/sys/fs/devfs/devfs_devs.c stable/7/sys/fs/devfs/devfs_rule.c stable/7/sys/fs/devfs/devfs_vnops.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/fs/devfs/devfs_devs.c ============================================================================== --- stable/7/sys/fs/devfs/devfs_devs.c Thu May 26 15:01:37 2011 (r222310) +++ stable/7/sys/fs/devfs/devfs_devs.c Thu May 26 15:38:11 2011 (r222311) @@ -222,8 +222,10 @@ devfs_vmkdir(struct devfs_mount *dmp, ch de->de_dir = dd; } else { de->de_dir = dotdot; + sx_assert(&dmp->dm_lock, SX_XLOCKED); TAILQ_INSERT_TAIL(&dotdot->de_dlist, dd, de_list); dotdot->de_links++; + devfs_rules_apply(dmp, dd); } #ifdef MAC Modified: stable/7/sys/fs/devfs/devfs_rule.c ============================================================================== --- stable/7/sys/fs/devfs/devfs_rule.c Thu May 26 15:01:37 2011 (r222310) +++ stable/7/sys/fs/devfs/devfs_rule.c Thu May 26 15:38:11 2011 (r222311) @@ -139,6 +139,8 @@ devfs_rules_apply(struct devfs_mount *dm { struct devfs_ruleset *ds; + sx_assert(&dm->dm_lock, SX_XLOCKED); + if (dm->dm_ruleset == 0) return; sx_slock(&sx_rules); Modified: stable/7/sys/fs/devfs/devfs_vnops.c ============================================================================== --- stable/7/sys/fs/devfs/devfs_vnops.c Thu May 26 15:01:37 2011 (r222310) +++ stable/7/sys/fs/devfs/devfs_vnops.c Thu May 26 15:38:11 2011 (r222311) @@ -1418,6 +1418,7 @@ devfs_symlink(struct vop_symlink_args *a mac_create_devfs_symlink(ap->a_cnp->cn_cred, dmp->dm_mount, dd, de); #endif TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list); + devfs_rules_apply(dmp, de); return (devfs_allocv(de, ap->a_dvp->v_mount, ap->a_vpp, td)); } From owner-svn-src-stable-7@FreeBSD.ORG Fri May 27 09:56:23 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C21A41065672; Fri, 27 May 2011 09:56:23 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B10AE8FC1C; Fri, 27 May 2011 09:56:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4R9uNl6015874; Fri, 27 May 2011 09:56:23 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4R9uNaI015872; Fri, 27 May 2011 09:56:23 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201105270956.p4R9uNaI015872@svn.freebsd.org> From: Sergey Kandaurov Date: Fri, 27 May 2011 09:56:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222351 - stable/7/usr.bin/top X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2011 09:56:23 -0000 Author: pluknet Date: Fri May 27 09:56:23 2011 New Revision: 222351 URL: http://svn.freebsd.org/changeset/base/222351 Log: MFC r222136: Add missing header file. Modified: stable/7/usr.bin/top/machine.c Directory Properties: stable/7/usr.bin/top/ (props changed) Modified: stable/7/usr.bin/top/machine.c ============================================================================== --- stable/7/usr.bin/top/machine.c Fri May 27 09:55:18 2011 (r222350) +++ stable/7/usr.bin/top/machine.c Fri May 27 09:56:23 2011 (r222351) @@ -35,6 +35,7 @@ #include #include +#include #include #include #include From owner-svn-src-stable-7@FreeBSD.ORG Fri May 27 18:40:31 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB91F1065692; Fri, 27 May 2011 18:40:31 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 814BD8FC4D; Fri, 27 May 2011 18:40:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4RIeV3K047329; Fri, 27 May 2011 18:40:31 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4RIeVHw047327; Fri, 27 May 2011 18:40:31 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201105271840.p4RIeVHw047327@svn.freebsd.org> From: Pyun YongHyeon Date: Fri, 27 May 2011 18:40:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222368 - stable/7/sys/dev/vge X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2011 18:40:31 -0000 Author: yongari Date: Fri May 27 18:40:31 2011 New Revision: 222368 URL: http://svn.freebsd.org/changeset/base/222368 Log: MFC r222142: Datasheet says vge(4) controllers support DAC but it seems that's not true on old PCI based controllers. DAC configuration is read from EEPROM in device reset phase and driver can override DAC configuration. However I guess there is an undocumented reason why EEPROM configuration does not enable DAC so do not blindly override DAC configuration. Recent PCIe based controllers are supposed to support 64bit DMA so allow 64bit DMA only on PCIe based controllers. PR: kern/157184 Modified: stable/7/sys/dev/vge/if_vge.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/vge/if_vge.c ============================================================================== --- stable/7/sys/dev/vge/if_vge.c Fri May 27 18:39:18 2011 (r222367) +++ stable/7/sys/dev/vge/if_vge.c Fri May 27 18:40:31 2011 (r222368) @@ -688,7 +688,18 @@ vge_dma_alloc(struct vge_softc *sc) bus_addr_t lowaddr, tx_ring_end, rx_ring_end; int error, i; - lowaddr = BUS_SPACE_MAXADDR; + /* + * It seems old PCI controllers do not support DAC. DAC + * configuration can be enabled by accessing VGE_CHIPCFG3 + * register but honor EEPROM configuration instead of + * blindly overriding DAC configuration. PCIe based + * controllers are supposed to support 64bit DMA so enable + * 64bit DMA on these controllers. + */ + if ((sc->vge_flags & VGE_FLAG_PCIE) != 0) + lowaddr = BUS_SPACE_MAXADDR; + else + lowaddr = BUS_SPACE_MAXADDR_32BIT; again: /* Create parent ring tag. */ @@ -805,10 +816,14 @@ again: goto again; } + if ((sc->vge_flags & VGE_FLAG_PCIE) != 0) + lowaddr = VGE_BUF_DMA_MAXADDR; + else + lowaddr = BUS_SPACE_MAXADDR_32BIT; /* Create parent buffer tag. */ error = bus_dma_tag_create(bus_get_dma_tag(sc->vge_dev),/* parent */ 1, 0, /* algnmnt, boundary */ - VGE_BUF_DMA_MAXADDR, /* lowaddr */ + lowaddr, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ BUS_SPACE_MAXSIZE_32BIT, /* maxsize */ From owner-svn-src-stable-7@FreeBSD.ORG Fri May 27 18:47:48 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE87F106564A; Fri, 27 May 2011 18:47:48 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DD3AF8FC18; Fri, 27 May 2011 18:47:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4RIlmO2047720; Fri, 27 May 2011 18:47:48 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4RIlmQZ047718; Fri, 27 May 2011 18:47:48 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201105271847.p4RIlmQZ047718@svn.freebsd.org> From: Pyun YongHyeon Date: Fri, 27 May 2011 18:47:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222370 - stable/7/sys/dev/bge X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2011 18:47:49 -0000 Author: yongari Date: Fri May 27 18:47:48 2011 New Revision: 222370 URL: http://svn.freebsd.org/changeset/base/222370 Log: MFC r221712: Since r117657, bge(4) does not enable buffer manager for BCM5705 or newer controllers. However, all data sheet I have access has no indication that buffer manager should not be touched on these controllers. It seems the buffer manager always runs on BCM5705 or newer controllers. Some controller(e.g. BCM5719) needs other buffer manager configuration so driver should enable buffer manager for all controllers. Both Linux and OpenBSD/NetBSD use the same approach. This change polls enable bit of block to know whether specified block was really stopped as well as enabling buffer manager for all controllers in driver initialization. Obtained from: NetBSD Modified: stable/7/sys/dev/bge/if_bge.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/bge/if_bge.c ============================================================================== --- stable/7/sys/dev/bge/if_bge.c Fri May 27 18:46:24 2011 (r222369) +++ stable/7/sys/dev/bge/if_bge.c Fri May 27 18:47:48 2011 (r222370) @@ -403,6 +403,7 @@ static void bge_start(struct ifnet *); static int bge_ioctl(struct ifnet *, u_long, caddr_t); static void bge_init_locked(struct bge_softc *); static void bge_init(void *); +static void bge_stop_block(struct bge_softc *, bus_size_t, uint32_t); static void bge_stop(struct bge_softc *); static void bge_watchdog(struct bge_softc *); static int bge_shutdown(device_t); @@ -1593,22 +1594,19 @@ bge_blockinit(struct bge_softc *sc) CSR_WRITE_4(sc, BGE_BMAN_DMA_DESCPOOL_HIWAT, 10); /* Enable buffer manager */ - if (!(BGE_IS_5705_PLUS(sc))) { - CSR_WRITE_4(sc, BGE_BMAN_MODE, - BGE_BMANMODE_ENABLE | BGE_BMANMODE_LOMBUF_ATTN); + CSR_WRITE_4(sc, BGE_BMAN_MODE, + BGE_BMANMODE_ENABLE | BGE_BMANMODE_LOMBUF_ATTN); - /* Poll for buffer manager start indication */ - for (i = 0; i < BGE_TIMEOUT; i++) { - DELAY(10); - if (CSR_READ_4(sc, BGE_BMAN_MODE) & BGE_BMANMODE_ENABLE) - break; - } + /* Poll for buffer manager start indication */ + for (i = 0; i < BGE_TIMEOUT; i++) { + DELAY(10); + if (CSR_READ_4(sc, BGE_BMAN_MODE) & BGE_BMANMODE_ENABLE) + break; + } - if (i == BGE_TIMEOUT) { - device_printf(sc->bge_dev, - "buffer manager failed to start\n"); - return (ENXIO); - } + if (i == BGE_TIMEOUT) { + device_printf(sc->bge_dev, "buffer manager failed to start\n"); + return (ENXIO); } /* Enable flow-through queues */ @@ -5133,6 +5131,20 @@ bge_watchdog(struct bge_softc *sc) ifp->if_oerrors++; } +static void +bge_stop_block(struct bge_softc *sc, bus_size_t reg, uint32_t bit) +{ + int i; + + BGE_CLRBIT(sc, reg, bit); + + for (i = 0; i < BGE_TIMEOUT; i++) { + if ((CSR_READ_4(sc, reg) & bit) == 0) + return; + DELAY(100); + } +} + /* * Stop the adapter and free any mbufs allocated to the * RX and TX lists. @@ -5161,35 +5173,36 @@ bge_stop(struct bge_softc *sc) /* * Disable all of the receiver blocks. */ - BGE_CLRBIT(sc, BGE_RX_MODE, BGE_RXMODE_ENABLE); - BGE_CLRBIT(sc, BGE_RBDI_MODE, BGE_RBDIMODE_ENABLE); - BGE_CLRBIT(sc, BGE_RXLP_MODE, BGE_RXLPMODE_ENABLE); - if (!(BGE_IS_5705_PLUS(sc))) - BGE_CLRBIT(sc, BGE_RXLS_MODE, BGE_RXLSMODE_ENABLE); - BGE_CLRBIT(sc, BGE_RDBDI_MODE, BGE_RBDIMODE_ENABLE); - BGE_CLRBIT(sc, BGE_RDC_MODE, BGE_RDCMODE_ENABLE); - BGE_CLRBIT(sc, BGE_RBDC_MODE, BGE_RBDCMODE_ENABLE); + bge_stop_block(sc, BGE_RX_MODE, BGE_RXMODE_ENABLE); + bge_stop_block(sc, BGE_RBDI_MODE, BGE_RBDIMODE_ENABLE); + bge_stop_block(sc, BGE_RXLP_MODE, BGE_RXLPMODE_ENABLE); + if (BGE_IS_5700_FAMILY(sc)) + bge_stop_block(sc, BGE_RXLS_MODE, BGE_RXLSMODE_ENABLE); + bge_stop_block(sc, BGE_RDBDI_MODE, BGE_RBDIMODE_ENABLE); + bge_stop_block(sc, BGE_RDC_MODE, BGE_RDCMODE_ENABLE); + bge_stop_block(sc, BGE_RBDC_MODE, BGE_RBDCMODE_ENABLE); /* * Disable all of the transmit blocks. */ - BGE_CLRBIT(sc, BGE_SRS_MODE, BGE_SRSMODE_ENABLE); - BGE_CLRBIT(sc, BGE_SBDI_MODE, BGE_SBDIMODE_ENABLE); - BGE_CLRBIT(sc, BGE_SDI_MODE, BGE_SDIMODE_ENABLE); - BGE_CLRBIT(sc, BGE_RDMA_MODE, BGE_RDMAMODE_ENABLE); - BGE_CLRBIT(sc, BGE_SDC_MODE, BGE_SDCMODE_ENABLE); - if (!(BGE_IS_5705_PLUS(sc))) - BGE_CLRBIT(sc, BGE_DMAC_MODE, BGE_DMACMODE_ENABLE); - BGE_CLRBIT(sc, BGE_SBDC_MODE, BGE_SBDCMODE_ENABLE); + bge_stop_block(sc, BGE_SRS_MODE, BGE_SRSMODE_ENABLE); + bge_stop_block(sc, BGE_SBDI_MODE, BGE_SBDIMODE_ENABLE); + bge_stop_block(sc, BGE_SDI_MODE, BGE_SDIMODE_ENABLE); + bge_stop_block(sc, BGE_RDMA_MODE, BGE_RDMAMODE_ENABLE); + bge_stop_block(sc, BGE_SDC_MODE, BGE_SDCMODE_ENABLE); + if (BGE_IS_5700_FAMILY(sc)) + bge_stop_block(sc, BGE_DMAC_MODE, BGE_DMACMODE_ENABLE); + bge_stop_block(sc, BGE_SBDC_MODE, BGE_SBDCMODE_ENABLE); /* * Shut down all of the memory managers and related * state machines. */ - BGE_CLRBIT(sc, BGE_HCC_MODE, BGE_HCCMODE_ENABLE); - BGE_CLRBIT(sc, BGE_WDMA_MODE, BGE_WDMAMODE_ENABLE); - if (!(BGE_IS_5705_PLUS(sc))) - BGE_CLRBIT(sc, BGE_MBCF_MODE, BGE_MBCFMODE_ENABLE); + bge_stop_block(sc, BGE_HCC_MODE, BGE_HCCMODE_ENABLE); + bge_stop_block(sc, BGE_WDMA_MODE, BGE_WDMAMODE_ENABLE); + if (BGE_IS_5700_FAMILY(sc)) + bge_stop_block(sc, BGE_MBCF_MODE, BGE_MBCFMODE_ENABLE); + CSR_WRITE_4(sc, BGE_FTQ_RESET, 0xFFFFFFFF); CSR_WRITE_4(sc, BGE_FTQ_RESET, 0); if (!(BGE_IS_5705_PLUS(sc))) { From owner-svn-src-stable-7@FreeBSD.ORG Fri May 27 18:59:25 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 592A31065675; Fri, 27 May 2011 18:59:25 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 488708FC17; Fri, 27 May 2011 18:59:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4RIxPkT048142; Fri, 27 May 2011 18:59:25 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4RIxP4L048140; Fri, 27 May 2011 18:59:25 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201105271859.p4RIxP4L048140@svn.freebsd.org> From: Pyun YongHyeon Date: Fri, 27 May 2011 18:59:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222372 - stable/7/sys/dev/gem X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2011 18:59:25 -0000 Author: yongari Date: Fri May 27 18:59:24 2011 New Revision: 222372 URL: http://svn.freebsd.org/changeset/base/222372 Log: MFC r222135: Remove unnecessary controller reinitialization by checking IFF_DRV_RUNNING flag. Previously running dhclient or adding alias addresses reinitialized controller and it resulted in unnecessary link flips. Modified: stable/7/sys/dev/gem/if_gem.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/gem/if_gem.c ============================================================================== --- stable/7/sys/dev/gem/if_gem.c Fri May 27 18:58:08 2011 (r222371) +++ stable/7/sys/dev/gem/if_gem.c Fri May 27 18:59:24 2011 (r222372) @@ -739,8 +739,10 @@ gem_reset_rxdma(struct gem_softc *sc) { int i; - if (gem_reset_rx(sc) != 0) + if (gem_reset_rx(sc) != 0) { + sc->sc_ifp->if_drv_flags &= ~IFF_DRV_RUNNING; return (gem_init_locked(sc)); + } for (i = 0; i < GEM_NRXDESC; i++) if (sc->sc_rxsoft[i].rxs_mbuf != NULL) GEM_UPDATE_RXDESC(sc, i); @@ -924,6 +926,9 @@ gem_init_locked(struct gem_softc *sc) GEM_LOCK_ASSERT(sc, MA_OWNED); + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + return; + #ifdef GEM_DEBUG CTR2(KTR_GEM, "%s: %s: calling stop", device_get_name(sc->sc_dev), __func__); @@ -1762,6 +1767,7 @@ gem_intr(void *v) if ((status2 & (GEM_MAC_TX_UNDERRUN | GEM_MAC_TX_PKT_TOO_LONG)) != 0) { sc->sc_ifp->if_oerrors++; + sc->sc_ifp->if_drv_flags &= ~IFF_DRV_RUNNING; gem_init_locked(sc); } } @@ -1814,6 +1820,7 @@ gem_watchdog(struct gem_softc *sc) ++ifp->if_oerrors; /* Try to get more packets going. */ + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; gem_init_locked(sc); gem_start_locked(ifp); return (EJUSTRETURN); From owner-svn-src-stable-7@FreeBSD.ORG Fri May 27 19:05:01 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 980D01065673; Fri, 27 May 2011 19:05:01 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 699878FC0A; Fri, 27 May 2011 19:05:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4RJ51Fb048531; Fri, 27 May 2011 19:05:01 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4RJ51Mv048529; Fri, 27 May 2011 19:05:01 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201105271905.p4RJ51Mv048529@svn.freebsd.org> From: Pyun YongHyeon Date: Fri, 27 May 2011 19:05:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222375 - in stable/7/sys/dev: alc ale X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2011 19:05:01 -0000 Author: yongari Date: Fri May 27 19:05:01 2011 New Revision: 222375 URL: http://svn.freebsd.org/changeset/base/222375 Log: MFC r222107: Fix typo. Submitted by: brad at OpenBSD Modified: stable/7/sys/dev/alc/if_alcreg.h stable/7/sys/dev/ale/if_alereg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/alc/if_alcreg.h ============================================================================== --- stable/7/sys/dev/alc/if_alcreg.h Fri May 27 19:03:42 2011 (r222374) +++ stable/7/sys/dev/alc/if_alcreg.h Fri May 27 19:05:01 2011 (r222375) @@ -17,12 +17,12 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMATES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMATE. + * SUCH DAMAGE. * * $FreeBSD$ */ Modified: stable/7/sys/dev/ale/if_alereg.h ============================================================================== --- stable/7/sys/dev/ale/if_alereg.h Fri May 27 19:03:42 2011 (r222374) +++ stable/7/sys/dev/ale/if_alereg.h Fri May 27 19:05:01 2011 (r222375) @@ -17,12 +17,12 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMATES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMATE. + * SUCH DAMAGE. * * $FreeBSD$ */ From owner-svn-src-stable-7@FreeBSD.ORG Fri May 27 19:27:18 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0391D1065670; Fri, 27 May 2011 19:27:18 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E627C8FC0A; Fri, 27 May 2011 19:27:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4RJRHo9049387; Fri, 27 May 2011 19:27:17 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4RJRHw4049385; Fri, 27 May 2011 19:27:17 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201105271927.p4RJRHw4049385@svn.freebsd.org> From: Pyun YongHyeon Date: Fri, 27 May 2011 19:27:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222378 - stable/7/sys/pci X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2011 19:27:18 -0000 Author: yongari Date: Fri May 27 19:27:17 2011 New Revision: 222378 URL: http://svn.freebsd.org/changeset/base/222378 Log: MFC r221555: Rewrite RX filter logic and provide controller specific filter handler for 3C90x and 3C90xB/C respectively. This simplifies ioctl handler as well as enhancing readability. While I'm here don't reprogram multicast filter when driver is not running. Modified: stable/7/sys/pci/if_xl.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/pci/if_xl.c ============================================================================== --- stable/7/sys/pci/if_xl.c Fri May 27 19:26:12 2011 (r222377) +++ stable/7/sys/pci/if_xl.c Fri May 27 19:27:17 2011 (r222378) @@ -266,10 +266,11 @@ static void xl_mii_send(struct xl_softc static int xl_mii_readreg(struct xl_softc *, struct xl_mii_frame *); static int xl_mii_writereg(struct xl_softc *, struct xl_mii_frame *); +static void xl_rxfilter(struct xl_softc *); +static void xl_rxfilter_90x(struct xl_softc *); +static void xl_rxfilter_90xB(struct xl_softc *); static void xl_setcfg(struct xl_softc *); static void xl_setmode(struct xl_softc *, int); -static void xl_setmulti(struct xl_softc *); -static void xl_setmulti_hash(struct xl_softc *); static void xl_reset(struct xl_softc *); static int xl_list_rx_init(struct xl_softc *); static int xl_list_tx_init(struct xl_softc *); @@ -705,101 +706,133 @@ xl_read_eeprom(struct xl_softc *sc, cadd return (err ? 1 : 0); } +static void +xl_rxfilter(struct xl_softc *sc) +{ + + if (sc->xl_type == XL_TYPE_905B) + xl_rxfilter_90xB(sc); + else + xl_rxfilter_90x(sc); +} + /* * NICs older than the 3c905B have only one multicast option, which * is to enable reception of all multicast frames. */ static void -xl_setmulti(struct xl_softc *sc) +xl_rxfilter_90x(struct xl_softc *sc) { - struct ifnet *ifp = sc->xl_ifp; + struct ifnet *ifp; struct ifmultiaddr *ifma; u_int8_t rxfilt; - int mcnt = 0; XL_LOCK_ASSERT(sc); + ifp = sc->xl_ifp; + XL_SEL_WIN(5); rxfilt = CSR_READ_1(sc, XL_W5_RX_FILTER); + rxfilt &= ~(XL_RXFILTER_ALLFRAMES | XL_RXFILTER_ALLMULTI | + XL_RXFILTER_BROADCAST | XL_RXFILTER_INDIVIDUAL); - if (ifp->if_flags & IFF_ALLMULTI) { - rxfilt |= XL_RXFILTER_ALLMULTI; - CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_SET_FILT|rxfilt); - return; - } - - IF_ADDR_LOCK(ifp); - TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) - mcnt++; - IF_ADDR_UNLOCK(ifp); + /* Set the individual bit to receive frames for this host only. */ + rxfilt |= XL_RXFILTER_INDIVIDUAL; + /* Set capture broadcast bit to capture broadcast frames. */ + if (ifp->if_flags & IFF_BROADCAST) + rxfilt |= XL_RXFILTER_BROADCAST; - if (mcnt) - rxfilt |= XL_RXFILTER_ALLMULTI; - else - rxfilt &= ~XL_RXFILTER_ALLMULTI; + /* If we want promiscuous mode, set the allframes bit. */ + if (ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI)) { + if (ifp->if_flags & IFF_PROMISC) + rxfilt |= XL_RXFILTER_ALLFRAMES; + if (ifp->if_flags & IFF_ALLMULTI) + rxfilt |= XL_RXFILTER_ALLMULTI; + } else { + IF_ADDR_LOCK(ifp); + TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { + if (ifma->ifma_addr->sa_family != AF_LINK) + continue; + rxfilt |= XL_RXFILTER_ALLMULTI; + break; + } + IF_ADDR_UNLOCK(ifp); + } - CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_SET_FILT|rxfilt); + CSR_WRITE_2(sc, XL_COMMAND, rxfilt | XL_CMD_RX_SET_FILT); + XL_SEL_WIN(7); } /* * 3c905B adapters have a hash filter that we can program. */ static void -xl_setmulti_hash(struct xl_softc *sc) +xl_rxfilter_90xB(struct xl_softc *sc) { - struct ifnet *ifp = sc->xl_ifp; - int h = 0, i; + struct ifnet *ifp; struct ifmultiaddr *ifma; + int i, mcnt; + u_int16_t h; u_int8_t rxfilt; - int mcnt = 0; XL_LOCK_ASSERT(sc); + ifp = sc->xl_ifp; + XL_SEL_WIN(5); rxfilt = CSR_READ_1(sc, XL_W5_RX_FILTER); + rxfilt &= ~(XL_RXFILTER_ALLFRAMES | XL_RXFILTER_ALLMULTI | + XL_RXFILTER_BROADCAST | XL_RXFILTER_INDIVIDUAL | + XL_RXFILTER_MULTIHASH); - if (ifp->if_flags & IFF_ALLMULTI) { - rxfilt |= XL_RXFILTER_ALLMULTI; - CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_SET_FILT|rxfilt); - return; - } else - rxfilt &= ~XL_RXFILTER_ALLMULTI; + /* Set the individual bit to receive frames for this host only. */ + rxfilt |= XL_RXFILTER_INDIVIDUAL; + /* Set capture broadcast bit to capture broadcast frames. */ + if (ifp->if_flags & IFF_BROADCAST) + rxfilt |= XL_RXFILTER_BROADCAST; - /* first, zot all the existing hash bits */ - for (i = 0; i < XL_HASHFILT_SIZE; i++) - CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_SET_HASH|i); - - /* now program new ones */ - IF_ADDR_LOCK(ifp); - TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { - if (ifma->ifma_addr->sa_family != AF_LINK) - continue; - /* - * Note: the 3c905B currently only supports a 64-bit hash - * table, which means we really only need 6 bits, but the - * manual indicates that future chip revisions will have a - * 256-bit hash table, hence the routine is set up to - * calculate 8 bits of position info in case we need it some - * day. - * Note II, The Sequel: _CURRENT_ versions of the 3c905B have - * a 256 bit hash table. This means we have to use all 8 bits - * regardless. On older cards, the upper 2 bits will be - * ignored. Grrrr.... - */ - h = ether_crc32_be(LLADDR((struct sockaddr_dl *) - ifma->ifma_addr), ETHER_ADDR_LEN) & 0xFF; - CSR_WRITE_2(sc, XL_COMMAND, - h | XL_CMD_RX_SET_HASH | XL_HASH_SET); - mcnt++; + /* If we want promiscuous mode, set the allframes bit. */ + if (ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI)) { + if (ifp->if_flags & IFF_PROMISC) + rxfilt |= XL_RXFILTER_ALLFRAMES; + if (ifp->if_flags & IFF_ALLMULTI) + rxfilt |= XL_RXFILTER_ALLMULTI; + } else { + /* First, zot all the existing hash bits. */ + for (i = 0; i < XL_HASHFILT_SIZE; i++) + CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_SET_HASH | i); + + /* Now program new ones. */ + mcnt = 0; + IF_ADDR_LOCK(ifp); + TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { + if (ifma->ifma_addr->sa_family != AF_LINK) + continue; + /* + * Note: the 3c905B currently only supports a 64-bit + * hash table, which means we really only need 6 bits, + * but the manual indicates that future chip revisions + * will have a 256-bit hash table, hence the routine + * is set up to calculate 8 bits of position info in + * case we need it some day. + * Note II, The Sequel: _CURRENT_ versions of the + * 3c905B have a 256 bit hash table. This means we have + * to use all 8 bits regardless. On older cards, the + * upper 2 bits will be ignored. Grrrr.... + */ + h = ether_crc32_be(LLADDR((struct sockaddr_dl *) + ifma->ifma_addr), ETHER_ADDR_LEN) & 0xFF; + CSR_WRITE_2(sc, XL_COMMAND, + h | XL_CMD_RX_SET_HASH | XL_HASH_SET); + mcnt++; + } + IF_ADDR_UNLOCK(ifp); + if (mcnt > 0) + rxfilt |= XL_RXFILTER_MULTIHASH; } - IF_ADDR_UNLOCK(ifp); - - if (mcnt) - rxfilt |= XL_RXFILTER_MULTIHASH; - else - rxfilt &= ~XL_RXFILTER_MULTIHASH; CSR_WRITE_2(sc, XL_COMMAND, rxfilt | XL_CMD_RX_SET_FILT); + XL_SEL_WIN(7); } static void @@ -2761,7 +2794,6 @@ xl_init_locked(struct xl_softc *sc) { struct ifnet *ifp = sc->xl_ifp; int error, i; - u_int16_t rxfilt = 0; struct mii_data *mii = NULL; XL_LOCK_ASSERT(sc); @@ -2860,39 +2892,7 @@ xl_init_locked(struct xl_softc *sc) } /* Set RX filter bits. */ - XL_SEL_WIN(5); - rxfilt = CSR_READ_1(sc, XL_W5_RX_FILTER); - - /* Set the individual bit to receive frames for this host only. */ - rxfilt |= XL_RXFILTER_INDIVIDUAL; - - /* If we want promiscuous mode, set the allframes bit. */ - if (ifp->if_flags & IFF_PROMISC) { - rxfilt |= XL_RXFILTER_ALLFRAMES; - CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_SET_FILT|rxfilt); - } else { - rxfilt &= ~XL_RXFILTER_ALLFRAMES; - CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_SET_FILT|rxfilt); - } - - /* - * Set capture broadcast bit to capture broadcast frames. - */ - if (ifp->if_flags & IFF_BROADCAST) { - rxfilt |= XL_RXFILTER_BROADCAST; - CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_SET_FILT|rxfilt); - } else { - rxfilt &= ~XL_RXFILTER_BROADCAST; - CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_SET_FILT|rxfilt); - } - - /* - * Program the multicast filter, if necessary. - */ - if (sc->xl_type == XL_TYPE_905B) - xl_setmulti_hash(sc); - else - xl_setmulti(sc); + xl_rxfilter(sc); /* * Load the address of the RX list. We have to @@ -3121,30 +3121,16 @@ xl_ioctl(struct ifnet *ifp, u_long comma struct ifreq *ifr = (struct ifreq *) data; int error = 0, mask; struct mii_data *mii = NULL; - u_int8_t rxfilt; switch (command) { case SIOCSIFFLAGS: XL_LOCK(sc); - - XL_SEL_WIN(5); - rxfilt = CSR_READ_1(sc, XL_W5_RX_FILTER); if (ifp->if_flags & IFF_UP) { if (ifp->if_drv_flags & IFF_DRV_RUNNING && - ifp->if_flags & IFF_PROMISC && - !(sc->xl_if_flags & IFF_PROMISC)) { - rxfilt |= XL_RXFILTER_ALLFRAMES; - CSR_WRITE_2(sc, XL_COMMAND, - XL_CMD_RX_SET_FILT|rxfilt); - XL_SEL_WIN(7); - } else if (ifp->if_drv_flags & IFF_DRV_RUNNING && - !(ifp->if_flags & IFF_PROMISC) && - sc->xl_if_flags & IFF_PROMISC) { - rxfilt &= ~XL_RXFILTER_ALLFRAMES; - CSR_WRITE_2(sc, XL_COMMAND, - XL_CMD_RX_SET_FILT|rxfilt); - XL_SEL_WIN(7); - } else + (ifp->if_flags ^ sc->xl_if_flags) & + (IFF_PROMISC | IFF_ALLMULTI)) + xl_rxfilter(sc); + else xl_init_locked(sc); } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) @@ -3152,18 +3138,14 @@ xl_ioctl(struct ifnet *ifp, u_long comma } sc->xl_if_flags = ifp->if_flags; XL_UNLOCK(sc); - error = 0; break; case SIOCADDMULTI: case SIOCDELMULTI: /* XXX Downcall from if_addmulti() possibly with locks held. */ XL_LOCK(sc); - if (sc->xl_type == XL_TYPE_905B) - xl_setmulti_hash(sc); - else - xl_setmulti(sc); + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + xl_rxfilter(sc); XL_UNLOCK(sc); - error = 0; break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: From owner-svn-src-stable-7@FreeBSD.ORG Fri May 27 20:22:20 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 15926106566C; Fri, 27 May 2011 20:22:20 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 04D9E8FC08; Fri, 27 May 2011 20:22:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4RKMJFa051373; Fri, 27 May 2011 20:22:19 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4RKMJ7k051370; Fri, 27 May 2011 20:22:19 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201105272022.p4RKMJ7k051370@svn.freebsd.org> From: Pyun YongHyeon Date: Fri, 27 May 2011 20:22:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222383 - stable/7/sys/pci X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2011 20:22:20 -0000 Author: yongari Date: Fri May 27 20:22:19 2011 New Revision: 222383 URL: http://svn.freebsd.org/changeset/base/222383 Log: MFC r221557-221558,221560-221561,221571: r221557: Remove unnecessary htole32/le32toh dance. r221571: Remove unneeded use of variable status. r221558: Set status word once instead of twice. For 3C90xB/3C90xC, frame length of status word is ignored. While here move bus_dmamap_sync() up where DMA map is loaded. r221560: Call bus_dmamap_sync() only after TX DPD update. r221561: Updating status word should be the last operation of UPD structure renewal. Disable instruction reordering by adding volatile to xl_list_onefrag structure. Modified: stable/7/sys/pci/if_xl.c stable/7/sys/pci/if_xlreg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/pci/if_xl.c ============================================================================== --- stable/7/sys/pci/if_xl.c Fri May 27 20:21:12 2011 (r222382) +++ stable/7/sys/pci/if_xl.c Fri May 27 20:22:19 2011 (r222383) @@ -1909,8 +1909,8 @@ xl_newbuf(struct xl_softc *sc, struct xl sc->xl_tmpmap = map; c->xl_mbuf = m_new; c->xl_ptr->xl_frag.xl_len = htole32(m_new->m_len | XL_LAST_FRAG); - c->xl_ptr->xl_status = 0; c->xl_ptr->xl_frag.xl_addr = htole32(segs->ds_addr); + c->xl_ptr->xl_status = 0; bus_dmamap_sync(sc->xl_mtag, c->xl_map, BUS_DMASYNC_PREREAD); return (0); } @@ -2505,6 +2505,7 @@ xl_encap(struct xl_softc *sc, struct xl_ *m_head = NULL; return (EIO); } + bus_dmamap_sync(sc->xl_mtag, c->xl_map, BUS_DMASYNC_PREWRITE); total_len = 0; for (i = 0; i < nseg; i++) { @@ -2516,10 +2517,7 @@ xl_encap(struct xl_softc *sc, struct xl_ htole32(sc->xl_cdata.xl_tx_segs[i].ds_len); total_len += sc->xl_cdata.xl_tx_segs[i].ds_len; } - c->xl_ptr->xl_frag[nseg - 1].xl_len = - htole32(sc->xl_cdata.xl_tx_segs[nseg - 1].ds_len | XL_LAST_FRAG); - c->xl_ptr->xl_status = htole32(total_len); - c->xl_ptr->xl_next = 0; + c->xl_ptr->xl_frag[nseg - 1].xl_len |= htole32(XL_LAST_FRAG); if (sc->xl_type == XL_TYPE_905B) { status = XL_TXSTAT_RND_DEFEAT; @@ -2534,11 +2532,12 @@ xl_encap(struct xl_softc *sc, struct xl_ status |= XL_TXSTAT_UDPCKSUM; } #endif - c->xl_ptr->xl_status = htole32(status); - } + } else + status = total_len; + c->xl_ptr->xl_status = htole32(status); + c->xl_ptr->xl_next = 0; c->xl_mbuf = *m_head; - bus_dmamap_sync(sc->xl_mtag, c->xl_map, BUS_DMASYNC_PREWRITE); return (0); } @@ -2570,7 +2569,6 @@ xl_start_locked(struct ifnet *ifp) struct xl_softc *sc = ifp->if_softc; struct mbuf *m_head = NULL; struct xl_chain *prev = NULL, *cur_tx = NULL, *start_tx; - u_int32_t status; int error; XL_LOCK_ASSERT(sc); @@ -2642,10 +2640,7 @@ xl_start_locked(struct ifnet *ifp) * get an interrupt once for the whole chain rather than * once for each packet. */ - cur_tx->xl_ptr->xl_status = htole32(le32toh(cur_tx->xl_ptr->xl_status) | - XL_TXSTAT_DL_INTR); - bus_dmamap_sync(sc->xl_ldata.xl_tx_tag, sc->xl_ldata.xl_tx_dmamap, - BUS_DMASYNC_PREWRITE); + cur_tx->xl_ptr->xl_status |= htole32(XL_TXSTAT_DL_INTR); /* * Queue the packets. If the TX channel is clear, update @@ -2658,14 +2653,15 @@ xl_start_locked(struct ifnet *ifp) sc->xl_cdata.xl_tx_tail->xl_next = start_tx; sc->xl_cdata.xl_tx_tail->xl_ptr->xl_next = htole32(start_tx->xl_phys); - status = sc->xl_cdata.xl_tx_tail->xl_ptr->xl_status; - sc->xl_cdata.xl_tx_tail->xl_ptr->xl_status = - htole32(le32toh(status) & ~XL_TXSTAT_DL_INTR); + sc->xl_cdata.xl_tx_tail->xl_ptr->xl_status &= + htole32(~XL_TXSTAT_DL_INTR); sc->xl_cdata.xl_tx_tail = cur_tx; } else { sc->xl_cdata.xl_tx_head = start_tx; sc->xl_cdata.xl_tx_tail = cur_tx; } + bus_dmamap_sync(sc->xl_ldata.xl_tx_tag, sc->xl_ldata.xl_tx_dmamap, + BUS_DMASYNC_PREWRITE); if (!CSR_READ_4(sc, XL_DOWNLIST_PTR)) CSR_WRITE_4(sc, XL_DOWNLIST_PTR, start_tx->xl_phys); @@ -2764,14 +2760,13 @@ xl_start_90xB_locked(struct ifnet *ifp) * get an interrupt once for the whole chain rather than * once for each packet. */ - cur_tx->xl_ptr->xl_status = htole32(le32toh(cur_tx->xl_ptr->xl_status) | - XL_TXSTAT_DL_INTR); - bus_dmamap_sync(sc->xl_ldata.xl_tx_tag, sc->xl_ldata.xl_tx_dmamap, - BUS_DMASYNC_PREWRITE); + cur_tx->xl_ptr->xl_status |= htole32(XL_TXSTAT_DL_INTR); /* Start transmission */ sc->xl_cdata.xl_tx_prod = idx; start_tx->xl_prev->xl_ptr->xl_next = htole32(start_tx->xl_phys); + bus_dmamap_sync(sc->xl_ldata.xl_tx_tag, sc->xl_ldata.xl_tx_dmamap, + BUS_DMASYNC_PREWRITE); /* * Set a timeout in case the chip goes out to lunch. Modified: stable/7/sys/pci/if_xlreg.h ============================================================================== --- stable/7/sys/pci/if_xlreg.h Fri May 27 20:21:12 2011 (r222382) +++ stable/7/sys/pci/if_xlreg.h Fri May 27 20:22:19 2011 (r222383) @@ -468,8 +468,8 @@ struct xl_list { struct xl_list_onefrag { u_int32_t xl_next; /* final entry has 0 nextptr */ - u_int32_t xl_status; - struct xl_frag xl_frag; + volatile u_int32_t xl_status; + volatile struct xl_frag xl_frag; }; struct xl_list_data { From owner-svn-src-stable-7@FreeBSD.ORG Fri May 27 20:34:24 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2CA9B1065672; Fri, 27 May 2011 20:34:24 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 129C48FC0C; Fri, 27 May 2011 20:34:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4RKYNiv051918; Fri, 27 May 2011 20:34:23 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4RKYNVk051916; Fri, 27 May 2011 20:34:23 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201105272034.p4RKYNVk051916@svn.freebsd.org> From: Pyun YongHyeon Date: Fri, 27 May 2011 20:34:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222385 - stable/7/sys/pci X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2011 20:34:24 -0000 Author: yongari Date: Fri May 27 20:34:23 2011 New Revision: 222385 URL: http://svn.freebsd.org/changeset/base/222385 Log: MFC r221563-221564: r221563: Terminate interrupt handler if driver detect it's not running. Also add check for driver running state before trying to send frames. While I'm here, use for loop. r221564: Change xl_rxeof() a bit to return the number of processed frames in RX descriptor ring. Previously it returned the number of frames that were successfully passed to upper stack which in turn means it ignored frames that were discarded due to errors. The number of processed frames in RX descriptor ring is used to detect whether driver is out of sync with controller's current descriptor pointer. Returning number of processed frames reduces unnecessary (probably wrong) re-synchronization. While here, remove unnecessary local variable initialization. Modified: stable/7/sys/pci/if_xl.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/pci/if_xl.c ============================================================================== --- stable/7/sys/pci/if_xl.c Fri May 27 20:33:26 2011 (r222384) +++ stable/7/sys/pci/if_xl.c Fri May 27 20:34:23 2011 (r222385) @@ -231,7 +231,7 @@ static int xl_newbuf(struct xl_softc *, static void xl_stats_update(void *); static void xl_stats_update_locked(struct xl_softc *); static int xl_encap(struct xl_softc *, struct xl_chain *, struct mbuf **); -static void xl_rxeof(struct xl_softc *); +static int xl_rxeof(struct xl_softc *); static void xl_rxeof_task(void *, int); static int xl_rx_resync(struct xl_softc *); static void xl_txeof(struct xl_softc *); @@ -1943,13 +1943,14 @@ xl_rx_resync(struct xl_softc *sc) * A frame has been uploaded: pass the resulting mbuf chain up to * the higher level protocols. */ -static void +static int xl_rxeof(struct xl_softc *sc) { struct mbuf *m; struct ifnet *ifp = sc->xl_ifp; struct xl_chain_onefrag *cur_rx; - int total_len = 0; + int total_len; + int rx_npkts = 0; u_int32_t rxstat; XL_LOCK_ASSERT(sc); @@ -1967,6 +1968,7 @@ again: cur_rx = sc->xl_cdata.xl_rx_head; sc->xl_cdata.xl_rx_head = cur_rx->xl_next; total_len = rxstat & XL_RXSTAT_LENMASK; + rx_npkts++; /* * Since we have told the chip to allow large frames, @@ -2058,7 +2060,7 @@ again: * packet up the network stack. */ if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) - return; + return (rx_npkts); } /* @@ -2082,6 +2084,7 @@ again: CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_UP_UNSTALL); goto again; } + return (rx_npkts); } /* @@ -2275,17 +2278,17 @@ xl_intr(void *arg) } #endif - while ((status = CSR_READ_2(sc, XL_STATUS)) & XL_INTRS && - status != 0xFFFF) { + for (;;) { + status = CSR_READ_2(sc, XL_STATUS); + if ((status & XL_INTRS) == 0 || status == 0xFFFF) + break; CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_INTR_ACK|(status & XL_INTRS)); + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + break; if (status & XL_STAT_UP_COMPLETE) { - int curpkts; - - curpkts = ifp->if_ipackets; - xl_rxeof(sc); - if (curpkts == ifp->if_ipackets) { + if (xl_rxeof(sc) == 0) { while (xl_rx_resync(sc)) xl_rxeof(sc); } @@ -2306,6 +2309,7 @@ xl_intr(void *arg) if (status & XL_STAT_ADFAIL) { ifp->if_drv_flags &= ~IFF_DRV_RUNNING; xl_init_locked(sc); + break; } if (status & XL_STAT_STATSOFLOW) { @@ -2315,7 +2319,8 @@ xl_intr(void *arg) } } - if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) { + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd) && + ifp->if_drv_flags & IFF_DRV_RUNNING) { if (sc->xl_type == XL_TYPE_905B) xl_start_90xB_locked(ifp); else From owner-svn-src-stable-7@FreeBSD.ORG Fri May 27 21:45:21 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3E15106564A; Fri, 27 May 2011 21:45:21 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C32428FC12; Fri, 27 May 2011 21:45:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4RLjLpE054285; Fri, 27 May 2011 21:45:21 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4RLjLVO054282; Fri, 27 May 2011 21:45:21 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201105272145.p4RLjLVO054282@svn.freebsd.org> From: Pyun YongHyeon Date: Fri, 27 May 2011 21:45:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222388 - stable/7/sys/pci X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2011 21:45:21 -0000 Author: yongari Date: Fri May 27 21:45:21 2011 New Revision: 222388 URL: http://svn.freebsd.org/changeset/base/222388 Log: MFC r221565-221568,221579: r221565: Reuse the TX descriptor(DPD) if xl_encap() failed instead of just picking the next available one. This may explain why xl(4) sees TX underrun error with no queued frame. I hope this addresses a long standing xl(4) watchdog timeout issue as well. Obtained from: OpenBSD r221566,221579: Rename xl_stats_update() callout handler to xl_tick() and move MII tick driving logic to xl_tick(). Now xl_tick() handles MII tick as well as periodic updating of statistics. This change removes a hack used in interrupt handler where it wanted to update statistics without driving MII tick. r221567: Rearm watchdog timer if driver kick controller to recover from TX underrun error. While here, prepend 0x to status code to show TX status is hex number. r221568: XL_DMACTL is 32bit register, use 32bit write macro. While I'm here add more bits for the register. Modified: stable/7/sys/pci/if_xl.c stable/7/sys/pci/if_xlreg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/pci/if_xl.c ============================================================================== --- stable/7/sys/pci/if_xl.c Fri May 27 21:43:35 2011 (r222387) +++ stable/7/sys/pci/if_xl.c Fri May 27 21:45:21 2011 (r222388) @@ -228,8 +228,8 @@ static int xl_attach(device_t); static int xl_detach(device_t); static int xl_newbuf(struct xl_softc *, struct xl_chain_onefrag *); -static void xl_stats_update(void *); -static void xl_stats_update_locked(struct xl_softc *); +static void xl_tick(void *); +static void xl_stats_update(struct xl_softc *); static int xl_encap(struct xl_softc *, struct xl_chain *, struct mbuf **); static int xl_rxeof(struct xl_softc *); static void xl_rxeof_task(void *, int); @@ -1335,7 +1335,7 @@ xl_attach(device_t dev) } sc->xl_unit = unit; - callout_init_mtx(&sc->xl_stat_callout, &sc->xl_mtx, 0); + callout_init_mtx(&sc->xl_tick_callout, &sc->xl_mtx, 0); TASK_INIT(&sc->xl_task, 0, xl_rxeof_task, sc); /* @@ -1700,7 +1700,7 @@ xl_detach(device_t dev) xl_stop(sc); XL_UNLOCK(sc); taskqueue_drain(taskqueue_swi, &sc->xl_task); - callout_drain(&sc->xl_stat_callout); + callout_drain(&sc->xl_tick_callout); ether_ifdetach(ifp); } if (sc->xl_miibus) @@ -2212,7 +2212,7 @@ xl_txeoc(struct xl_softc *sc) txstat & XL_TXSTATUS_JABBER || txstat & XL_TXSTATUS_RECLAIM) { device_printf(sc->xl_dev, - "transmission error: %x\n", txstat); + "transmission error: 0x%02x\n", txstat); CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_TX_RESET); xl_wait(sc); if (sc->xl_type == XL_TYPE_905B) { @@ -2225,11 +2225,14 @@ xl_txeoc(struct xl_softc *sc) CSR_WRITE_4(sc, XL_DOWNLIST_PTR, c->xl_phys); CSR_WRITE_1(sc, XL_DOWN_POLL, 64); + sc->xl_wdog_timer = 5; } } else { - if (sc->xl_cdata.xl_tx_head != NULL) + if (sc->xl_cdata.xl_tx_head != NULL) { CSR_WRITE_4(sc, XL_DOWNLIST_PTR, sc->xl_cdata.xl_tx_head->xl_phys); + sc->xl_wdog_timer = 5; + } } /* * Remember to set this for the @@ -2312,11 +2315,8 @@ xl_intr(void *arg) break; } - if (status & XL_STAT_STATSOFLOW) { - sc->xl_stats_no_timeout = 1; - xl_stats_update_locked(sc); - sc->xl_stats_no_timeout = 0; - } + if (status & XL_STAT_STATSOFLOW) + xl_stats_update(sc); } if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd) && @@ -2381,48 +2381,45 @@ xl_poll_locked(struct ifnet *ifp, enum p xl_init_locked(sc); } - if (status & XL_STAT_STATSOFLOW) { - sc->xl_stats_no_timeout = 1; - xl_stats_update_locked(sc); - sc->xl_stats_no_timeout = 0; - } + if (status & XL_STAT_STATSOFLOW) + xl_stats_update(sc); } } } #endif /* DEVICE_POLLING */ -/* - * XXX: This is an entry point for callout which needs to take the lock. - */ static void -xl_stats_update(void *xsc) +xl_tick(void *xsc) { struct xl_softc *sc = xsc; + struct mii_data *mii; XL_LOCK_ASSERT(sc); + if (sc->xl_miibus != NULL) { + mii = device_get_softc(sc->xl_miibus); + mii_tick(mii); + } + + xl_stats_update(sc); if (xl_watchdog(sc) == EJUSTRETURN) return; - xl_stats_update_locked(sc); + callout_reset(&sc->xl_tick_callout, hz, xl_tick, sc); } static void -xl_stats_update_locked(struct xl_softc *sc) +xl_stats_update(struct xl_softc *sc) { struct ifnet *ifp = sc->xl_ifp; struct xl_stats xl_stats; u_int8_t *p; int i; - struct mii_data *mii = NULL; XL_LOCK_ASSERT(sc); bzero((char *)&xl_stats, sizeof(struct xl_stats)); - if (sc->xl_miibus != NULL) - mii = device_get_softc(sc->xl_miibus); - p = (u_int8_t *)&xl_stats; /* Read all the stats registers. */ @@ -2444,14 +2441,7 @@ xl_stats_update_locked(struct xl_softc * */ XL_SEL_WIN(4); CSR_READ_1(sc, XL_W4_BADSSD); - - if ((mii != NULL) && (!sc->xl_stats_no_timeout)) - mii_tick(mii); - XL_SEL_WIN(7); - - if (!sc->xl_stats_no_timeout) - callout_reset(&sc->xl_stat_callout, hz, xl_stats_update, sc); } /* @@ -2572,8 +2562,9 @@ static void xl_start_locked(struct ifnet *ifp) { struct xl_softc *sc = ifp->if_softc; - struct mbuf *m_head = NULL; + struct mbuf *m_head; struct xl_chain *prev = NULL, *cur_tx = NULL, *start_tx; + struct xl_chain *prev_tx; int error; XL_LOCK_ASSERT(sc); @@ -2603,11 +2594,13 @@ xl_start_locked(struct ifnet *ifp) break; /* Pick a descriptor off the free list. */ + prev_tx = cur_tx; cur_tx = sc->xl_cdata.xl_tx_free; /* Pack the data into the descriptor. */ error = xl_encap(sc, cur_tx, &m_head); if (error) { + cur_tx = prev_tx; if (m_head == NULL) break; ifp->if_drv_flags |= IFF_DRV_OACTIVE; @@ -2701,8 +2694,9 @@ static void xl_start_90xB_locked(struct ifnet *ifp) { struct xl_softc *sc = ifp->if_softc; - struct mbuf *m_head = NULL; + struct mbuf *m_head; struct xl_chain *prev = NULL, *cur_tx = NULL, *start_tx; + struct xl_chain *prev_tx; int error, idx; XL_LOCK_ASSERT(sc); @@ -2725,11 +2719,13 @@ xl_start_90xB_locked(struct ifnet *ifp) if (m_head == NULL) break; + prev_tx = cur_tx; cur_tx = &sc->xl_cdata.xl_tx_chain[idx]; /* Pack the data into the descriptor. */ error = xl_encap(sc, cur_tx, &m_head); if (error) { + cur_tx = prev_tx; if (m_head == NULL) break; ifp->if_drv_flags |= IFF_DRV_OACTIVE; @@ -2950,9 +2946,7 @@ xl_init_locked(struct xl_softc *sc) /* Clear out the stats counters. */ CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_STATS_DISABLE); - sc->xl_stats_no_timeout = 1; - xl_stats_update_locked(sc); - sc->xl_stats_no_timeout = 0; + xl_stats_update(sc); XL_SEL_WIN(4); CSR_WRITE_2(sc, XL_W4_NET_DIAG, XL_NETDIAG_UPPER_BYTES_ENABLE); CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_STATS_ENABLE); @@ -2974,7 +2968,7 @@ xl_init_locked(struct xl_softc *sc) /* Set the RX early threshold */ CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_SET_THRESH|(XL_PACKET_SIZE >>2)); - CSR_WRITE_2(sc, XL_DMACTL, XL_DMACTL_UP_RX_EARLY); + CSR_WRITE_4(sc, XL_DMACTL, XL_DMACTL_UP_RX_EARLY); /* Enable receiver and transmitter. */ CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_TX_ENABLE); @@ -2993,7 +2987,7 @@ xl_init_locked(struct xl_softc *sc) ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; sc->xl_wdog_timer = 0; - callout_reset(&sc->xl_stat_callout, hz, xl_stats_update, sc); + callout_reset(&sc->xl_tick_callout, hz, xl_tick, sc); } /* @@ -3302,7 +3296,7 @@ xl_stop(struct xl_softc *sc) bus_space_write_4(sc->xl_ftag, sc->xl_fhandle, 4, 0x8000); /* Stop the stats updater. */ - callout_stop(&sc->xl_stat_callout); + callout_stop(&sc->xl_tick_callout); /* * Free data in the RX lists. Modified: stable/7/sys/pci/if_xlreg.h ============================================================================== --- stable/7/sys/pci/if_xlreg.h Fri May 27 21:43:35 2011 (r222387) +++ stable/7/sys/pci/if_xlreg.h Fri May 27 21:45:21 2011 (r222388) @@ -124,6 +124,11 @@ #define XL_DMACTL_DOWN_INPROG 0x00000080 #define XL_DMACTL_COUNTER_SPEED 0x00000100 #define XL_DMACTL_DOWNDOWN_MODE 0x00000200 +#define XL_DMACTL_UP_ALTSEQ_DIS 0x00010000 /* 3c90xB/3c90xC */ +#define XL_DMACTL_DOWN_ALTSEQ_DIS 0x00020000 /* 3c90xC only */ +#define XL_DMACTL_DEFEAT_MWI 0x00100000 /* 3c90xB/3c90xC */ +#define XL_DMACTL_DEFEAT_MRL 0x00100000 /* 3c90xB/3c90xC */ +#define XL_DMACTL_UP_OVERRUN_DISC_DIS 0x00200000 /* 3c90xB/3c90xC */ #define XL_DMACTL_TARGET_ABORT 0x40000000 #define XL_DMACTL_MASTER_ABORT 0x80000000 @@ -615,13 +620,12 @@ struct xl_softc { u_int32_t xl_xcvr; u_int16_t xl_media; u_int16_t xl_caps; - u_int8_t xl_stats_no_timeout; u_int16_t xl_tx_thresh; int xl_pmcap; int xl_if_flags; struct xl_list_data xl_ldata; struct xl_chain_data xl_cdata; - struct callout xl_stat_callout; + struct callout xl_tick_callout; int xl_wdog_timer; int xl_flags; struct resource *xl_fres; From owner-svn-src-stable-7@FreeBSD.ORG Sat May 28 00:58:21 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A0E4106566B; Sat, 28 May 2011 00:58:21 +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 43CDB8FC13; Sat, 28 May 2011 00:58:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4S0wLHx060870; Sat, 28 May 2011 00:58:21 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4S0wJGU060777; Sat, 28 May 2011 00:58:19 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201105280058.p4S0wJGU060777@svn.freebsd.org> From: Doug Barton Date: Sat, 28 May 2011 00:58:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r222399 - in stable/7/contrib/bind9: . bin bin/check bin/dig bin/dig/include/dig bin/dnssec bin/named bin/named/include/named bin/named/unix bin/named/unix/include/named bin/nsupdate bi... X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 May 2011 00:58:21 -0000 Author: dougb Date: Sat May 28 00:58:19 2011 New Revision: 222399 URL: http://svn.freebsd.org/changeset/base/222399 Log: Upgrade to 9.4-ESV-R4-P1, which addresses the following issues: 1. Very large RRSIG RRsets included in a negative cache can trigger an assertion failure that will crash named (BIND 9 DNS) due to an off-by-one error in a buffer size check. This bug affects all resolving name servers, whether DNSSEC validation is enabled or not, on all BIND versions prior to today. There is a possibility of malicious exploitation of this bug by remote users. 2. Named could fail to validate zones listed in a DLV that validated insecure without using DLV and had DS records in the parent zone. Deleted: stable/7/contrib/bind9/RELEASE-NOTES-BIND-9.4-ESV.html stable/7/contrib/bind9/RELEASE-NOTES-BIND-9.4-ESV.pdf stable/7/contrib/bind9/RELEASE-NOTES-BIND-9.4-ESV.txt Modified: stable/7/contrib/bind9/CHANGES stable/7/contrib/bind9/COPYRIGHT stable/7/contrib/bind9/FAQ.xml stable/7/contrib/bind9/Makefile.in stable/7/contrib/bind9/README.idnkit stable/7/contrib/bind9/acconfig.h stable/7/contrib/bind9/bin/Makefile.in stable/7/contrib/bind9/bin/check/Makefile.in stable/7/contrib/bind9/bin/check/check-tool.c stable/7/contrib/bind9/bin/check/check-tool.h stable/7/contrib/bind9/bin/check/named-checkconf.8 stable/7/contrib/bind9/bin/check/named-checkconf.c stable/7/contrib/bind9/bin/check/named-checkconf.docbook stable/7/contrib/bind9/bin/check/named-checkconf.html stable/7/contrib/bind9/bin/check/named-checkzone.8 stable/7/contrib/bind9/bin/check/named-checkzone.c stable/7/contrib/bind9/bin/check/named-checkzone.docbook stable/7/contrib/bind9/bin/check/named-checkzone.html stable/7/contrib/bind9/bin/dig/Makefile.in stable/7/contrib/bind9/bin/dig/dig.1 stable/7/contrib/bind9/bin/dig/dig.c stable/7/contrib/bind9/bin/dig/dig.docbook stable/7/contrib/bind9/bin/dig/dig.html stable/7/contrib/bind9/bin/dig/dighost.c stable/7/contrib/bind9/bin/dig/host.1 stable/7/contrib/bind9/bin/dig/host.c stable/7/contrib/bind9/bin/dig/host.docbook stable/7/contrib/bind9/bin/dig/host.html stable/7/contrib/bind9/bin/dig/include/dig/dig.h stable/7/contrib/bind9/bin/dig/nslookup.1 stable/7/contrib/bind9/bin/dig/nslookup.c stable/7/contrib/bind9/bin/dig/nslookup.docbook stable/7/contrib/bind9/bin/dig/nslookup.html stable/7/contrib/bind9/bin/dnssec/Makefile.in stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.8 stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.c stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.docbook stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.html stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.8 stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.c stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.docbook stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.html stable/7/contrib/bind9/bin/dnssec/dnssectool.c stable/7/contrib/bind9/bin/dnssec/dnssectool.h stable/7/contrib/bind9/bin/named/Makefile.in stable/7/contrib/bind9/bin/named/builtin.c stable/7/contrib/bind9/bin/named/client.c stable/7/contrib/bind9/bin/named/config.c stable/7/contrib/bind9/bin/named/control.c stable/7/contrib/bind9/bin/named/controlconf.c stable/7/contrib/bind9/bin/named/include/named/builtin.h stable/7/contrib/bind9/bin/named/include/named/client.h stable/7/contrib/bind9/bin/named/include/named/config.h stable/7/contrib/bind9/bin/named/include/named/control.h stable/7/contrib/bind9/bin/named/include/named/globals.h stable/7/contrib/bind9/bin/named/include/named/interfacemgr.h stable/7/contrib/bind9/bin/named/include/named/listenlist.h stable/7/contrib/bind9/bin/named/include/named/log.h stable/7/contrib/bind9/bin/named/include/named/logconf.h stable/7/contrib/bind9/bin/named/include/named/lwaddr.h stable/7/contrib/bind9/bin/named/include/named/lwdclient.h stable/7/contrib/bind9/bin/named/include/named/lwresd.h stable/7/contrib/bind9/bin/named/include/named/lwsearch.h stable/7/contrib/bind9/bin/named/include/named/main.h stable/7/contrib/bind9/bin/named/include/named/notify.h stable/7/contrib/bind9/bin/named/include/named/ns_smf_globals.h stable/7/contrib/bind9/bin/named/include/named/query.h stable/7/contrib/bind9/bin/named/include/named/server.h stable/7/contrib/bind9/bin/named/include/named/sortlist.h stable/7/contrib/bind9/bin/named/include/named/tkeyconf.h stable/7/contrib/bind9/bin/named/include/named/tsigconf.h stable/7/contrib/bind9/bin/named/include/named/types.h stable/7/contrib/bind9/bin/named/include/named/update.h stable/7/contrib/bind9/bin/named/include/named/xfrout.h stable/7/contrib/bind9/bin/named/include/named/zoneconf.h stable/7/contrib/bind9/bin/named/interfacemgr.c stable/7/contrib/bind9/bin/named/listenlist.c stable/7/contrib/bind9/bin/named/log.c stable/7/contrib/bind9/bin/named/logconf.c stable/7/contrib/bind9/bin/named/lwaddr.c stable/7/contrib/bind9/bin/named/lwdclient.c stable/7/contrib/bind9/bin/named/lwderror.c stable/7/contrib/bind9/bin/named/lwdgabn.c stable/7/contrib/bind9/bin/named/lwdgnba.c stable/7/contrib/bind9/bin/named/lwdgrbn.c stable/7/contrib/bind9/bin/named/lwdnoop.c stable/7/contrib/bind9/bin/named/lwresd.8 stable/7/contrib/bind9/bin/named/lwresd.c stable/7/contrib/bind9/bin/named/lwresd.docbook stable/7/contrib/bind9/bin/named/lwresd.html stable/7/contrib/bind9/bin/named/lwsearch.c stable/7/contrib/bind9/bin/named/main.c stable/7/contrib/bind9/bin/named/named.8 stable/7/contrib/bind9/bin/named/named.conf.5 stable/7/contrib/bind9/bin/named/named.conf.docbook stable/7/contrib/bind9/bin/named/named.conf.html stable/7/contrib/bind9/bin/named/named.docbook stable/7/contrib/bind9/bin/named/named.html stable/7/contrib/bind9/bin/named/notify.c stable/7/contrib/bind9/bin/named/query.c stable/7/contrib/bind9/bin/named/server.c stable/7/contrib/bind9/bin/named/sortlist.c stable/7/contrib/bind9/bin/named/tkeyconf.c stable/7/contrib/bind9/bin/named/tsigconf.c stable/7/contrib/bind9/bin/named/unix/Makefile.in stable/7/contrib/bind9/bin/named/unix/include/named/os.h stable/7/contrib/bind9/bin/named/unix/os.c stable/7/contrib/bind9/bin/named/update.c stable/7/contrib/bind9/bin/named/xfrout.c stable/7/contrib/bind9/bin/named/zoneconf.c stable/7/contrib/bind9/bin/nsupdate/Makefile.in stable/7/contrib/bind9/bin/nsupdate/nsupdate.1 stable/7/contrib/bind9/bin/nsupdate/nsupdate.c stable/7/contrib/bind9/bin/nsupdate/nsupdate.docbook stable/7/contrib/bind9/bin/nsupdate/nsupdate.html stable/7/contrib/bind9/bin/rndc/Makefile.in stable/7/contrib/bind9/bin/rndc/include/rndc/os.h stable/7/contrib/bind9/bin/rndc/rndc-confgen.8 stable/7/contrib/bind9/bin/rndc/rndc-confgen.c stable/7/contrib/bind9/bin/rndc/rndc-confgen.docbook stable/7/contrib/bind9/bin/rndc/rndc-confgen.html stable/7/contrib/bind9/bin/rndc/rndc.8 stable/7/contrib/bind9/bin/rndc/rndc.c stable/7/contrib/bind9/bin/rndc/rndc.conf stable/7/contrib/bind9/bin/rndc/rndc.conf.5 stable/7/contrib/bind9/bin/rndc/rndc.conf.docbook stable/7/contrib/bind9/bin/rndc/rndc.conf.html stable/7/contrib/bind9/bin/rndc/rndc.docbook stable/7/contrib/bind9/bin/rndc/rndc.html stable/7/contrib/bind9/bin/rndc/unix/Makefile.in stable/7/contrib/bind9/bin/rndc/unix/os.c stable/7/contrib/bind9/bin/rndc/util.c stable/7/contrib/bind9/bin/rndc/util.h stable/7/contrib/bind9/config.h.in stable/7/contrib/bind9/doc/Makefile.in stable/7/contrib/bind9/doc/arm/Bv9ARM-book.xml stable/7/contrib/bind9/doc/arm/Bv9ARM.ch01.html stable/7/contrib/bind9/doc/arm/Bv9ARM.ch02.html stable/7/contrib/bind9/doc/arm/Bv9ARM.ch03.html stable/7/contrib/bind9/doc/arm/Bv9ARM.ch04.html stable/7/contrib/bind9/doc/arm/Bv9ARM.ch05.html stable/7/contrib/bind9/doc/arm/Bv9ARM.ch06.html stable/7/contrib/bind9/doc/arm/Bv9ARM.ch07.html stable/7/contrib/bind9/doc/arm/Bv9ARM.ch08.html stable/7/contrib/bind9/doc/arm/Bv9ARM.ch09.html stable/7/contrib/bind9/doc/arm/Bv9ARM.ch10.html stable/7/contrib/bind9/doc/arm/Bv9ARM.html stable/7/contrib/bind9/doc/arm/Makefile.in stable/7/contrib/bind9/doc/arm/README-SGML stable/7/contrib/bind9/doc/arm/man.dig.html stable/7/contrib/bind9/doc/arm/man.dnssec-keygen.html stable/7/contrib/bind9/doc/arm/man.dnssec-signzone.html stable/7/contrib/bind9/doc/arm/man.host.html stable/7/contrib/bind9/doc/arm/man.named-checkconf.html stable/7/contrib/bind9/doc/arm/man.named-checkzone.html stable/7/contrib/bind9/doc/arm/man.named.html stable/7/contrib/bind9/doc/arm/man.rndc-confgen.html stable/7/contrib/bind9/doc/arm/man.rndc.conf.html stable/7/contrib/bind9/doc/arm/man.rndc.html stable/7/contrib/bind9/doc/misc/Makefile.in stable/7/contrib/bind9/doc/misc/dnssec stable/7/contrib/bind9/doc/misc/format-options.pl stable/7/contrib/bind9/doc/misc/ipv6 stable/7/contrib/bind9/doc/misc/migration stable/7/contrib/bind9/doc/misc/migration-4to9 stable/7/contrib/bind9/doc/misc/rfc-compliance stable/7/contrib/bind9/doc/misc/roadmap stable/7/contrib/bind9/doc/misc/sdb stable/7/contrib/bind9/doc/misc/sort-options.pl stable/7/contrib/bind9/isc-config.sh.in stable/7/contrib/bind9/lib/Makefile.in stable/7/contrib/bind9/lib/bind/Makefile.in stable/7/contrib/bind9/lib/bind/bsd/Makefile.in stable/7/contrib/bind9/lib/bind/bsd/daemon.c stable/7/contrib/bind9/lib/bind/bsd/ftruncate.c stable/7/contrib/bind9/lib/bind/bsd/gettimeofday.c stable/7/contrib/bind9/lib/bind/bsd/mktemp.c stable/7/contrib/bind9/lib/bind/bsd/putenv.c stable/7/contrib/bind9/lib/bind/bsd/readv.c stable/7/contrib/bind9/lib/bind/bsd/setenv.c stable/7/contrib/bind9/lib/bind/bsd/setitimer.c stable/7/contrib/bind9/lib/bind/bsd/strcasecmp.c stable/7/contrib/bind9/lib/bind/bsd/strerror.c stable/7/contrib/bind9/lib/bind/bsd/strpbrk.c stable/7/contrib/bind9/lib/bind/bsd/strsep.c stable/7/contrib/bind9/lib/bind/bsd/strtoul.c stable/7/contrib/bind9/lib/bind/bsd/writev.c stable/7/contrib/bind9/lib/bind/dst/Makefile.in stable/7/contrib/bind9/lib/bind/dst/dst_api.c stable/7/contrib/bind9/lib/bind/dst/hmac_link.c stable/7/contrib/bind9/lib/bind/dst/support.c stable/7/contrib/bind9/lib/bind/include/Makefile.in stable/7/contrib/bind9/lib/bind/include/arpa/inet.h stable/7/contrib/bind9/lib/bind/include/arpa/nameser.h stable/7/contrib/bind9/lib/bind/include/arpa/nameser_compat.h stable/7/contrib/bind9/lib/bind/include/hesiod.h stable/7/contrib/bind9/lib/bind/include/irp.h stable/7/contrib/bind9/lib/bind/include/irs.h stable/7/contrib/bind9/lib/bind/include/isc/assertions.h stable/7/contrib/bind9/lib/bind/include/isc/ctl.h stable/7/contrib/bind9/lib/bind/include/isc/eventlib.h stable/7/contrib/bind9/lib/bind/include/isc/irpmarshall.h stable/7/contrib/bind9/lib/bind/include/isc/misc.h stable/7/contrib/bind9/lib/bind/include/isc/platform.h.in stable/7/contrib/bind9/lib/bind/include/isc/tree.h stable/7/contrib/bind9/lib/bind/include/netdb.h stable/7/contrib/bind9/lib/bind/include/res_update.h stable/7/contrib/bind9/lib/bind/include/resolv.h stable/7/contrib/bind9/lib/bind/inet/Makefile.in stable/7/contrib/bind9/lib/bind/inet/inet_addr.c stable/7/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c stable/7/contrib/bind9/lib/bind/inet/inet_cidr_pton.c stable/7/contrib/bind9/lib/bind/inet/inet_data.c stable/7/contrib/bind9/lib/bind/inet/inet_net_ntop.c stable/7/contrib/bind9/lib/bind/inet/inet_net_pton.c stable/7/contrib/bind9/lib/bind/inet/inet_neta.c stable/7/contrib/bind9/lib/bind/inet/inet_ntoa.c stable/7/contrib/bind9/lib/bind/inet/inet_ntop.c stable/7/contrib/bind9/lib/bind/inet/inet_pton.c stable/7/contrib/bind9/lib/bind/inet/nsap_addr.c stable/7/contrib/bind9/lib/bind/irs/Makefile.in stable/7/contrib/bind9/lib/bind/irs/dns.c stable/7/contrib/bind9/lib/bind/irs/dns_gr.c stable/7/contrib/bind9/lib/bind/irs/dns_ho.c stable/7/contrib/bind9/lib/bind/irs/dns_nw.c stable/7/contrib/bind9/lib/bind/irs/dns_p.h stable/7/contrib/bind9/lib/bind/irs/dns_pr.c stable/7/contrib/bind9/lib/bind/irs/dns_pw.c stable/7/contrib/bind9/lib/bind/irs/dns_sv.c stable/7/contrib/bind9/lib/bind/irs/gen.c stable/7/contrib/bind9/lib/bind/irs/gen_gr.c stable/7/contrib/bind9/lib/bind/irs/gen_ho.c stable/7/contrib/bind9/lib/bind/irs/gen_ng.c stable/7/contrib/bind9/lib/bind/irs/gen_nw.c stable/7/contrib/bind9/lib/bind/irs/gen_p.h stable/7/contrib/bind9/lib/bind/irs/gen_pr.c stable/7/contrib/bind9/lib/bind/irs/gen_pw.c stable/7/contrib/bind9/lib/bind/irs/gen_sv.c stable/7/contrib/bind9/lib/bind/irs/getgrent.c stable/7/contrib/bind9/lib/bind/irs/getgrent_r.c stable/7/contrib/bind9/lib/bind/irs/gethostent.c stable/7/contrib/bind9/lib/bind/irs/gethostent_r.c stable/7/contrib/bind9/lib/bind/irs/getnetent.c stable/7/contrib/bind9/lib/bind/irs/getnetent_r.c stable/7/contrib/bind9/lib/bind/irs/getnetgrent.c stable/7/contrib/bind9/lib/bind/irs/getnetgrent_r.c stable/7/contrib/bind9/lib/bind/irs/getprotoent.c stable/7/contrib/bind9/lib/bind/irs/getprotoent_r.c stable/7/contrib/bind9/lib/bind/irs/getpwent.c stable/7/contrib/bind9/lib/bind/irs/getpwent_r.c stable/7/contrib/bind9/lib/bind/irs/getservent.c stable/7/contrib/bind9/lib/bind/irs/getservent_r.c stable/7/contrib/bind9/lib/bind/irs/hesiod.c stable/7/contrib/bind9/lib/bind/irs/hesiod_p.h stable/7/contrib/bind9/lib/bind/irs/irp.c stable/7/contrib/bind9/lib/bind/irs/irp_gr.c stable/7/contrib/bind9/lib/bind/irs/irp_ho.c stable/7/contrib/bind9/lib/bind/irs/irp_ng.c stable/7/contrib/bind9/lib/bind/irs/irp_nw.c stable/7/contrib/bind9/lib/bind/irs/irp_p.h stable/7/contrib/bind9/lib/bind/irs/irp_pr.c stable/7/contrib/bind9/lib/bind/irs/irp_pw.c stable/7/contrib/bind9/lib/bind/irs/irp_sv.c stable/7/contrib/bind9/lib/bind/irs/irpmarshall.c stable/7/contrib/bind9/lib/bind/irs/irs_data.c stable/7/contrib/bind9/lib/bind/irs/irs_data.h stable/7/contrib/bind9/lib/bind/irs/irs_p.h stable/7/contrib/bind9/lib/bind/irs/lcl.c stable/7/contrib/bind9/lib/bind/irs/lcl_gr.c stable/7/contrib/bind9/lib/bind/irs/lcl_ho.c stable/7/contrib/bind9/lib/bind/irs/lcl_ng.c stable/7/contrib/bind9/lib/bind/irs/lcl_nw.c stable/7/contrib/bind9/lib/bind/irs/lcl_p.h stable/7/contrib/bind9/lib/bind/irs/lcl_pr.c stable/7/contrib/bind9/lib/bind/irs/lcl_pw.c stable/7/contrib/bind9/lib/bind/irs/lcl_sv.c stable/7/contrib/bind9/lib/bind/irs/nis.c stable/7/contrib/bind9/lib/bind/irs/nis_gr.c stable/7/contrib/bind9/lib/bind/irs/nis_ho.c stable/7/contrib/bind9/lib/bind/irs/nis_ng.c stable/7/contrib/bind9/lib/bind/irs/nis_nw.c stable/7/contrib/bind9/lib/bind/irs/nis_p.h stable/7/contrib/bind9/lib/bind/irs/nis_pr.c stable/7/contrib/bind9/lib/bind/irs/nis_pw.c stable/7/contrib/bind9/lib/bind/irs/nis_sv.c stable/7/contrib/bind9/lib/bind/irs/nul_ng.c stable/7/contrib/bind9/lib/bind/irs/pathnames.h stable/7/contrib/bind9/lib/bind/irs/util.c stable/7/contrib/bind9/lib/bind/isc/Makefile.in stable/7/contrib/bind9/lib/bind/isc/assertions.c stable/7/contrib/bind9/lib/bind/isc/assertions.mdoc stable/7/contrib/bind9/lib/bind/isc/base64.c stable/7/contrib/bind9/lib/bind/isc/bitncmp.c stable/7/contrib/bind9/lib/bind/isc/bitncmp.mdoc stable/7/contrib/bind9/lib/bind/isc/ctl_clnt.c stable/7/contrib/bind9/lib/bind/isc/ctl_p.c stable/7/contrib/bind9/lib/bind/isc/ctl_srvr.c stable/7/contrib/bind9/lib/bind/isc/ev_connects.c stable/7/contrib/bind9/lib/bind/isc/ev_files.c stable/7/contrib/bind9/lib/bind/isc/ev_streams.c stable/7/contrib/bind9/lib/bind/isc/ev_timers.c stable/7/contrib/bind9/lib/bind/isc/ev_waits.c stable/7/contrib/bind9/lib/bind/isc/eventlib.c stable/7/contrib/bind9/lib/bind/isc/eventlib.mdoc stable/7/contrib/bind9/lib/bind/isc/eventlib_p.h stable/7/contrib/bind9/lib/bind/isc/heap.c stable/7/contrib/bind9/lib/bind/isc/heap.mdoc stable/7/contrib/bind9/lib/bind/isc/logging.c stable/7/contrib/bind9/lib/bind/isc/logging.mdoc stable/7/contrib/bind9/lib/bind/isc/memcluster.c stable/7/contrib/bind9/lib/bind/isc/memcluster.mdoc stable/7/contrib/bind9/lib/bind/isc/tree.c stable/7/contrib/bind9/lib/bind/isc/tree.mdoc stable/7/contrib/bind9/lib/bind/make/includes.in stable/7/contrib/bind9/lib/bind/make/rules.in stable/7/contrib/bind9/lib/bind/mkinstalldirs stable/7/contrib/bind9/lib/bind/nameser/Makefile.in stable/7/contrib/bind9/lib/bind/nameser/ns_date.c stable/7/contrib/bind9/lib/bind/nameser/ns_name.c stable/7/contrib/bind9/lib/bind/nameser/ns_netint.c stable/7/contrib/bind9/lib/bind/nameser/ns_parse.c stable/7/contrib/bind9/lib/bind/nameser/ns_print.c stable/7/contrib/bind9/lib/bind/nameser/ns_samedomain.c stable/7/contrib/bind9/lib/bind/nameser/ns_sign.c stable/7/contrib/bind9/lib/bind/nameser/ns_ttl.c stable/7/contrib/bind9/lib/bind/nameser/ns_verify.c stable/7/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in stable/7/contrib/bind9/lib/bind/resolv/Makefile.in stable/7/contrib/bind9/lib/bind/resolv/herror.c stable/7/contrib/bind9/lib/bind/resolv/res_comp.c stable/7/contrib/bind9/lib/bind/resolv/res_data.c stable/7/contrib/bind9/lib/bind/resolv/res_debug.c stable/7/contrib/bind9/lib/bind/resolv/res_findzonecut.c stable/7/contrib/bind9/lib/bind/resolv/res_init.c stable/7/contrib/bind9/lib/bind/resolv/res_mkquery.c stable/7/contrib/bind9/lib/bind/resolv/res_mkupdate.c stable/7/contrib/bind9/lib/bind/resolv/res_query.c stable/7/contrib/bind9/lib/bind/resolv/res_send.c stable/7/contrib/bind9/lib/bind/resolv/res_update.c stable/7/contrib/bind9/lib/bind9/Makefile.in stable/7/contrib/bind9/lib/bind9/check.c stable/7/contrib/bind9/lib/bind9/getaddresses.c stable/7/contrib/bind9/lib/bind9/include/Makefile.in stable/7/contrib/bind9/lib/bind9/include/bind9/Makefile.in stable/7/contrib/bind9/lib/bind9/include/bind9/check.h stable/7/contrib/bind9/lib/bind9/include/bind9/getaddresses.h stable/7/contrib/bind9/lib/bind9/include/bind9/version.h stable/7/contrib/bind9/lib/bind9/version.c stable/7/contrib/bind9/lib/dns/Makefile.in stable/7/contrib/bind9/lib/dns/acache.c stable/7/contrib/bind9/lib/dns/acl.c stable/7/contrib/bind9/lib/dns/adb.c stable/7/contrib/bind9/lib/dns/api stable/7/contrib/bind9/lib/dns/byaddr.c stable/7/contrib/bind9/lib/dns/cache.c stable/7/contrib/bind9/lib/dns/callbacks.c stable/7/contrib/bind9/lib/dns/compress.c stable/7/contrib/bind9/lib/dns/db.c stable/7/contrib/bind9/lib/dns/dbiterator.c stable/7/contrib/bind9/lib/dns/dbtable.c stable/7/contrib/bind9/lib/dns/diff.c stable/7/contrib/bind9/lib/dns/dispatch.c stable/7/contrib/bind9/lib/dns/dlz.c stable/7/contrib/bind9/lib/dns/dnssec.c stable/7/contrib/bind9/lib/dns/ds.c stable/7/contrib/bind9/lib/dns/dst_api.c stable/7/contrib/bind9/lib/dns/dst_internal.h stable/7/contrib/bind9/lib/dns/dst_lib.c stable/7/contrib/bind9/lib/dns/dst_openssl.h stable/7/contrib/bind9/lib/dns/dst_parse.c stable/7/contrib/bind9/lib/dns/dst_parse.h stable/7/contrib/bind9/lib/dns/dst_result.c stable/7/contrib/bind9/lib/dns/forward.c stable/7/contrib/bind9/lib/dns/gen-unix.h stable/7/contrib/bind9/lib/dns/gen.c stable/7/contrib/bind9/lib/dns/gssapi_link.c stable/7/contrib/bind9/lib/dns/gssapictx.c stable/7/contrib/bind9/lib/dns/hmac_link.c stable/7/contrib/bind9/lib/dns/include/Makefile.in stable/7/contrib/bind9/lib/dns/include/dns/Makefile.in stable/7/contrib/bind9/lib/dns/include/dns/acache.h stable/7/contrib/bind9/lib/dns/include/dns/acl.h stable/7/contrib/bind9/lib/dns/include/dns/adb.h stable/7/contrib/bind9/lib/dns/include/dns/bit.h stable/7/contrib/bind9/lib/dns/include/dns/byaddr.h stable/7/contrib/bind9/lib/dns/include/dns/cache.h stable/7/contrib/bind9/lib/dns/include/dns/callbacks.h stable/7/contrib/bind9/lib/dns/include/dns/cert.h stable/7/contrib/bind9/lib/dns/include/dns/compress.h stable/7/contrib/bind9/lib/dns/include/dns/db.h stable/7/contrib/bind9/lib/dns/include/dns/dbiterator.h stable/7/contrib/bind9/lib/dns/include/dns/dbtable.h stable/7/contrib/bind9/lib/dns/include/dns/diff.h stable/7/contrib/bind9/lib/dns/include/dns/dispatch.h stable/7/contrib/bind9/lib/dns/include/dns/dlz.h stable/7/contrib/bind9/lib/dns/include/dns/dnssec.h stable/7/contrib/bind9/lib/dns/include/dns/ds.h stable/7/contrib/bind9/lib/dns/include/dns/events.h stable/7/contrib/bind9/lib/dns/include/dns/fixedname.h stable/7/contrib/bind9/lib/dns/include/dns/forward.h stable/7/contrib/bind9/lib/dns/include/dns/journal.h stable/7/contrib/bind9/lib/dns/include/dns/keyflags.h stable/7/contrib/bind9/lib/dns/include/dns/keytable.h stable/7/contrib/bind9/lib/dns/include/dns/keyvalues.h stable/7/contrib/bind9/lib/dns/include/dns/lib.h stable/7/contrib/bind9/lib/dns/include/dns/log.h stable/7/contrib/bind9/lib/dns/include/dns/lookup.h stable/7/contrib/bind9/lib/dns/include/dns/master.h stable/7/contrib/bind9/lib/dns/include/dns/masterdump.h stable/7/contrib/bind9/lib/dns/include/dns/message.h stable/7/contrib/bind9/lib/dns/include/dns/name.h stable/7/contrib/bind9/lib/dns/include/dns/ncache.h stable/7/contrib/bind9/lib/dns/include/dns/nsec.h stable/7/contrib/bind9/lib/dns/include/dns/opcode.h stable/7/contrib/bind9/lib/dns/include/dns/order.h stable/7/contrib/bind9/lib/dns/include/dns/peer.h stable/7/contrib/bind9/lib/dns/include/dns/portlist.h stable/7/contrib/bind9/lib/dns/include/dns/rbt.h stable/7/contrib/bind9/lib/dns/include/dns/rcode.h stable/7/contrib/bind9/lib/dns/include/dns/rdata.h stable/7/contrib/bind9/lib/dns/include/dns/rdataclass.h stable/7/contrib/bind9/lib/dns/include/dns/rdatalist.h stable/7/contrib/bind9/lib/dns/include/dns/rdataset.h stable/7/contrib/bind9/lib/dns/include/dns/rdatasetiter.h stable/7/contrib/bind9/lib/dns/include/dns/rdataslab.h stable/7/contrib/bind9/lib/dns/include/dns/rdatatype.h stable/7/contrib/bind9/lib/dns/include/dns/request.h stable/7/contrib/bind9/lib/dns/include/dns/resolver.h stable/7/contrib/bind9/lib/dns/include/dns/result.h stable/7/contrib/bind9/lib/dns/include/dns/rootns.h stable/7/contrib/bind9/lib/dns/include/dns/sdb.h stable/7/contrib/bind9/lib/dns/include/dns/sdlz.h stable/7/contrib/bind9/lib/dns/include/dns/secalg.h stable/7/contrib/bind9/lib/dns/include/dns/secproto.h stable/7/contrib/bind9/lib/dns/include/dns/soa.h stable/7/contrib/bind9/lib/dns/include/dns/ssu.h stable/7/contrib/bind9/lib/dns/include/dns/stats.h stable/7/contrib/bind9/lib/dns/include/dns/tcpmsg.h stable/7/contrib/bind9/lib/dns/include/dns/time.h stable/7/contrib/bind9/lib/dns/include/dns/timer.h stable/7/contrib/bind9/lib/dns/include/dns/tkey.h stable/7/contrib/bind9/lib/dns/include/dns/tsig.h stable/7/contrib/bind9/lib/dns/include/dns/ttl.h stable/7/contrib/bind9/lib/dns/include/dns/types.h stable/7/contrib/bind9/lib/dns/include/dns/validator.h stable/7/contrib/bind9/lib/dns/include/dns/version.h stable/7/contrib/bind9/lib/dns/include/dns/view.h stable/7/contrib/bind9/lib/dns/include/dns/xfrin.h stable/7/contrib/bind9/lib/dns/include/dns/zone.h stable/7/contrib/bind9/lib/dns/include/dns/zonekey.h stable/7/contrib/bind9/lib/dns/include/dns/zt.h stable/7/contrib/bind9/lib/dns/include/dst/Makefile.in stable/7/contrib/bind9/lib/dns/include/dst/dst.h stable/7/contrib/bind9/lib/dns/include/dst/gssapi.h stable/7/contrib/bind9/lib/dns/include/dst/lib.h stable/7/contrib/bind9/lib/dns/include/dst/result.h stable/7/contrib/bind9/lib/dns/journal.c stable/7/contrib/bind9/lib/dns/key.c stable/7/contrib/bind9/lib/dns/keytable.c stable/7/contrib/bind9/lib/dns/lib.c stable/7/contrib/bind9/lib/dns/log.c stable/7/contrib/bind9/lib/dns/lookup.c stable/7/contrib/bind9/lib/dns/master.c stable/7/contrib/bind9/lib/dns/masterdump.c stable/7/contrib/bind9/lib/dns/message.c stable/7/contrib/bind9/lib/dns/name.c stable/7/contrib/bind9/lib/dns/ncache.c stable/7/contrib/bind9/lib/dns/nsec.c stable/7/contrib/bind9/lib/dns/openssl_link.c stable/7/contrib/bind9/lib/dns/openssldh_link.c stable/7/contrib/bind9/lib/dns/openssldsa_link.c stable/7/contrib/bind9/lib/dns/opensslrsa_link.c stable/7/contrib/bind9/lib/dns/order.c stable/7/contrib/bind9/lib/dns/peer.c stable/7/contrib/bind9/lib/dns/portlist.c stable/7/contrib/bind9/lib/dns/rbt.c stable/7/contrib/bind9/lib/dns/rbtdb.c stable/7/contrib/bind9/lib/dns/rbtdb.h stable/7/contrib/bind9/lib/dns/rbtdb64.c stable/7/contrib/bind9/lib/dns/rbtdb64.h stable/7/contrib/bind9/lib/dns/rcode.c stable/7/contrib/bind9/lib/dns/rdata.c stable/7/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c stable/7/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h stable/7/contrib/bind9/lib/dns/rdata/ch_3/a_1.c stable/7/contrib/bind9/lib/dns/rdata/ch_3/a_1.h stable/7/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c stable/7/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h stable/7/contrib/bind9/lib/dns/rdata/generic/cert_37.c stable/7/contrib/bind9/lib/dns/rdata/generic/cert_37.h stable/7/contrib/bind9/lib/dns/rdata/generic/cname_5.c stable/7/contrib/bind9/lib/dns/rdata/generic/cname_5.h stable/7/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c stable/7/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h stable/7/contrib/bind9/lib/dns/rdata/generic/dname_39.c stable/7/contrib/bind9/lib/dns/rdata/generic/dname_39.h stable/7/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c stable/7/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h stable/7/contrib/bind9/lib/dns/rdata/generic/ds_43.c stable/7/contrib/bind9/lib/dns/rdata/generic/ds_43.h stable/7/contrib/bind9/lib/dns/rdata/generic/gpos_27.c stable/7/contrib/bind9/lib/dns/rdata/generic/gpos_27.h stable/7/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c stable/7/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h stable/7/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c stable/7/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h stable/7/contrib/bind9/lib/dns/rdata/generic/isdn_20.c stable/7/contrib/bind9/lib/dns/rdata/generic/isdn_20.h stable/7/contrib/bind9/lib/dns/rdata/generic/key_25.c stable/7/contrib/bind9/lib/dns/rdata/generic/key_25.h stable/7/contrib/bind9/lib/dns/rdata/generic/loc_29.c stable/7/contrib/bind9/lib/dns/rdata/generic/loc_29.h stable/7/contrib/bind9/lib/dns/rdata/generic/mb_7.c stable/7/contrib/bind9/lib/dns/rdata/generic/mb_7.h stable/7/contrib/bind9/lib/dns/rdata/generic/md_3.c stable/7/contrib/bind9/lib/dns/rdata/generic/md_3.h stable/7/contrib/bind9/lib/dns/rdata/generic/mf_4.c stable/7/contrib/bind9/lib/dns/rdata/generic/mf_4.h stable/7/contrib/bind9/lib/dns/rdata/generic/mg_8.c stable/7/contrib/bind9/lib/dns/rdata/generic/mg_8.h stable/7/contrib/bind9/lib/dns/rdata/generic/minfo_14.c stable/7/contrib/bind9/lib/dns/rdata/generic/minfo_14.h stable/7/contrib/bind9/lib/dns/rdata/generic/mr_9.c stable/7/contrib/bind9/lib/dns/rdata/generic/mr_9.h stable/7/contrib/bind9/lib/dns/rdata/generic/mx_15.c stable/7/contrib/bind9/lib/dns/rdata/generic/mx_15.h stable/7/contrib/bind9/lib/dns/rdata/generic/ns_2.c stable/7/contrib/bind9/lib/dns/rdata/generic/ns_2.h stable/7/contrib/bind9/lib/dns/rdata/generic/nsec_47.c stable/7/contrib/bind9/lib/dns/rdata/generic/nsec_47.h stable/7/contrib/bind9/lib/dns/rdata/generic/null_10.c stable/7/contrib/bind9/lib/dns/rdata/generic/null_10.h stable/7/contrib/bind9/lib/dns/rdata/generic/nxt_30.c stable/7/contrib/bind9/lib/dns/rdata/generic/nxt_30.h stable/7/contrib/bind9/lib/dns/rdata/generic/opt_41.c stable/7/contrib/bind9/lib/dns/rdata/generic/opt_41.h stable/7/contrib/bind9/lib/dns/rdata/generic/proforma.c stable/7/contrib/bind9/lib/dns/rdata/generic/proforma.h stable/7/contrib/bind9/lib/dns/rdata/generic/ptr_12.c stable/7/contrib/bind9/lib/dns/rdata/generic/ptr_12.h stable/7/contrib/bind9/lib/dns/rdata/generic/rp_17.c stable/7/contrib/bind9/lib/dns/rdata/generic/rp_17.h stable/7/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c stable/7/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h stable/7/contrib/bind9/lib/dns/rdata/generic/rt_21.c stable/7/contrib/bind9/lib/dns/rdata/generic/rt_21.h stable/7/contrib/bind9/lib/dns/rdata/generic/sig_24.c stable/7/contrib/bind9/lib/dns/rdata/generic/sig_24.h stable/7/contrib/bind9/lib/dns/rdata/generic/soa_6.c stable/7/contrib/bind9/lib/dns/rdata/generic/soa_6.h stable/7/contrib/bind9/lib/dns/rdata/generic/spf_99.c stable/7/contrib/bind9/lib/dns/rdata/generic/spf_99.h stable/7/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c stable/7/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h stable/7/contrib/bind9/lib/dns/rdata/generic/tkey_249.c stable/7/contrib/bind9/lib/dns/rdata/generic/tkey_249.h stable/7/contrib/bind9/lib/dns/rdata/generic/txt_16.c stable/7/contrib/bind9/lib/dns/rdata/generic/txt_16.h stable/7/contrib/bind9/lib/dns/rdata/generic/unspec_103.c stable/7/contrib/bind9/lib/dns/rdata/generic/unspec_103.h stable/7/contrib/bind9/lib/dns/rdata/generic/x25_19.c stable/7/contrib/bind9/lib/dns/rdata/generic/x25_19.h stable/7/contrib/bind9/lib/dns/rdata/hs_4/a_1.c stable/7/contrib/bind9/lib/dns/rdata/hs_4/a_1.h stable/7/contrib/bind9/lib/dns/rdata/in_1/a6_38.c stable/7/contrib/bind9/lib/dns/rdata/in_1/a6_38.h stable/7/contrib/bind9/lib/dns/rdata/in_1/a_1.c stable/7/contrib/bind9/lib/dns/rdata/in_1/a_1.h stable/7/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c stable/7/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h stable/7/contrib/bind9/lib/dns/rdata/in_1/apl_42.c stable/7/contrib/bind9/lib/dns/rdata/in_1/apl_42.h stable/7/contrib/bind9/lib/dns/rdata/in_1/kx_36.c stable/7/contrib/bind9/lib/dns/rdata/in_1/kx_36.h stable/7/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c stable/7/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h stable/7/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c stable/7/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h stable/7/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c stable/7/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h stable/7/contrib/bind9/lib/dns/rdata/in_1/px_26.c stable/7/contrib/bind9/lib/dns/rdata/in_1/px_26.h stable/7/contrib/bind9/lib/dns/rdata/in_1/srv_33.c stable/7/contrib/bind9/lib/dns/rdata/in_1/srv_33.h stable/7/contrib/bind9/lib/dns/rdata/in_1/wks_11.c stable/7/contrib/bind9/lib/dns/rdata/in_1/wks_11.h stable/7/contrib/bind9/lib/dns/rdata/rdatastructpre.h stable/7/contrib/bind9/lib/dns/rdata/rdatastructsuf.h stable/7/contrib/bind9/lib/dns/rdatalist.c stable/7/contrib/bind9/lib/dns/rdatalist_p.h stable/7/contrib/bind9/lib/dns/rdataset.c stable/7/contrib/bind9/lib/dns/rdatasetiter.c stable/7/contrib/bind9/lib/dns/rdataslab.c stable/7/contrib/bind9/lib/dns/request.c stable/7/contrib/bind9/lib/dns/resolver.c stable/7/contrib/bind9/lib/dns/result.c stable/7/contrib/bind9/lib/dns/rootns.c stable/7/contrib/bind9/lib/dns/sdb.c stable/7/contrib/bind9/lib/dns/sdlz.c stable/7/contrib/bind9/lib/dns/soa.c stable/7/contrib/bind9/lib/dns/ssu.c stable/7/contrib/bind9/lib/dns/stats.c stable/7/contrib/bind9/lib/dns/tcpmsg.c stable/7/contrib/bind9/lib/dns/time.c stable/7/contrib/bind9/lib/dns/timer.c stable/7/contrib/bind9/lib/dns/tkey.c stable/7/contrib/bind9/lib/dns/tsig.c stable/7/contrib/bind9/lib/dns/ttl.c stable/7/contrib/bind9/lib/dns/validator.c stable/7/contrib/bind9/lib/dns/version.c stable/7/contrib/bind9/lib/dns/view.c stable/7/contrib/bind9/lib/dns/xfrin.c stable/7/contrib/bind9/lib/dns/zone.c stable/7/contrib/bind9/lib/dns/zonekey.c stable/7/contrib/bind9/lib/dns/zt.c stable/7/contrib/bind9/lib/isc/Makefile.in stable/7/contrib/bind9/lib/isc/alpha/Makefile.in stable/7/contrib/bind9/lib/isc/alpha/include/Makefile.in stable/7/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in stable/7/contrib/bind9/lib/isc/alpha/include/isc/atomic.h stable/7/contrib/bind9/lib/isc/assertions.c stable/7/contrib/bind9/lib/isc/base64.c stable/7/contrib/bind9/lib/isc/bitstring.c stable/7/contrib/bind9/lib/isc/buffer.c stable/7/contrib/bind9/lib/isc/bufferlist.c stable/7/contrib/bind9/lib/isc/commandline.c stable/7/contrib/bind9/lib/isc/entropy.c stable/7/contrib/bind9/lib/isc/error.c stable/7/contrib/bind9/lib/isc/event.c stable/7/contrib/bind9/lib/isc/fsaccess.c stable/7/contrib/bind9/lib/isc/hash.c stable/7/contrib/bind9/lib/isc/heap.c stable/7/contrib/bind9/lib/isc/hex.c stable/7/contrib/bind9/lib/isc/hmacmd5.c stable/7/contrib/bind9/lib/isc/hmacsha.c stable/7/contrib/bind9/lib/isc/ia64/Makefile.in stable/7/contrib/bind9/lib/isc/ia64/include/Makefile.in stable/7/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in stable/7/contrib/bind9/lib/isc/ia64/include/isc/atomic.h stable/7/contrib/bind9/lib/isc/include/Makefile.in stable/7/contrib/bind9/lib/isc/include/isc/Makefile.in stable/7/contrib/bind9/lib/isc/include/isc/app.h stable/7/contrib/bind9/lib/isc/include/isc/assertions.h stable/7/contrib/bind9/lib/isc/include/isc/base64.h stable/7/contrib/bind9/lib/isc/include/isc/bitstring.h stable/7/contrib/bind9/lib/isc/include/isc/boolean.h stable/7/contrib/bind9/lib/isc/include/isc/buffer.h stable/7/contrib/bind9/lib/isc/include/isc/bufferlist.h stable/7/contrib/bind9/lib/isc/include/isc/commandline.h stable/7/contrib/bind9/lib/isc/include/isc/entropy.h stable/7/contrib/bind9/lib/isc/include/isc/error.h stable/7/contrib/bind9/lib/isc/include/isc/event.h stable/7/contrib/bind9/lib/isc/include/isc/eventclass.h stable/7/contrib/bind9/lib/isc/include/isc/file.h stable/7/contrib/bind9/lib/isc/include/isc/formatcheck.h stable/7/contrib/bind9/lib/isc/include/isc/fsaccess.h stable/7/contrib/bind9/lib/isc/include/isc/hash.h stable/7/contrib/bind9/lib/isc/include/isc/heap.h stable/7/contrib/bind9/lib/isc/include/isc/hex.h stable/7/contrib/bind9/lib/isc/include/isc/hmacmd5.h stable/7/contrib/bind9/lib/isc/include/isc/hmacsha.h stable/7/contrib/bind9/lib/isc/include/isc/interfaceiter.h stable/7/contrib/bind9/lib/isc/include/isc/ipv6.h stable/7/contrib/bind9/lib/isc/include/isc/lang.h stable/7/contrib/bind9/lib/isc/include/isc/lex.h stable/7/contrib/bind9/lib/isc/include/isc/lfsr.h stable/7/contrib/bind9/lib/isc/include/isc/lib.h stable/7/contrib/bind9/lib/isc/include/isc/list.h stable/7/contrib/bind9/lib/isc/include/isc/log.h stable/7/contrib/bind9/lib/isc/include/isc/magic.h stable/7/contrib/bind9/lib/isc/include/isc/md5.h stable/7/contrib/bind9/lib/isc/include/isc/mem.h stable/7/contrib/bind9/lib/isc/include/isc/msgcat.h stable/7/contrib/bind9/lib/isc/include/isc/msgs.h stable/7/contrib/bind9/lib/isc/include/isc/mutexblock.h stable/7/contrib/bind9/lib/isc/include/isc/netaddr.h stable/7/contrib/bind9/lib/isc/include/isc/netscope.h stable/7/contrib/bind9/lib/isc/include/isc/ondestroy.h stable/7/contrib/bind9/lib/isc/include/isc/os.h stable/7/contrib/bind9/lib/isc/include/isc/parseint.h stable/7/contrib/bind9/lib/isc/include/isc/platform.h.in stable/7/contrib/bind9/lib/isc/include/isc/portset.h stable/7/contrib/bind9/lib/isc/include/isc/print.h stable/7/contrib/bind9/lib/isc/include/isc/quota.h stable/7/contrib/bind9/lib/isc/include/isc/random.h stable/7/contrib/bind9/lib/isc/include/isc/ratelimiter.h stable/7/contrib/bind9/lib/isc/include/isc/refcount.h stable/7/contrib/bind9/lib/isc/include/isc/region.h stable/7/contrib/bind9/lib/isc/include/isc/resource.h stable/7/contrib/bind9/lib/isc/include/isc/result.h stable/7/contrib/bind9/lib/isc/include/isc/resultclass.h stable/7/contrib/bind9/lib/isc/include/isc/rwlock.h stable/7/contrib/bind9/lib/isc/include/isc/serial.h stable/7/contrib/bind9/lib/isc/include/isc/sha1.h stable/7/contrib/bind9/lib/isc/include/isc/sha2.h stable/7/contrib/bind9/lib/isc/include/isc/sockaddr.h stable/7/contrib/bind9/lib/isc/include/isc/socket.h stable/7/contrib/bind9/lib/isc/include/isc/stdio.h stable/7/contrib/bind9/lib/isc/include/isc/stdlib.h stable/7/contrib/bind9/lib/isc/include/isc/string.h stable/7/contrib/bind9/lib/isc/include/isc/symtab.h stable/7/contrib/bind9/lib/isc/include/isc/task.h stable/7/contrib/bind9/lib/isc/include/isc/taskpool.h stable/7/contrib/bind9/lib/isc/include/isc/timer.h stable/7/contrib/bind9/lib/isc/include/isc/types.h stable/7/contrib/bind9/lib/isc/include/isc/util.h stable/7/contrib/bind9/lib/isc/include/isc/version.h stable/7/contrib/bind9/lib/isc/inet_aton.c stable/7/contrib/bind9/lib/isc/inet_ntop.c stable/7/contrib/bind9/lib/isc/inet_pton.c stable/7/contrib/bind9/lib/isc/lex.c stable/7/contrib/bind9/lib/isc/lfsr.c stable/7/contrib/bind9/lib/isc/lib.c stable/7/contrib/bind9/lib/isc/log.c stable/7/contrib/bind9/lib/isc/md5.c stable/7/contrib/bind9/lib/isc/mem.c stable/7/contrib/bind9/lib/isc/mips/Makefile.in stable/7/contrib/bind9/lib/isc/mips/include/Makefile.in stable/7/contrib/bind9/lib/isc/mips/include/isc/Makefile.in stable/7/contrib/bind9/lib/isc/mips/include/isc/atomic.h stable/7/contrib/bind9/lib/isc/mutexblock.c stable/7/contrib/bind9/lib/isc/netaddr.c stable/7/contrib/bind9/lib/isc/netscope.c stable/7/contrib/bind9/lib/isc/nls/Makefile.in stable/7/contrib/bind9/lib/isc/nls/msgcat.c stable/7/contrib/bind9/lib/isc/noatomic/Makefile.in stable/7/contrib/bind9/lib/isc/noatomic/include/Makefile.in stable/7/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in stable/7/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h stable/7/contrib/bind9/lib/isc/nothreads/Makefile.in stable/7/contrib/bind9/lib/isc/nothreads/condition.c stable/7/contrib/bind9/lib/isc/nothreads/include/Makefile.in stable/7/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in stable/7/contrib/bind9/lib/isc/nothreads/include/isc/condition.h stable/7/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h stable/7/contrib/bind9/lib/isc/nothreads/include/isc/once.h stable/7/contrib/bind9/lib/isc/nothreads/include/isc/thread.h stable/7/contrib/bind9/lib/isc/nothreads/mutex.c stable/7/contrib/bind9/lib/isc/nothreads/thread.c stable/7/contrib/bind9/lib/isc/ondestroy.c stable/7/contrib/bind9/lib/isc/parseint.c stable/7/contrib/bind9/lib/isc/portset.c stable/7/contrib/bind9/lib/isc/powerpc/Makefile.in stable/7/contrib/bind9/lib/isc/powerpc/include/Makefile.in stable/7/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in stable/7/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h stable/7/contrib/bind9/lib/isc/print.c stable/7/contrib/bind9/lib/isc/pthreads/Makefile.in stable/7/contrib/bind9/lib/isc/pthreads/condition.c stable/7/contrib/bind9/lib/isc/pthreads/include/Makefile.in stable/7/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in stable/7/contrib/bind9/lib/isc/pthreads/include/isc/condition.h stable/7/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h stable/7/contrib/bind9/lib/isc/pthreads/include/isc/once.h stable/7/contrib/bind9/lib/isc/pthreads/include/isc/thread.h stable/7/contrib/bind9/lib/isc/pthreads/mutex.c stable/7/contrib/bind9/lib/isc/pthreads/thread.c stable/7/contrib/bind9/lib/isc/quota.c stable/7/contrib/bind9/lib/isc/random.c stable/7/contrib/bind9/lib/isc/ratelimiter.c stable/7/contrib/bind9/lib/isc/refcount.c stable/7/contrib/bind9/lib/isc/region.c stable/7/contrib/bind9/lib/isc/result.c stable/7/contrib/bind9/lib/isc/rwlock.c stable/7/contrib/bind9/lib/isc/serial.c stable/7/contrib/bind9/lib/isc/sha1.c stable/7/contrib/bind9/lib/isc/sha2.c stable/7/contrib/bind9/lib/isc/sockaddr.c stable/7/contrib/bind9/lib/isc/sparc64/Makefile.in stable/7/contrib/bind9/lib/isc/sparc64/include/Makefile.in stable/7/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in stable/7/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h stable/7/contrib/bind9/lib/isc/string.c stable/7/contrib/bind9/lib/isc/strtoul.c stable/7/contrib/bind9/lib/isc/symtab.c stable/7/contrib/bind9/lib/isc/task.c stable/7/contrib/bind9/lib/isc/task_p.h stable/7/contrib/bind9/lib/isc/taskpool.c stable/7/contrib/bind9/lib/isc/timer.c stable/7/contrib/bind9/lib/isc/timer_p.h stable/7/contrib/bind9/lib/isc/unix/Makefile.in stable/7/contrib/bind9/lib/isc/unix/app.c stable/7/contrib/bind9/lib/isc/unix/dir.c stable/7/contrib/bind9/lib/isc/unix/entropy.c stable/7/contrib/bind9/lib/isc/unix/errno2result.c stable/7/contrib/bind9/lib/isc/unix/errno2result.h stable/7/contrib/bind9/lib/isc/unix/file.c stable/7/contrib/bind9/lib/isc/unix/fsaccess.c stable/7/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c stable/7/contrib/bind9/lib/isc/unix/ifiter_ioctl.c stable/7/contrib/bind9/lib/isc/unix/ifiter_sysctl.c stable/7/contrib/bind9/lib/isc/unix/include/Makefile.in stable/7/contrib/bind9/lib/isc/unix/include/isc/Makefile.in stable/7/contrib/bind9/lib/isc/unix/include/isc/dir.h stable/7/contrib/bind9/lib/isc/unix/include/isc/int.h stable/7/contrib/bind9/lib/isc/unix/include/isc/keyboard.h stable/7/contrib/bind9/lib/isc/unix/include/isc/net.h stable/7/contrib/bind9/lib/isc/unix/include/isc/netdb.h stable/7/contrib/bind9/lib/isc/unix/include/isc/offset.h stable/7/contrib/bind9/lib/isc/unix/include/isc/stat.h stable/7/contrib/bind9/lib/isc/unix/include/isc/stdtime.h stable/7/contrib/bind9/lib/isc/unix/include/isc/strerror.h stable/7/contrib/bind9/lib/isc/unix/include/isc/syslog.h stable/7/contrib/bind9/lib/isc/unix/include/isc/time.h stable/7/contrib/bind9/lib/isc/unix/interfaceiter.c stable/7/contrib/bind9/lib/isc/unix/ipv6.c stable/7/contrib/bind9/lib/isc/unix/keyboard.c stable/7/contrib/bind9/lib/isc/unix/net.c stable/7/contrib/bind9/lib/isc/unix/os.c stable/7/contrib/bind9/lib/isc/unix/resource.c stable/7/contrib/bind9/lib/isc/unix/socket.c stable/7/contrib/bind9/lib/isc/unix/socket_p.h stable/7/contrib/bind9/lib/isc/unix/stdio.c stable/7/contrib/bind9/lib/isc/unix/stdtime.c stable/7/contrib/bind9/lib/isc/unix/strerror.c stable/7/contrib/bind9/lib/isc/unix/syslog.c stable/7/contrib/bind9/lib/isc/unix/time.c stable/7/contrib/bind9/lib/isc/version.c stable/7/contrib/bind9/lib/isc/x86_32/Makefile.in stable/7/contrib/bind9/lib/isc/x86_32/include/Makefile.in stable/7/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in stable/7/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h stable/7/contrib/bind9/lib/isc/x86_64/Makefile.in stable/7/contrib/bind9/lib/isc/x86_64/include/Makefile.in stable/7/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in stable/7/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h stable/7/contrib/bind9/lib/isccc/Makefile.in stable/7/contrib/bind9/lib/isccc/alist.c stable/7/contrib/bind9/lib/isccc/base64.c stable/7/contrib/bind9/lib/isccc/cc.c stable/7/contrib/bind9/lib/isccc/ccmsg.c stable/7/contrib/bind9/lib/isccc/include/Makefile.in stable/7/contrib/bind9/lib/isccc/include/isccc/Makefile.in stable/7/contrib/bind9/lib/isccc/include/isccc/alist.h stable/7/contrib/bind9/lib/isccc/include/isccc/base64.h stable/7/contrib/bind9/lib/isccc/include/isccc/cc.h stable/7/contrib/bind9/lib/isccc/include/isccc/ccmsg.h stable/7/contrib/bind9/lib/isccc/include/isccc/events.h stable/7/contrib/bind9/lib/isccc/include/isccc/lib.h stable/7/contrib/bind9/lib/isccc/include/isccc/result.h stable/7/contrib/bind9/lib/isccc/include/isccc/sexpr.h stable/7/contrib/bind9/lib/isccc/include/isccc/symtab.h stable/7/contrib/bind9/lib/isccc/include/isccc/symtype.h stable/7/contrib/bind9/lib/isccc/include/isccc/types.h stable/7/contrib/bind9/lib/isccc/include/isccc/util.h stable/7/contrib/bind9/lib/isccc/include/isccc/version.h stable/7/contrib/bind9/lib/isccc/lib.c stable/7/contrib/bind9/lib/isccc/result.c stable/7/contrib/bind9/lib/isccc/sexpr.c stable/7/contrib/bind9/lib/isccc/symtab.c stable/7/contrib/bind9/lib/isccc/version.c stable/7/contrib/bind9/lib/isccfg/Makefile.in stable/7/contrib/bind9/lib/isccfg/aclconf.c stable/7/contrib/bind9/lib/isccfg/include/Makefile.in stable/7/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in stable/7/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h stable/7/contrib/bind9/lib/isccfg/include/isccfg/cfg.h stable/7/contrib/bind9/lib/isccfg/include/isccfg/grammar.h stable/7/contrib/bind9/lib/isccfg/include/isccfg/log.h stable/7/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h stable/7/contrib/bind9/lib/isccfg/include/isccfg/version.h stable/7/contrib/bind9/lib/isccfg/log.c stable/7/contrib/bind9/lib/isccfg/namedconf.c stable/7/contrib/bind9/lib/isccfg/parser.c stable/7/contrib/bind9/lib/isccfg/version.c stable/7/contrib/bind9/lib/lwres/Makefile.in stable/7/contrib/bind9/lib/lwres/assert_p.h stable/7/contrib/bind9/lib/lwres/context.c stable/7/contrib/bind9/lib/lwres/context_p.h stable/7/contrib/bind9/lib/lwres/gai_strerror.c stable/7/contrib/bind9/lib/lwres/getaddrinfo.c stable/7/contrib/bind9/lib/lwres/gethost.c stable/7/contrib/bind9/lib/lwres/getipnode.c stable/7/contrib/bind9/lib/lwres/getnameinfo.c stable/7/contrib/bind9/lib/lwres/getrrset.c stable/7/contrib/bind9/lib/lwres/herror.c stable/7/contrib/bind9/lib/lwres/include/Makefile.in stable/7/contrib/bind9/lib/lwres/include/lwres/Makefile.in stable/7/contrib/bind9/lib/lwres/include/lwres/context.h stable/7/contrib/bind9/lib/lwres/include/lwres/int.h stable/7/contrib/bind9/lib/lwres/include/lwres/ipv6.h stable/7/contrib/bind9/lib/lwres/include/lwres/lang.h stable/7/contrib/bind9/lib/lwres/include/lwres/list.h stable/7/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h stable/7/contrib/bind9/lib/lwres/include/lwres/lwpacket.h stable/7/contrib/bind9/lib/lwres/include/lwres/lwres.h stable/7/contrib/bind9/lib/lwres/include/lwres/netdb.h.in stable/7/contrib/bind9/lib/lwres/include/lwres/platform.h.in stable/7/contrib/bind9/lib/lwres/include/lwres/result.h stable/7/contrib/bind9/lib/lwres/include/lwres/stdlib.h stable/7/contrib/bind9/lib/lwres/include/lwres/version.h stable/7/contrib/bind9/lib/lwres/lwbuffer.c stable/7/contrib/bind9/lib/lwres/lwconfig.c stable/7/contrib/bind9/lib/lwres/lwinetaton.c stable/7/contrib/bind9/lib/lwres/lwinetntop.c stable/7/contrib/bind9/lib/lwres/lwinetpton.c stable/7/contrib/bind9/lib/lwres/lwpacket.c stable/7/contrib/bind9/lib/lwres/lwres_gabn.c stable/7/contrib/bind9/lib/lwres/lwres_gnba.c stable/7/contrib/bind9/lib/lwres/lwres_grbn.c stable/7/contrib/bind9/lib/lwres/lwres_noop.c stable/7/contrib/bind9/lib/lwres/lwresutil.c stable/7/contrib/bind9/lib/lwres/man/Makefile.in stable/7/contrib/bind9/lib/lwres/man/lwres.3 stable/7/contrib/bind9/lib/lwres/man/lwres.docbook stable/7/contrib/bind9/lib/lwres/man/lwres.html stable/7/contrib/bind9/lib/lwres/man/lwres_buffer.3 stable/7/contrib/bind9/lib/lwres/man/lwres_buffer.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_buffer.html stable/7/contrib/bind9/lib/lwres/man/lwres_config.3 stable/7/contrib/bind9/lib/lwres/man/lwres_config.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_config.html stable/7/contrib/bind9/lib/lwres/man/lwres_context.3 stable/7/contrib/bind9/lib/lwres/man/lwres_context.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_context.html stable/7/contrib/bind9/lib/lwres/man/lwres_gabn.3 stable/7/contrib/bind9/lib/lwres/man/lwres_gabn.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_gabn.html stable/7/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3 stable/7/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html stable/7/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3 stable/7/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html stable/7/contrib/bind9/lib/lwres/man/lwres_gethostent.3 stable/7/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_gethostent.html stable/7/contrib/bind9/lib/lwres/man/lwres_getipnode.3 stable/7/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_getipnode.html stable/7/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3 stable/7/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html stable/7/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3 stable/7/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html stable/7/contrib/bind9/lib/lwres/man/lwres_gnba.3 stable/7/contrib/bind9/lib/lwres/man/lwres_gnba.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_gnba.html stable/7/contrib/bind9/lib/lwres/man/lwres_hstrerror.3 stable/7/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_hstrerror.html stable/7/contrib/bind9/lib/lwres/man/lwres_inetntop.3 stable/7/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_inetntop.html stable/7/contrib/bind9/lib/lwres/man/lwres_noop.3 stable/7/contrib/bind9/lib/lwres/man/lwres_noop.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_noop.html stable/7/contrib/bind9/lib/lwres/man/lwres_packet.3 stable/7/contrib/bind9/lib/lwres/man/lwres_packet.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_packet.html stable/7/contrib/bind9/lib/lwres/man/lwres_resutil.3 stable/7/contrib/bind9/lib/lwres/man/lwres_resutil.docbook stable/7/contrib/bind9/lib/lwres/man/lwres_resutil.html stable/7/contrib/bind9/lib/lwres/print.c stable/7/contrib/bind9/lib/lwres/print_p.h stable/7/contrib/bind9/lib/lwres/strtoul.c stable/7/contrib/bind9/lib/lwres/unix/Makefile.in stable/7/contrib/bind9/lib/lwres/unix/include/Makefile.in stable/7/contrib/bind9/lib/lwres/unix/include/lwres/Makefile.in stable/7/contrib/bind9/lib/lwres/unix/include/lwres/net.h stable/7/contrib/bind9/lib/lwres/version.c stable/7/contrib/bind9/make/Makefile.in stable/7/contrib/bind9/make/includes.in stable/7/contrib/bind9/make/rules.in stable/7/contrib/bind9/mkinstalldirs stable/7/contrib/bind9/release-notes.css stable/7/contrib/bind9/version Directory Properties: stable/7/contrib/bind9/ (props changed) Modified: stable/7/contrib/bind9/CHANGES ============================================================================== --- stable/7/contrib/bind9/CHANGES Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/CHANGES Sat May 28 00:58:19 2011 (r222399) @@ -1,3 +1,14 @@ + --- 9.4-ESV-R4-P1 released --- + +3121. [security] An authoritative name server sending a negative + response containing a very large RRset could + trigger an off-by-one error in the ncache code + and crash named. [RT #24650] + +3120. [bug] Named could fail to validate zones listed in a DLV + that validated insecure without using DLV and had + DS records in the parent zone. [RT #24631] + --- 9.4-ESV-R4 released --- 2970. [security] Adding a NO DATA negative cache entry failed to clear Modified: stable/7/contrib/bind9/COPYRIGHT ============================================================================== --- stable/7/contrib/bind9/COPYRIGHT Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/COPYRIGHT Sat May 28 00:58:19 2011 (r222399) @@ -13,7 +13,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -$Id: COPYRIGHT,v 1.9.18.7 2010/01/07 23:46:07 tbox Exp $ +$Id: COPYRIGHT,v 1.9.18.7 2010-01-07 23:46:07 tbox Exp $ Portions Copyright (C) 1996-2001 Nominum, Inc. Modified: stable/7/contrib/bind9/FAQ.xml ============================================================================== --- stable/7/contrib/bind9/FAQ.xml Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/FAQ.xml Sat May 28 00:58:19 2011 (r222399) @@ -17,7 +17,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> - +
Frequently Asked Questions about BIND 9 Modified: stable/7/contrib/bind9/Makefile.in ============================================================================== --- stable/7/contrib/bind9/Makefile.in Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/Makefile.in Sat May 28 00:58:19 2011 (r222399) @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.43.18.8 2009/02/20 23:46:01 tbox Exp $ +# $Id: Makefile.in,v 1.43.18.8 2009-02-20 23:46:01 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ Modified: stable/7/contrib/bind9/README.idnkit ============================================================================== --- stable/7/contrib/bind9/README.idnkit Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/README.idnkit Sat May 28 00:58:19 2011 (r222399) @@ -109,4 +109,4 @@ about idnkit and this patch. Bug reports and comments on this kit should be sent to mdnkit-bugs@nic.ad.jp and idn-cmt@nic.ad.jp, respectively. -; $Id: README.idnkit,v 1.2.2.3 2009/01/19 00:36:25 marka Exp $ +; $Id: README.idnkit,v 1.2.2.3 2009-01-19 00:36:25 marka Exp $ Modified: stable/7/contrib/bind9/acconfig.h ============================================================================== --- stable/7/contrib/bind9/acconfig.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/acconfig.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: acconfig.h,v 1.44.18.7 2008/12/01 23:45:56 tbox Exp $ */ +/* $Id: acconfig.h,v 1.44.18.7 2008-12-01 23:45:56 tbox Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/Makefile.in ============================================================================== --- stable/7/contrib/bind9/bin/Makefile.in Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/Makefile.in Sat May 28 00:58:19 2011 (r222399) @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.23 2004/03/05 04:57:10 marka Exp $ +# $Id: Makefile.in,v 1.23 2004-03-05 04:57:10 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ Modified: stable/7/contrib/bind9/bin/check/Makefile.in ============================================================================== --- stable/7/contrib/bind9/bin/check/Makefile.in Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/check/Makefile.in Sat May 28 00:58:19 2011 (r222399) @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.24.18.6 2006/06/09 00:54:08 marka Exp $ +# $Id: Makefile.in,v 1.24.18.6 2006-06-09 00:54:08 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ Modified: stable/7/contrib/bind9/bin/check/check-tool.c ============================================================================== --- stable/7/contrib/bind9/bin/check/check-tool.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/check/check-tool.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check-tool.c,v 1.10.18.23 2009/09/24 21:38:50 jinmei Exp $ */ +/* $Id: check-tool.c,v 1.10.18.23 2009-09-24 21:38:50 jinmei Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/check/check-tool.h ============================================================================== --- stable/7/contrib/bind9/bin/check/check-tool.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/check/check-tool.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check-tool.h,v 1.7.18.4 2005/06/20 01:19:25 marka Exp $ */ +/* $Id: check-tool.h,v 1.7.18.4 2005-06-20 01:19:25 marka Exp $ */ #ifndef CHECK_TOOL_H #define CHECK_TOOL_H Modified: stable/7/contrib/bind9/bin/check/named-checkconf.8 ============================================================================== --- stable/7/contrib/bind9/bin/check/named-checkconf.8 Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/check/named-checkconf.8 Sat May 28 00:58:19 2011 (r222399) @@ -13,7 +13,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: named-checkconf.8,v 1.16.18.14 2009/07/11 01:31:43 tbox Exp $ +.\" $Id: named-checkconf.8,v 1.16.18.14 2009-07-11 01:31:43 tbox Exp $ .\" .hy 0 .ad l Modified: stable/7/contrib/bind9/bin/check/named-checkconf.c ============================================================================== --- stable/7/contrib/bind9/bin/check/named-checkconf.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/check/named-checkconf.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named-checkconf.c,v 1.28.18.18 2009/02/16 23:46:03 tbox Exp $ */ +/* $Id: named-checkconf.c,v 1.28.18.18 2009-02-16 23:46:03 tbox Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/check/named-checkconf.docbook ============================================================================== --- stable/7/contrib/bind9/bin/check/named-checkconf.docbook Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/check/named-checkconf.docbook Sat May 28 00:58:19 2011 (r222399) @@ -18,7 +18,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> - + June 14, 2000 Modified: stable/7/contrib/bind9/bin/check/named-checkconf.html ============================================================================== --- stable/7/contrib/bind9/bin/check/named-checkconf.html Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/check/named-checkconf.html Sat May 28 00:58:19 2011 (r222399) @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + Modified: stable/7/contrib/bind9/bin/check/named-checkzone.8 ============================================================================== --- stable/7/contrib/bind9/bin/check/named-checkzone.8 Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/check/named-checkzone.8 Sat May 28 00:58:19 2011 (r222399) @@ -13,7 +13,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: named-checkzone.8,v 1.18.18.25 2009/07/11 01:31:43 tbox Exp $ +.\" $Id: named-checkzone.8,v 1.18.18.25 2009-07-11 01:31:43 tbox Exp $ .\" .hy 0 .ad l Modified: stable/7/contrib/bind9/bin/check/named-checkzone.c ============================================================================== --- stable/7/contrib/bind9/bin/check/named-checkzone.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/check/named-checkzone.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named-checkzone.c,v 1.29.18.24 2009/05/29 02:19:20 marka Exp $ */ +/* $Id: named-checkzone.c,v 1.29.18.24 2009-05-29 02:19:20 marka Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/check/named-checkzone.docbook ============================================================================== --- stable/7/contrib/bind9/bin/check/named-checkzone.docbook Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/check/named-checkzone.docbook Sat May 28 00:58:19 2011 (r222399) @@ -18,7 +18,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> - + June 13, 2000 Modified: stable/7/contrib/bind9/bin/check/named-checkzone.html ============================================================================== --- stable/7/contrib/bind9/bin/check/named-checkzone.html Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/check/named-checkzone.html Sat May 28 00:58:19 2011 (r222399) @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + Modified: stable/7/contrib/bind9/bin/dig/Makefile.in ============================================================================== --- stable/7/contrib/bind9/bin/dig/Makefile.in Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dig/Makefile.in Sat May 28 00:58:19 2011 (r222399) @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.33.18.6 2005/09/09 14:11:04 marka Exp $ +# $Id: Makefile.in,v 1.33.18.6 2005-09-09 14:11:04 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ Modified: stable/7/contrib/bind9/bin/dig/dig.1 ============================================================================== --- stable/7/contrib/bind9/bin/dig/dig.1 Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dig/dig.1 Sat May 28 00:58:19 2011 (r222399) @@ -13,7 +13,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: dig.1,v 1.23.18.27 2009/07/11 01:31:43 tbox Exp $ +.\" $Id: dig.1,v 1.23.18.27 2009-07-11 01:31:43 tbox Exp $ .\" .hy 0 .ad l Modified: stable/7/contrib/bind9/bin/dig/dig.c ============================================================================== --- stable/7/contrib/bind9/bin/dig/dig.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dig/dig.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dig.c,v 1.186.18.37 2009/05/06 10:21:00 fdupont Exp $ */ +/* $Id: dig.c,v 1.186.18.37 2009-05-06 10:21:00 fdupont Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/dig/dig.docbook ============================================================================== --- stable/7/contrib/bind9/bin/dig/dig.docbook Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dig/dig.docbook Sat May 28 00:58:19 2011 (r222399) @@ -18,7 +18,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> - + Modified: stable/7/contrib/bind9/bin/dig/dig.html ============================================================================== --- stable/7/contrib/bind9/bin/dig/dig.html Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dig/dig.html Sat May 28 00:58:19 2011 (r222399) @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + Modified: stable/7/contrib/bind9/bin/dig/dighost.c ============================================================================== --- stable/7/contrib/bind9/bin/dig/dighost.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dig/dighost.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.259.18.58 2009/06/24 03:44:52 marka Exp $ */ +/* $Id: dighost.c,v 1.259.18.58 2009-06-24 03:44:52 marka Exp $ */ /*! \file * \note Modified: stable/7/contrib/bind9/bin/dig/host.1 ============================================================================== --- stable/7/contrib/bind9/bin/dig/host.1 Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dig/host.1 Sat May 28 00:58:19 2011 (r222399) @@ -13,7 +13,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: host.1,v 1.14.18.18 2009/07/11 01:31:44 tbox Exp $ +.\" $Id: host.1,v 1.14.18.18 2009-07-11 01:31:44 tbox Exp $ .\" .hy 0 .ad l Modified: stable/7/contrib/bind9/bin/dig/host.c ============================================================================== --- stable/7/contrib/bind9/bin/dig/host.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dig/host.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: host.c,v 1.94.18.22 2009/09/08 23:29:03 marka Exp $ */ +/* $Id: host.c,v 1.94.18.22 2009-09-08 23:29:03 marka Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/dig/host.docbook ============================================================================== --- stable/7/contrib/bind9/bin/dig/host.docbook Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dig/host.docbook Sat May 28 00:58:19 2011 (r222399) @@ -18,7 +18,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> - + Modified: stable/7/contrib/bind9/bin/dig/host.html ============================================================================== --- stable/7/contrib/bind9/bin/dig/host.html Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dig/host.html Sat May 28 00:58:19 2011 (r222399) @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + Modified: stable/7/contrib/bind9/bin/dig/include/dig/dig.h ============================================================================== --- stable/7/contrib/bind9/bin/dig/include/dig/dig.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dig/include/dig/dig.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dig.h,v 1.82.18.25 2008/12/16 23:46:02 tbox Exp $ */ +/* $Id: dig.h,v 1.82.18.25 2008-12-16 23:46:02 tbox Exp $ */ #ifndef DIG_H #define DIG_H Modified: stable/7/contrib/bind9/bin/dig/nslookup.1 ============================================================================== --- stable/7/contrib/bind9/bin/dig/nslookup.1 Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dig/nslookup.1 Sat May 28 00:58:19 2011 (r222399) @@ -12,7 +12,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: nslookup.1,v 1.1.10.15 2009/07/11 01:31:44 tbox Exp $ +.\" $Id: nslookup.1,v 1.1.10.15 2009-07-11 01:31:44 tbox Exp $ .\" .hy 0 .ad l Modified: stable/7/contrib/bind9/bin/dig/nslookup.c ============================================================================== --- stable/7/contrib/bind9/bin/dig/nslookup.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dig/nslookup.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nslookup.c,v 1.101.18.20 2009/05/06 23:45:59 tbox Exp $ */ +/* $Id: nslookup.c,v 1.101.18.20 2009-05-06 23:45:59 tbox Exp $ */ #include Modified: stable/7/contrib/bind9/bin/dig/nslookup.docbook ============================================================================== --- stable/7/contrib/bind9/bin/dig/nslookup.docbook Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dig/nslookup.docbook Sat May 28 00:58:19 2011 (r222399) @@ -17,7 +17,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> - + - + Modified: stable/7/contrib/bind9/bin/dnssec/Makefile.in ============================================================================== --- stable/7/contrib/bind9/bin/dnssec/Makefile.in Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dnssec/Makefile.in Sat May 28 00:58:19 2011 (r222399) @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.26.18.4 2005/05/02 00:26:11 marka Exp $ +# $Id: Makefile.in,v 1.26.18.4 2005-05-02 00:26:11 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ Modified: stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.8 ============================================================================== --- stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.8 Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.8 Sat May 28 00:58:19 2011 (r222399) @@ -13,7 +13,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: dnssec-keygen.8,v 1.23.18.17 2009/07/11 01:31:44 tbox Exp $ +.\" $Id: dnssec-keygen.8,v 1.23.18.17 2009-07-11 01:31:44 tbox Exp $ .\" .hy 0 .ad l Modified: stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.c ============================================================================== --- stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.c Sat May 28 00:58:19 2011 (r222399) @@ -16,7 +16,7 @@ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-keygen.c,v 1.66.18.10 2007/08/28 07:19:55 tbox Exp $ */ +/* $Id: dnssec-keygen.c,v 1.66.18.10 2007-08-28 07:19:55 tbox Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.docbook ============================================================================== --- stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.docbook Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.docbook Sat May 28 00:58:19 2011 (r222399) @@ -18,7 +18,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> - + June 30, 2000 Modified: stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.html ============================================================================== --- stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.html Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dnssec/dnssec-keygen.html Sat May 28 00:58:19 2011 (r222399) @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + Modified: stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.8 ============================================================================== --- stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.8 Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.8 Sat May 28 00:58:19 2011 (r222399) @@ -13,7 +13,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: dnssec-signzone.8,v 1.28.18.20 2009/07/11 01:31:44 tbox Exp $ +.\" $Id: dnssec-signzone.8,v 1.28.18.20 2009-07-11 01:31:44 tbox Exp $ .\" .hy 0 .ad l Modified: stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.c ============================================================================== --- stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.c Sat May 28 00:58:19 2011 (r222399) @@ -16,7 +16,7 @@ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-signzone.c,v 1.177.18.29 2009/07/21 06:44:32 tbox Exp $ */ +/* $Id: dnssec-signzone.c,v 1.177.18.29 2009-07-21 06:44:32 tbox Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.docbook ============================================================================== --- stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.docbook Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.docbook Sat May 28 00:58:19 2011 (r222399) @@ -18,7 +18,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> - + June 30, 2000 Modified: stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.html ============================================================================== --- stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.html Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dnssec/dnssec-signzone.html Sat May 28 00:58:19 2011 (r222399) @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + Modified: stable/7/contrib/bind9/bin/dnssec/dnssectool.c ============================================================================== --- stable/7/contrib/bind9/bin/dnssec/dnssectool.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dnssec/dnssectool.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssectool.c,v 1.40.18.3 2005/07/01 03:55:28 marka Exp $ */ +/* $Id: dnssectool.c,v 1.40.18.3 2005-07-01 03:55:28 marka Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/dnssec/dnssectool.h ============================================================================== --- stable/7/contrib/bind9/bin/dnssec/dnssectool.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/dnssec/dnssectool.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssectool.h,v 1.18 2004/03/05 04:57:41 marka Exp $ */ +/* $Id: dnssectool.h,v 1.18 2004-03-05 04:57:41 marka Exp $ */ #ifndef DNSSECTOOL_H #define DNSSECTOOL_H 1 Modified: stable/7/contrib/bind9/bin/named/Makefile.in ============================================================================== --- stable/7/contrib/bind9/bin/named/Makefile.in Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/Makefile.in Sat May 28 00:58:19 2011 (r222399) @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.80.18.7 2005/09/05 00:18:10 marka Exp $ +# $Id: Makefile.in,v 1.80.18.7 2005-09-05 00:18:10 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ Modified: stable/7/contrib/bind9/bin/named/builtin.c ============================================================================== --- stable/7/contrib/bind9/bin/named/builtin.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/builtin.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: builtin.c,v 1.5.18.5 2005/08/23 04:12:38 marka Exp $ */ +/* $Id: builtin.c,v 1.5.18.5 2005-08-23 04:12:38 marka Exp $ */ /*! \file * \brief Modified: stable/7/contrib/bind9/bin/named/client.c ============================================================================== --- stable/7/contrib/bind9/bin/named/client.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/client.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.c,v 1.219.18.33 2009/01/19 23:46:14 tbox Exp $ */ +/* $Id: client.c,v 1.219.18.33 2009-01-19 23:46:14 tbox Exp $ */ #include Modified: stable/7/contrib/bind9/bin/named/config.c ============================================================================== --- stable/7/contrib/bind9/bin/named/config.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/config.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: config.c,v 1.47.18.35 2008/09/04 08:03:07 marka Exp $ */ +/* $Id: config.c,v 1.47.18.35 2008-09-04 08:03:07 marka Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/control.c ============================================================================== --- stable/7/contrib/bind9/bin/named/control.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/control.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: control.c,v 1.20.10.12 2009/07/11 23:46:06 tbox Exp $ */ +/* $Id: control.c,v 1.20.10.12 2009-07-11 23:46:06 tbox Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/controlconf.c ============================================================================== --- stable/7/contrib/bind9/bin/named/controlconf.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/controlconf.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: controlconf.c,v 1.40.18.14 2008/07/23 23:33:02 marka Exp $ */ +/* $Id: controlconf.c,v 1.40.18.14 2008-07-23 23:33:02 marka Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/include/named/builtin.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/builtin.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/builtin.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: builtin.h,v 1.2.18.2 2005/04/29 00:15:34 marka Exp $ */ +/* $Id: builtin.h,v 1.2.18.2 2005-04-29 00:15:34 marka Exp $ */ #ifndef NAMED_BUILTIN_H #define NAMED_BUILTIN_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/client.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/client.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/client.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.h,v 1.69.18.11 2009/01/19 23:46:14 tbox Exp $ */ +/* $Id: client.h,v 1.69.18.11 2009-01-19 23:46:14 tbox Exp $ */ #ifndef NAMED_CLIENT_H #define NAMED_CLIENT_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/config.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/config.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/config.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: config.h,v 1.6.18.6 2006/02/28 03:10:47 marka Exp $ */ +/* $Id: config.h,v 1.6.18.6 2006-02-28 03:10:47 marka Exp $ */ #ifndef NAMED_CONFIG_H #define NAMED_CONFIG_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/control.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/control.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/control.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: control.h,v 1.14.18.8 2006/03/09 23:46:20 marka Exp $ */ +/* $Id: control.h,v 1.14.18.8 2006-03-09 23:46:20 marka Exp $ */ #ifndef NAMED_CONTROL_H #define NAMED_CONTROL_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/globals.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/globals.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/globals.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: globals.h,v 1.64.18.6 2008/10/24 01:43:17 tbox Exp $ */ +/* $Id: globals.h,v 1.64.18.6 2008-10-24 01:43:17 tbox Exp $ */ #ifndef NAMED_GLOBALS_H #define NAMED_GLOBALS_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/interfacemgr.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/interfacemgr.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/interfacemgr.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: interfacemgr.h,v 1.26.18.4 2005/04/27 05:00:35 sra Exp $ */ +/* $Id: interfacemgr.h,v 1.26.18.4 2005-04-27 05:00:35 sra Exp $ */ #ifndef NAMED_INTERFACEMGR_H #define NAMED_INTERFACEMGR_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/listenlist.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/listenlist.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/listenlist.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: listenlist.h,v 1.11.18.2 2005/04/29 00:15:34 marka Exp $ */ +/* $Id: listenlist.h,v 1.11.18.2 2005-04-29 00:15:34 marka Exp $ */ #ifndef NAMED_LISTENLIST_H #define NAMED_LISTENLIST_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/log.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/log.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/log.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.h,v 1.21.18.4 2009/09/24 23:46:06 tbox Exp $ */ +/* $Id: log.h,v 1.21.18.4 2009-09-24 23:46:06 tbox Exp $ */ #ifndef NAMED_LOG_H #define NAMED_LOG_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/logconf.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/logconf.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/logconf.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: logconf.h,v 1.11.18.4 2006/03/02 00:37:21 marka Exp $ */ +/* $Id: logconf.h,v 1.11.18.4 2006-03-02 00:37:21 marka Exp $ */ #ifndef NAMED_LOGCONF_H #define NAMED_LOGCONF_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/lwaddr.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/lwaddr.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/lwaddr.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwaddr.h,v 1.4.18.2 2005/04/29 00:15:35 marka Exp $ */ +/* $Id: lwaddr.h,v 1.4.18.2 2005-04-29 00:15:35 marka Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/include/named/lwdclient.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/lwdclient.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/lwdclient.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwdclient.h,v 1.14.18.4 2009/01/19 23:46:14 tbox Exp $ */ +/* $Id: lwdclient.h,v 1.14.18.4 2009-01-19 23:46:14 tbox Exp $ */ #ifndef NAMED_LWDCLIENT_H #define NAMED_LWDCLIENT_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/lwresd.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/lwresd.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/lwresd.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwresd.h,v 1.13.18.4 2006/03/02 00:37:21 marka Exp $ */ +/* $Id: lwresd.h,v 1.13.18.4 2006-03-02 00:37:21 marka Exp $ */ #ifndef NAMED_LWRESD_H #define NAMED_LWRESD_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/lwsearch.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/lwsearch.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/lwsearch.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwsearch.h,v 1.5.18.2 2005/04/29 00:15:36 marka Exp $ */ +/* $Id: lwsearch.h,v 1.5.18.2 2005-04-29 00:15:36 marka Exp $ */ #ifndef NAMED_LWSEARCH_H #define NAMED_LWSEARCH_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/main.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/main.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/main.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: main.h,v 1.11.18.2 2005/04/29 00:15:37 marka Exp $ */ +/* $Id: main.h,v 1.11.18.2 2005-04-29 00:15:37 marka Exp $ */ #ifndef NAMED_MAIN_H #define NAMED_MAIN_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/notify.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/notify.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/notify.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: notify.h,v 1.10.18.4 2009/01/19 23:46:14 tbox Exp $ */ +/* $Id: notify.h,v 1.10.18.4 2009-01-19 23:46:14 tbox Exp $ */ #ifndef NAMED_NOTIFY_H #define NAMED_NOTIFY_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/ns_smf_globals.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/ns_smf_globals.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/ns_smf_globals.h Sat May 28 00:58:19 2011 (r222399) @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ns_smf_globals.h,v 1.2.2.4 2005/05/13 01:32:46 marka Exp $ */ +/* $Id: ns_smf_globals.h,v 1.2.2.4 2005-05-13 01:32:46 marka Exp $ */ #ifndef NS_SMF_GLOBALS_H #define NS_SMF_GLOBALS_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/query.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/query.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/query.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.h,v 1.36.18.2 2005/04/29 00:15:37 marka Exp $ */ +/* $Id: query.h,v 1.36.18.2 2005-04-29 00:15:37 marka Exp $ */ #ifndef NAMED_QUERY_H #define NAMED_QUERY_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/server.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/server.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/server.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: server.h,v 1.73.18.10 2009/07/11 23:46:06 tbox Exp $ */ +/* $Id: server.h,v 1.73.18.10 2009-07-11 23:46:06 tbox Exp $ */ #ifndef NAMED_SERVER_H #define NAMED_SERVER_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/sortlist.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/sortlist.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/sortlist.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sortlist.h,v 1.5.18.4 2006/03/02 00:37:21 marka Exp $ */ +/* $Id: sortlist.h,v 1.5.18.4 2006-03-02 00:37:21 marka Exp $ */ #ifndef NAMED_SORTLIST_H #define NAMED_SORTLIST_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/tkeyconf.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/tkeyconf.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/tkeyconf.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tkeyconf.h,v 1.10.18.4 2006/03/02 00:37:21 marka Exp $ */ +/* $Id: tkeyconf.h,v 1.10.18.4 2006-03-02 00:37:21 marka Exp $ */ #ifndef NS_TKEYCONF_H #define NS_TKEYCONF_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/tsigconf.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/tsigconf.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/tsigconf.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tsigconf.h,v 1.10.18.4 2006/03/02 00:37:21 marka Exp $ */ +/* $Id: tsigconf.h,v 1.10.18.4 2006-03-02 00:37:21 marka Exp $ */ #ifndef NS_TSIGCONF_H #define NS_TSIGCONF_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/types.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/types.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/types.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: types.h,v 1.21.18.2 2005/04/29 00:15:38 marka Exp $ */ +/* $Id: types.h,v 1.21.18.2 2005-04-29 00:15:38 marka Exp $ */ #ifndef NAMED_TYPES_H #define NAMED_TYPES_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/update.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/update.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/update.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: update.h,v 1.9.18.2 2005/04/29 00:15:39 marka Exp $ */ +/* $Id: update.h,v 1.9.18.2 2005-04-29 00:15:39 marka Exp $ */ #ifndef NAMED_UPDATE_H #define NAMED_UPDATE_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/xfrout.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/xfrout.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/xfrout.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: xfrout.h,v 1.8.18.2 2005/04/29 00:15:39 marka Exp $ */ +/* $Id: xfrout.h,v 1.8.18.2 2005-04-29 00:15:39 marka Exp $ */ #ifndef NAMED_XFROUT_H #define NAMED_XFROUT_H 1 Modified: stable/7/contrib/bind9/bin/named/include/named/zoneconf.h ============================================================================== --- stable/7/contrib/bind9/bin/named/include/named/zoneconf.h Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/include/named/zoneconf.h Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zoneconf.h,v 1.19.18.5 2006/03/02 00:37:21 marka Exp $ */ +/* $Id: zoneconf.h,v 1.19.18.5 2006-03-02 00:37:21 marka Exp $ */ #ifndef NS_ZONECONF_H #define NS_ZONECONF_H 1 Modified: stable/7/contrib/bind9/bin/named/interfacemgr.c ============================================================================== --- stable/7/contrib/bind9/bin/named/interfacemgr.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/interfacemgr.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: interfacemgr.c,v 1.76.18.13 2009/01/19 23:46:14 tbox Exp $ */ +/* $Id: interfacemgr.c,v 1.76.18.13 2009-01-19 23:46:14 tbox Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/listenlist.c ============================================================================== --- stable/7/contrib/bind9/bin/named/listenlist.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/listenlist.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: listenlist.c,v 1.10.18.2 2005/04/29 00:15:22 marka Exp $ */ +/* $Id: listenlist.c,v 1.10.18.2 2005-04-29 00:15:22 marka Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/log.c ============================================================================== --- stable/7/contrib/bind9/bin/named/log.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/log.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.c,v 1.37.18.9 2009/09/24 21:38:50 jinmei Exp $ */ +/* $Id: log.c,v 1.37.18.9 2009-09-24 21:38:50 jinmei Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/logconf.c ============================================================================== --- stable/7/contrib/bind9/bin/named/logconf.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/logconf.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: logconf.c,v 1.35.18.5 2006/03/02 00:37:21 marka Exp $ */ +/* $Id: logconf.c,v 1.35.18.5 2006-03-02 00:37:21 marka Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/lwaddr.c ============================================================================== --- stable/7/contrib/bind9/bin/named/lwaddr.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/lwaddr.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwaddr.c,v 1.4.18.4 2008/01/11 23:45:59 tbox Exp $ */ +/* $Id: lwaddr.c,v 1.4.18.4 2008-01-11 23:45:59 tbox Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/lwdclient.c ============================================================================== --- stable/7/contrib/bind9/bin/named/lwdclient.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/lwdclient.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwdclient.c,v 1.17.18.2 2005/04/29 00:15:23 marka Exp $ */ +/* $Id: lwdclient.c,v 1.17.18.2 2005-04-29 00:15:23 marka Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/lwderror.c ============================================================================== --- stable/7/contrib/bind9/bin/named/lwderror.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/lwderror.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwderror.c,v 1.8.18.2 2005/04/29 00:15:24 marka Exp $ */ +/* $Id: lwderror.c,v 1.8.18.2 2005-04-29 00:15:24 marka Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/lwdgabn.c ============================================================================== --- stable/7/contrib/bind9/bin/named/lwdgabn.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/lwdgabn.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwdgabn.c,v 1.15.18.5 2006/03/02 00:37:21 marka Exp $ */ +/* $Id: lwdgabn.c,v 1.15.18.5 2006-03-02 00:37:21 marka Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/lwdgnba.c ============================================================================== --- stable/7/contrib/bind9/bin/named/lwdgnba.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/lwdgnba.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwdgnba.c,v 1.16.18.4 2008/01/14 23:45:59 tbox Exp $ */ +/* $Id: lwdgnba.c,v 1.16.18.4 2008-01-14 23:45:59 tbox Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/lwdgrbn.c ============================================================================== --- stable/7/contrib/bind9/bin/named/lwdgrbn.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/lwdgrbn.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwdgrbn.c,v 1.13.18.5 2006/12/07 23:57:58 marka Exp $ */ +/* $Id: lwdgrbn.c,v 1.13.18.5 2006-12-07 23:57:58 marka Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/lwdnoop.c ============================================================================== --- stable/7/contrib/bind9/bin/named/lwdnoop.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/lwdnoop.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwdnoop.c,v 1.7.18.4 2008/01/22 23:27:05 tbox Exp $ */ +/* $Id: lwdnoop.c,v 1.7.18.4 2008-01-22 23:27:05 tbox Exp $ */ /*! \file */ Modified: stable/7/contrib/bind9/bin/named/lwresd.8 ============================================================================== --- stable/7/contrib/bind9/bin/named/lwresd.8 Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/lwresd.8 Sat May 28 00:58:19 2011 (r222399) @@ -13,7 +13,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: lwresd.8,v 1.15.18.15 2009/07/11 01:31:44 tbox Exp $ +.\" $Id: lwresd.8,v 1.15.18.15 2009-07-11 01:31:44 tbox Exp $ .\" .hy 0 .ad l Modified: stable/7/contrib/bind9/bin/named/lwresd.c ============================================================================== --- stable/7/contrib/bind9/bin/named/lwresd.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/lwresd.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwresd.c,v 1.46.18.10 2008/07/23 23:33:02 marka Exp $ */ +/* $Id: lwresd.c,v 1.46.18.10 2008-07-23 23:33:02 marka Exp $ */ /*! \file * \brief Modified: stable/7/contrib/bind9/bin/named/lwresd.docbook ============================================================================== --- stable/7/contrib/bind9/bin/named/lwresd.docbook Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/lwresd.docbook Sat May 28 00:58:19 2011 (r222399) @@ -18,7 +18,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> - + June 30, 2000 Modified: stable/7/contrib/bind9/bin/named/lwresd.html ============================================================================== --- stable/7/contrib/bind9/bin/named/lwresd.html Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/lwresd.html Sat May 28 00:58:19 2011 (r222399) @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> - + Modified: stable/7/contrib/bind9/bin/named/lwsearch.c ============================================================================== --- stable/7/contrib/bind9/bin/named/lwsearch.c Sat May 28 00:46:16 2011 (r222398) +++ stable/7/contrib/bind9/bin/named/lwsearch.c Sat May 28 00:58:19 2011 (r222399) @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwsearch.c,v 1.8.18.3 2005/07/12 01:22:17 marka Exp $ */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***