upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 10:01:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'v9_9' of ssh://repo/proj/git/prod/bind9 into v9_9

Browse source
This commit is contained in:
Evan Hunt 2013-01-23 15:49:35 -08:00
commit 30b5f39a1a
12 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/dnssec/dnssec-signzone.c
View file

@ -1,5 +1,5 @@
/*
* Portions Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

2
bin/dnssec/dnssectool.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004, 2005, 2007, 2009-2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005, 2007, 2009-2013 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001, 2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

3
bin/named/named.docbook
View file

@ -2,7 +2,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[<!ENTITY mdash "&#8212;">]>
<!--
- Copyright (C) 2004-2009, 2011 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2004-2009, 2011, 2013 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2000, 2001, 2003 Internet Software Consortium.
-
- Permission to use, copy, modify, and/or distribute this software for any
@ -44,6 +44,7 @@
<year>2008</year>
<year>2009</year>
<year>2011</year>
<year>2013</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright>
<copyright>

2
bin/tests/system/verify/tests.sh
View file

@ -1,4 +1,4 @@
# Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2012, 2013 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

2
bin/tests/system/verify/zones/genzones.sh
View file

@ -1,4 +1,4 @@
# Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2012, 2013 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

2
bin/tests/system/xfer/clean.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (C) 2004, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004, 2007, 2011-2013 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000, 2001 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any

2
bin/tests/system/xfer/ns2/named.conf
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005, 2007, 2013 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

14
bin/tests/system/xfer/ns2/slave.db.in
View file

@ -1,3 +1,17 @@
; Copyright (C) 2013 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
; copyright notice and this permission notice appear in all copies.
;
; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
$TTL 5
@ IN SOA ns1 hostmaster 1 5 5 5 5

2
bin/tests/system/xfer/setup.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (C) 2004, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004, 2007, 2011-2013 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2001, 2002 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any

2
bin/tests/system/xfer/tests.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (C) 2004, 2005, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004, 2005, 2007, 2011-2013 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000, 2001 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any

3
configure vendored
View file

@ -19434,6 +19434,9 @@ $as_echo "#define ATF_TEST 1" >>confdefs.h
STD_CINCLUDES="$STD_CINCLUDES -I$atf/include"
ATFBIN="$atf/bin"
ATFLIBS="-L$atf/lib -latf-c"
if test "$want_openssl_hash" = yes; then
ATFLIBS="-L$atf/lib -latf-c $DNS_CRYPTO_LIBS"
fi
UNITTESTS=tests
fi

19
util/copyrights
View file

@ -108,14 +108,14 @@
./bin/dnssec/dnssec-settime.docbook SGML 2009,2010,2011
./bin/dnssec/dnssec-settime.html HTML DOCBOOK
./bin/dnssec/dnssec-signzone.8 MAN DOCBOOK
./bin/dnssec/dnssec-signzone.c C.NAI 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
./bin/dnssec/dnssec-signzone.c C.NAI 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
./bin/dnssec/dnssec-signzone.docbook SGML 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011
./bin/dnssec/dnssec-signzone.html HTML DOCBOOK
./bin/dnssec/dnssec-verify.8 MAN 2012
./bin/dnssec/dnssec-verify.c C 2012
./bin/dnssec/dnssec-verify.docbook SGML 2012
./bin/dnssec/dnssec-verify.html HTML DOCBOOK
./bin/dnssec/dnssectool.c C 2000,2001,2003,2004,2005,2007,2009,2010,2011,2012
./bin/dnssec/dnssectool.c C 2000,2001,2003,2004,2005,2007,2009,2010,2011,2012,2013
./bin/dnssec/dnssectool.h C 2000,2001,2003,2004,2007,2008,2009,2010,2011,2012
./bin/dnssec/win32/dnssectool.dsp X 2006,2009
./bin/dnssec/win32/dnssectool.dsw X 2006,2009
@ -201,7 +201,7 @@
./bin/named/named.conf.5 MAN DOCBOOK
./bin/named/named.conf.docbook SGML 2004,2005,2006,2007,2008,2009,2010,2011
./bin/named/named.conf.html HTML DOCBOOK
./bin/named/named.docbook SGML 2000,2001,2003,2004,2005,2006,2007,2008,2009,2011
./bin/named/named.docbook SGML 2000,2001,2003,2004,2005,2006,2007,2008,2009,2011,2013
./bin/named/named.html HTML DOCBOOK
./bin/named/notify.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007
./bin/named/query.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
@ -1420,8 +1420,8 @@
./bin/tests/system/verify/.gitignore X 2012
./bin/tests/system/verify/clean.sh SH 2012
./bin/tests/system/verify/setup.sh SH 2012
./bin/tests/system/verify/tests.sh SH 2012
./bin/tests/system/verify/zones/genzones.sh SH 2012
./bin/tests/system/verify/tests.sh SH 2012,2013
./bin/tests/system/verify/zones/genzones.sh SH 2012,2013
./bin/tests/system/verify/zones/unsigned.db ZONE 2012
./bin/tests/system/views/clean.sh SH 2000,2001,2004,2005,2007,2012
./bin/tests/system/views/ns1/named.conf CONF-C 2000,2001,2004,2007
@ -1459,20 +1459,21 @@
./bin/tests/system/xfer/ans5/unknownkey X 2011
./bin/tests/system/xfer/ans5/unsigned X 2011
./bin/tests/system/xfer/ans5/wrongkey X 2011
./bin/tests/system/xfer/clean.sh SH 2000,2001,2004,2007,2011,2012
./bin/tests/system/xfer/clean.sh SH 2000,2001,2004,2007,2011,2012,2013
./bin/tests/system/xfer/dig1.good X 2000,2001,2003,2004,2009,2011,2012,2013
./bin/tests/system/xfer/dig2.good X 2000,2001,2003,2004,2009,2011,2012,2013
./bin/tests/system/xfer/ns1/named.conf CONF-C 2000,2001,2004,2007,2011
./bin/tests/system/xfer/ns1/root.db ZONE 2000,2001,2004,2007
./bin/tests/system/xfer/ns2/named.conf CONF-C 2000,2001,2004,2005,2007
./bin/tests/system/xfer/ns2/named.conf CONF-C 2000,2001,2004,2005,2007,2013
./bin/tests/system/xfer/ns2/slave.db.in ZONE 2013
./bin/tests/system/xfer/ns3/named.conf CONF-C 2000,2001,2004,2007,2011
./bin/tests/system/xfer/ns4/named.conf.base CONF-C 2011
./bin/tests/system/xfer/ns4/root.db.in ZONE 2011
./bin/tests/system/xfer/ns6/named.conf CONF-C 2011
./bin/tests/system/xfer/ns7/named.conf CONF-C 2011
./bin/tests/system/xfer/prereq.sh SH 2011,2012
./bin/tests/system/xfer/setup.sh SH 2001,2002,2004,2007,2011,2012
./bin/tests/system/xfer/tests.sh SH 2000,2001,2004,2005,2007,2011,2012
./bin/tests/system/xfer/setup.sh SH 2001,2002,2004,2007,2011,2012,2013
./bin/tests/system/xfer/tests.sh SH 2000,2001,2004,2005,2007,2011,2012,2013
./bin/tests/system/xferquota/clean.sh SH 2000,2001,2004,2007,2012
./bin/tests/system/xferquota/ns1/changing1.db ZONE 2000,2001,2004,2007
./bin/tests/system/xferquota/ns1/changing2.db ZONE 2000,2001,2004,2007