mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of repo.isc.org:/proj/git/prod/bind9

Browse Source
This commit is contained in:
Mark Andrews
2012-10-07 11:35:56 +11:00
parent 20783a3baf 698f23be46
commit 1721e1f2a6
9 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/rbt/t_rbt.c
View File

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

2
bin/tests/system/dlzexternal/driver.c
View File

@@ -377,7 +377,7 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) {
int i;
UNUSED(zone);
if (state->putnamedrr == NULL)
return (ISC_R_NOTIMPLEMENTED);

2
bin/tests/system/dnssec/ns3/secure.example.db.in
View File

@@ -1,4 +1,4 @@
; Copyright (C) 2004, 2007, 2008, 2010 Internet Systems Consortium, Inc. ("ISC")
; Copyright (C) 2004, 2007, 2008, 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

2
bin/tests/system/lwresd/lwtest.c
View File

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

2
doc/private/SRCID
View File

@@ -1,4 +1,4 @@
# This file must follow /bin/sh rules. It is imported directly via
# configure.
#
SRCID="( 2012/10/06 05:15:00 UTC )"
SRCID="( 2012/10/07 00:15:00 UTC )"

4
lib/dns/gssapictx.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-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
@@ -602,7 +602,7 @@ dst_gssapi_initctx(dns_name_t *name, isc_buffer_t *intoken,
*err_message);
else
gss_log(3, "Failure initiating security context");
result = ISC_R_FAILURE;
goto out;
}

2
lib/dns/include/dns/name.h
View File

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

