From 536da846f6cc03ad8abbb8bb9d5d8a6f607b8c33 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 30 May 2014 09:41:33 +1000 Subject: [PATCH] update copyrights --- bin/tests/rbt_test.c | 2 +- bin/tests/system/dns64/tests.sh | 2 +- bin/tests/system/rpz/ns6/hints | 2 +- lib/dns/rbt.c | 10 +++++----- lib/dns/tests/rbt_serialize_test.c | 2 +- lib/isc/include/isc/hash.h | 2 +- util/copyrights | 9 ++++++--- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/bin/tests/rbt_test.c b/bin/tests/rbt_test.c index 66e5dd7cb9..1da23c0519 100644 --- a/bin/tests/rbt_test.c +++ b/bin/tests/rbt_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012, 2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/system/dns64/tests.sh b/bin/tests/system/dns64/tests.sh index 51907a765e..26808d9b73 100644 --- a/bin/tests/system/dns64/tests.sh +++ b/bin/tests/system/dns64/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2010-2013 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2010-2014 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 diff --git a/bin/tests/system/rpz/ns6/hints b/bin/tests/system/rpz/ns6/hints index 7d20df0529..1e6b4cef2f 100644 --- a/bin/tests/system/rpz/ns6/hints +++ b/bin/tests/system/rpz/ns6/hints @@ -1,4 +1,4 @@ -; Copyright (C) 2011-2013 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2014 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 diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c index 4cefa8833e..32ddbde999 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -1455,7 +1455,7 @@ dns_rbt_findnode(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname, if (compared == dns_namereln_none) { #ifdef DNS_RBT_USEHASH - /* + /* * Here, current is pointing at a subtree root * node. We try to find a matching node using * the hashtable. We can get one of 3 results @@ -3017,9 +3017,9 @@ printnodename(dns_rbtnode_t *node, isc_boolean_t quoted, FILE *f) { dns_name_format(&name, buffer, sizeof(buffer)); if (quoted) - fprintf(f, "\"%s\"", buffer); + fprintf(f, "\"%s\"", buffer); else - fprintf(f, "%s", buffer); + fprintf(f, "%s", buffer); } static void @@ -3030,7 +3030,7 @@ print_text_helper(dns_rbtnode_t *root, dns_rbtnode_t *parent, dns_rbt_indent(f, depth); if (root != NULL) { - printnodename(root, ISC_TRUE, f); + printnodename(root, ISC_TRUE, f); fprintf(f, " (%s, %s", direction, IS_RED(root) ? "RED" : "BLACK"); @@ -3040,7 +3040,7 @@ print_text_helper(dns_rbtnode_t *root, dns_rbtnode_t *parent, fprintf(f, " (BAD parent pointer! -> "); if (PARENT(root) != NULL) - printnodename(PARENT(root), ISC_TRUE, f); + printnodename(PARENT(root), ISC_TRUE, f); else fprintf(f, "NULL"); fprintf(f, ")"); diff --git a/lib/dns/tests/rbt_serialize_test.c b/lib/dns/tests/rbt_serialize_test.c index 80b5125d92..59ec34dbce 100644 --- a/lib/dns/tests/rbt_serialize_test.c +++ b/lib/dns/tests/rbt_serialize_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2014 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 diff --git a/lib/isc/include/isc/hash.h b/lib/isc/include/isc/hash.h index 3dec1d9946..1eeba87dd7 100644 --- a/lib/isc/include/isc/hash.h +++ b/lib/isc/include/isc/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2009, 2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009, 2013, 2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/util/copyrights b/util/copyrights index b608076307..f4b3ffc9d6 100644 --- a/util/copyrights +++ b/util/copyrights @@ -682,7 +682,7 @@ ./bin/tests/rbt/win32/t_rbt.vcxproj.filters.in X 2013 ./bin/tests/rbt/win32/t_rbt.vcxproj.in X 2013 ./bin/tests/rbt/win32/t_rbt.vcxproj.user X 2013 -./bin/tests/rbt_test.c C 1999,2000,2001,2004,2005,2007,2009,2011,2012 +./bin/tests/rbt_test.c C 1999,2000,2001,2004,2005,2007,2009,2011,2012,2014 ./bin/tests/rbt_test.out X 1999,2000,2001 ./bin/tests/rbt_test.txt SH 1999,2000,2001,2004,2007,2012 ./bin/tests/rdata_test.c C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2011,2012,2014 @@ -1081,7 +1081,7 @@ ./bin/tests/system/dns64/ns2/rpz.db ZONE 2013 ./bin/tests/system/dns64/prereq.sh SH 2014 ./bin/tests/system/dns64/setup.sh SH 2010,2012,2014 -./bin/tests/system/dns64/tests.sh SH 2010,2011,2012,2013 +./bin/tests/system/dns64/tests.sh SH 2010,2011,2012,2013,2014 ./bin/tests/system/dnssec/README TXT.BRIEF 2000,2001,2002,2004,2011 ./bin/tests/system/dnssec/clean.sh SH 2000,2001,2002,2004,2007,2008,2009,2010,2011,2012,2013,2014 ./bin/tests/system/dnssec/dnssec_update_test.pl PERL 2002,2004,2007,2010,2012 @@ -1603,6 +1603,8 @@ ./bin/tests/system/rpz/ns5/named.args X 2013 ./bin/tests/system/rpz/ns5/named.conf CONF-C 2012,2013 ./bin/tests/system/rpz/ns5/tld5.db ZONE 2013 +./bin/tests/system/rpz/ns6/hints ZONE 2014 +./bin/tests/system/rpz/ns6/named.conf CONF-C 2014 ./bin/tests/system/rpz/prereq.sh SH 2014 ./bin/tests/system/rpz/qperf.sh SH 2012,2013 ./bin/tests/system/rpz/rpz.c C 2011,2012,2013 @@ -3221,6 +3223,7 @@ ./lib/dns/tests/mkraw.pl PERL 2011,2012 ./lib/dns/tests/nsec3_test.c C 2012,2014 ./lib/dns/tests/private_test.c C 2011,2012 +./lib/dns/tests/rbt_serialize_test.c C 2014 ./lib/dns/tests/rbt_test.c C 2012,2013,2014 ./lib/dns/tests/rdata_test.c C 2012,2013 ./lib/dns/tests/rdataset_test.c C 2012 @@ -3373,7 +3376,7 @@ ./lib/isc/include/isc/file.h C 2000,2001,2004,2005,2006,2007,2009,2011,2012 ./lib/isc/include/isc/formatcheck.h C 2000,2001,2004,2005,2006,2007 ./lib/isc/include/isc/fsaccess.h C 2000,2001,2004,2005,2006,2007,2009 -./lib/isc/include/isc/hash.h C 2003,2004,2005,2006,2007,2009,2013 +./lib/isc/include/isc/hash.h C 2003,2004,2005,2006,2007,2009,2013,2014 ./lib/isc/include/isc/heap.h C 1997,1998,1999,2000,2001,2004,2005,2006,2007,2009,2012 ./lib/isc/include/isc/hex.h C 2000,2001,2004,2005,2006,2007,2008 ./lib/isc/include/isc/hmacmd5.h C 2000,2001,2004,2005,2006,2007,2009,2014