upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-19 23:38:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

update copyright notice

Browse source
This commit is contained in:
Automatic Updater 2012-02-09 23:45:25 +00:00
parent f3cf288e6f
commit 3d264c70a3
9 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/tests/system/resolver/clean.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (C) 2008, 2010, 2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2008, 2010-2012 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.1.84.7 2012/02/09 21:05:29 marka Exp $
# $Id: clean.sh,v 1.1.84.8 2012/02/09 23:45:25 tbox Exp $
#
# Clean up after resolver tests.

4
bin/tests/system/resolver/ns4/named.conf
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010, 2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2010-2012 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named.conf,v 1.2.6.5 2012/02/09 21:05:29 marka Exp $ */
/* $Id: named.conf,v 1.2.6.6 2012/02/09 23:45:25 tbox Exp $ */
// NS4

4
bin/tests/system/resolver/ns4/tld1.db
View file

@ -1,4 +1,4 @@
; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
; Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
@ -12,7 +12,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; $Id: tld1.db,v 1.2.8.2 2012/02/09 21:05:29 marka Exp $
; $Id: tld1.db,v 1.2.8.3 2012/02/09 23:45:25 tbox Exp $
$TTL 300
@ IN SOA marka.isc.org. ns.server. (

4
bin/tests/system/resolver/ns4/tld2.db
View file

@ -1,4 +1,4 @@
; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
; Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
@ -12,7 +12,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; $Id: tld2.db,v 1.2.8.2 2012/02/09 21:05:29 marka Exp $
; $Id: tld2.db,v 1.2.8.3 2012/02/09 23:45:25 tbox Exp $
$TTL 300
@ IN SOA marka.isc.org. ns.server. (

4
bin/tests/system/resolver/ns6/named.conf
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2010, 2012 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named.conf,v 1.2.6.3 2012/02/09 21:05:29 marka Exp $ */
/* $Id: named.conf,v 1.2.6.4 2012/02/09 23:45:25 tbox Exp $ */
// NS4

4
bin/tests/system/resolver/ns6/to-be-removed.tld.db.in
View file

@ -1,4 +1,4 @@
; Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC")
; Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
@ -12,7 +12,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; $Id: to-be-removed.tld.db.in,v 1.2.8.2 2012/02/09 21:05:29 marka Exp $
; $Id: to-be-removed.tld.db.in,v 1.2.8.3 2012/02/09 23:45:25 tbox Exp $
$TTL 600
@ IN SOA ns hostmaster 1 1800 900 604800 600

4
bin/tests/system/resolver/setup.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh -e
#
# Copyright (C) 2010, 2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2010-2012 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: setup.sh,v 1.2.6.7 2012/02/09 21:05:29 marka Exp $
# $Id: setup.sh,v 1.2.6.8 2012/02/09 23:45:25 tbox Exp $
../../genrandom 400 random.data

4
bin/tests/system/resolver/tests.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (C) 2004, 2007, 2010, 2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004, 2007, 2010-2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000, 2001 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any
@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.9.332.10 2012/02/09 21:05:29 marka Exp $
# $Id: tests.sh,v 1.9.332.11 2012/02/09 23:45:25 tbox Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh

4
lib/dns/rbtdb.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: rbtdb.c,v 1.270.12.42 2012/02/09 21:05:29 marka Exp $ */
/* $Id: rbtdb.c,v 1.270.12.43 2012/02/09 23:45:25 tbox Exp $ */
/*! \file */
@ -5739,7 +5739,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
* If we have will be replacing a NS RRset force its TTL
* to be no more than the current NS RRset's TTL. This
* ensures the delegations that are withdrawn are honoured.
*/
*/
if (IS_CACHE(rbtdb) && header->rdh_ttl > now &&
header->type == dns_rdatatype_ns &&
!header_nx && !newheader_nx &&