30
lib/lwres/getrrset.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005, 2007, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -21,12 +21,12 @@
/**
* DESCRIPTION
*
*
* lwres_getrrsetbyname() gets a set of resource records associated with
* a hostname, class, and type. hostname is a pointer a to
* null-terminated string. The flags field is currently unused and must
* be zero.
*
*
* After a successful call to lwres_getrrsetbyname(), *res is a pointer
* to an #rrsetinfo structure, containing a list of one or more #rdatainfo
* structures containing resource records and potentially another list of
@@ -37,7 +37,7 @@
* in uncompressed DNS wire format. Properties of the rdataset are
* represented in the #rri_flags bitfield. If the #RRSET_VALIDATED bit is
* set, the data has been DNSSEC validated and the signatures verified.
*
*
* All of the information returned by lwres_getrrsetbyname() is
* dynamically allocated: the rrsetinfo and rdatainfo structures, and the
* canonical host name strings pointed to by the rrsetinfostructure.
@@ -45,15 +45,15 @@
* successful call to lwres_getrrsetbyname() is released by
* lwres_freerrset(). rrset is a pointer to a struct rrset created by a
* call to lwres_getrrsetbyname().
*
*
* The following structures are used:
*
*
* \code
* struct rdatainfo {
* unsigned int rdi_length; // length of data
* unsigned char *rdi_data; // record data
* };
*
*
* struct rrsetinfo {
* unsigned int rri_flags; // RRSET_VALIDATED...
* unsigned int rri_rdclass; // class number
@@ -66,23 +66,23 @@
* struct rdatainfo *rri_sigs; // individual signatures
* };
* \endcode
*
*
* \section getrrset_return Return Values
*
*
* lwres_getrrsetbyname() returns zero on success, and one of the
* following error codes if an error occurred:
*
*
* \li #ERRSET_NONAME: the name does not exist
*
*
* \li #ERRSET_NODATA:
* the name exists, but does not have data of the desired type
*
*
* \li #ERRSET_NOMEMORY:
* memory could not be allocated
*
*
* \li #ERRSET_INVAL:
* a parameter is invalid
*
*
* \li #ERRSET_FAIL:
* other failure
*/
@@ -179,7 +179,7 @@ lwres_getrrsetbyname(const char *hostname, unsigned int rdclass,
lwflags = 0;
lwresult = lwres_getrdatabyname(lwrctx, hostname,
(lwres_uint16_t)rdclass,
(lwres_uint16_t)rdclass,
(lwres_uint16_t)rdtype,
lwflags, &response);
if (lwresult != LWRES_R_SUCCESS) {

16
util/copyrights
View File

@@ -452,7 +452,7 @@
./bin/tests/names/dns_name_fullcompare_data X 1999,2000,2001
./bin/tests/names/dns_name_getlabel_data X 1999,2000,2001
./bin/tests/names/dns_name_getlabelsequence_data X 1999,2000,2001
./bin/tests/names/dns_name_hash_data X 1999,2000,2001,2003
./bin/tests/names/dns_name_hash_data X 1999,2000,2001,2003,2012
./bin/tests/names/dns_name_isabsolute_data X 1999,2000,2001,2003
./bin/tests/names/dns_name_issubdomain_data X 1999,2000,2001
./bin/tests/names/dns_name_rdatacompare_data X 1999,2000,2001
@@ -505,7 +505,7 @@
./bin/tests/rbt/dns_rbtnodechain_next_data X 1999,2000,2001
./bin/tests/rbt/dns_rbtnodechain_prev.data X 1999,2000,2001
./bin/tests/rbt/dns_rbtnodechain_prev_data X 1999,2000,2001
./bin/tests/rbt/t_rbt.c C 1998,1999,2000,2001,2003,2004,2005,2007,2009,2011
./bin/tests/rbt/t_rbt.c C 1998,1999,2000,2001,2003,2004,2005,2007,2009,2011,2012
./bin/tests/rbt_test.c C 1999,2000,2001,2004,2005,2007,2009,2011,2012
./bin/tests/rbt_test.out X 1999,2000,2001
./bin/tests/rbt_test.txt SH 1999,2000,2001,2004,2007,2012
@@ -849,7 +849,7 @@
./bin/tests/system/dnssec/ns3/rsasha256.example.db.in ZONE 2009
./bin/tests/system/dnssec/ns3/rsasha512.example.db.in ZONE 2009
./bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in ZONE 2011
./bin/tests/system/dnssec/ns3/secure.example.db.in ZONE 2000,2001,2004,2007,2008,2010
./bin/tests/system/dnssec/ns3/secure.example.db.in ZONE 2000,2001,2004,2007,2008,2010,2012
./bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in ZONE 2008
./bin/tests/system/dnssec/ns3/secure.optout.example.db.in ZONE 2008
./bin/tests/system/dnssec/ns3/sign.sh SH 2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012
@@ -1032,7 +1032,7 @@
./bin/tests/system/lwresd/clean.sh SH 2008,2012
./bin/tests/system/lwresd/lwresd1/lwresd.conf CONF-C 2000,2001,2004,2007
./bin/tests/system/lwresd/lwresd1/resolv.conf CONF-SH 2000,2001,2004,2007,2012
./bin/tests/system/lwresd/lwtest.c C 2000,2001,2002,2004,2007,2008
./bin/tests/system/lwresd/lwtest.c C 2000,2001,2002,2004,2007,2008,2012
./bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db ZONE 2000,2001,2004,2007
./bin/tests/system/lwresd/ns1/e.example1.db X 2008
./bin/tests/system/lwresd/ns1/example1.db ZONE 2000,2001,2002,2003,2004,2007,2008
@@ -1633,7 +1633,7 @@
./contrib/dlz/drivers/include/dlz/dlz_stub_driver.h X 2005
./contrib/dlz/drivers/include/dlz/sdlz_helper.h X 2005
./contrib/dlz/drivers/rules.in X 2005,2010
./contrib/dlz/drivers/sdlz_helper.c X 2005,2010,2011
./contrib/dlz/drivers/sdlz_helper.c X 2005,2010,2011,2012
./contrib/dlz/example/Makefile X 2010
./contrib/dlz/example/README X 2011
./contrib/dlz/example/dlz_example.c X 2010,2011,2012
@@ -2202,7 +2202,7 @@
./lib/dns/gen-win32.h C 1999,2000,2001,2004,2005,2006,2007,2009
./lib/dns/gen.c C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012
./lib/dns/gssapi_link.c C 2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012
./lib/dns/gssapictx.c C 2000,2001,2004,2005,2006,2007,2008,2009,2010,2011
./lib/dns/gssapictx.c C 2000,2001,2004,2005,2006,2007,2008,2009,2010,2011,2012
./lib/dns/hmac_link.c C.NAI 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012
./lib/dns/include/Makefile.in MAKE 1998,1999,2000,2001,2004,2007,2012
./lib/dns/include/dns/Makefile.in MAKE 1998,1999,2000,2001,2002,2003,2004,2007,2008,2009,2011,2012
@@ -2244,7 +2244,7 @@
./lib/dns/include/dns/master.h C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012
./lib/dns/include/dns/masterdump.h C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2011
./lib/dns/include/dns/message.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012
./lib/dns/include/dns/name.h C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2011
./lib/dns/include/dns/name.h C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012
./lib/dns/include/dns/ncache.h C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010
./lib/dns/include/dns/nsec.h C 1999,2000,2001,2003,2004,2005,2006,2007,2008,2011,2012
./lib/dns/include/dns/nsec3.h C 2008,2009,2010,2011
@@ -2966,7 +2966,7 @@
./lib/lwres/gethost.c C 2000,2001,2004,2005,2007
./lib/lwres/getipnode.c C 1999,2000,2001,2002,2003,2004,2005,2007,2009,2012
./lib/lwres/getnameinfo.c C.PORTION 1999,2000,2001,2003,2004,2005,2007,2011,2012
./lib/lwres/getrrset.c C 2000,2001,2002,2003,2004,2005,2007
./lib/lwres/getrrset.c C 2000,2001,2002,2003,2004,2005,2007,2012
./lib/lwres/herror.c C.PORTION 2000,2001,2003,2004,2005,2007,2011,2012
./lib/lwres/include/Makefile.in MAKE 2000,2001,2004,2007,2012
./lib/lwres/include/lwres/Makefile.in MAKE 2000,2001,2004,2007,2012