From 1c29e9db2c893cbf92b7b579aa1577255616bfb7 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 5 Dec 2013 15:48:07 +1100
Subject: [PATCH] update copyrights

---
 bin/dnssec/dnssec-signzone.c            |   2 +-
 bin/named/builtin.c                     |   2 +-
 bin/named/control.c                     |   2 +-
 bin/named/include/named/main.h          |   2 +-
 bin/named/win32/os.c                    |   2 +-
 bin/python/dnssec-checkds.py.in         |   2 +-
 bin/tests/atomic/t_atomic.c             |   2 +-
 bin/tests/backtrace_test.c              |   2 +-
 bin/tests/db/t_db.c                     |   2 +-
 bin/tests/dst/gsstest.c                 |   2 +-
 bin/tests/dst/t_dst.c                   |   2 +-
 bin/tests/hashes/t_hashes.c             |   2 +-
 bin/tests/master/t_master.c             |   2 +-
 bin/tests/mem/t_mem.c                   |   2 +-
 bin/tests/names/t_names.c               |   2 +-
 bin/tests/rbt/t_rbt.c                   |   2 +-
 bin/tests/resolver/t_resolver.c         |   2 +-
 bin/tests/rwlock_test.c                 |   2 +-
 bin/tests/sockaddr/t_sockaddr.c         |   2 +-
 bin/tests/tasks/t_tasks.c               |   2 +-
 bin/tests/timers/t_timers.c             |   2 +-
 bin/win32/BINDInstall/AccountInfo.cpp   |   2 +-
 config.h.win32                          |   2 +-
 lib/dns/gssapi_link.c                   |   2 +-
 lib/dns/include/dst/gssapi.h            |   2 +-
 lib/dns/openssldh_link.c                |   2 +-
 lib/dns/rcode.c                         |   2 +-
 lib/dns/rdata/generic/hip_55.c          |   2 +-
 lib/dns/rdataslab.c                     |   2 +-
 lib/dns/ssu_external.c                  |   2 +-
 lib/dns/ttl.c                           |   2 +-
 lib/isc/backtrace.c                     |   2 +-
 lib/isc/base32.c                        |   2 +-
 lib/isc/base64.c                        |   2 +-
 lib/isc/hash.c                          |   2 +-
 lib/isc/heap.c                          |   2 +-
 lib/isc/hex.c                           |   2 +-
 lib/isc/include/isc/file.h              |   2 +-
 lib/isc/include/isc/hash.h              |   2 +-
 lib/isc/include/isc/platform.h.in       |   2 +-
 lib/isc/inet_aton.c                     |   2 +-
 lib/isc/inet_pton.c                     |   4 +-
 lib/isc/mem.c                           |   2 +-
 lib/isc/random.c                        |   2 +-
 lib/isc/unix/file.c                     |   2 +-
 lib/isc/win32/include/isc/platform.h.in |   2 +-
 lib/isc/win32/interfaceiter.c           |   2 +-
 lib/isc/win32/stdtime.c                 |   2 +-
 lib/isccc/base64.c                      |   2 +-
 lib/lwres/context.c                     |   2 +-
 lib/lwres/gethost.c                     | 148 ++++++++++++------------
 lib/lwres/lwinetaton.c                  |   2 +-
 lib/lwres/lwinetpton.c                  |   2 +-
 lib/lwres/lwres_gabn.c                  |  30 ++---
 lib/lwres/lwres_gnba.c                  |  34 +++---
 lib/lwres/lwres_grbn.c                  |   2 +-
 lib/lwres/lwres_noop.c                  |  30 ++---
 lib/tests/include/tests/t_api.h         |   2 +-
 util/merge_copyrights                   |   2 +-
 win32utils/legacy/makedefs.pl           |   2 +-
 60 files changed, 178 insertions(+), 178 deletions(-)

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 44bbd4d3df..a95e871fa3 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -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
diff --git a/bin/named/builtin.c b/bin/named/builtin.c
index 607463bf05..756e3765ab 100644
--- a/bin/named/builtin.c
+++ b/bin/named/builtin.c
@@ -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) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/named/control.c b/bin/named/control.c
index db98cd4c94..c98c92f7be 100644
--- a/bin/named/control.c
+++ b/bin/named/control.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2010, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2010, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/named/include/named/main.h b/bin/named/include/named/main.h
index 2ce4815085..1537fb641d 100644
--- a/bin/named/include/named/main.h
+++ b/bin/named/include/named/main.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c
index 623e585e2a..cc49b86e9b 100644
--- a/bin/named/win32/os.c
+++ b/bin/named/win32/os.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/python/dnssec-checkds.py.in b/bin/python/dnssec-checkds.py.in
index 8f1146821b..1cc90afac8 100644
--- a/bin/python/dnssec-checkds.py.in
+++ b/bin/python/dnssec-checkds.py.in
@@ -1,6 +1,6 @@
 #!@PYTHON@
 ############################################################################
-# Copyright (C) 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+# 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
diff --git a/bin/tests/atomic/t_atomic.c b/bin/tests/atomic/t_atomic.c
index 811b3a140e..f63ddf1869 100644
--- a/bin/tests/atomic/t_atomic.c
+++ b/bin/tests/atomic/t_atomic.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 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
diff --git a/bin/tests/backtrace_test.c b/bin/tests/backtrace_test.c
index 7a62a57dde..c54c2ed90c 100644
--- a/bin/tests/backtrace_test.c
+++ b/bin/tests/backtrace_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 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
diff --git a/bin/tests/db/t_db.c b/bin/tests/db/t_db.c
index de2f4ce14a..81962070bb 100644
--- a/bin/tests/db/t_db.c
+++ b/bin/tests/db/t_db.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-2013  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/dst/gsstest.c b/bin/tests/dst/gsstest.c
index 7a0e06c488..81bfef6011 100644
--- a/bin/tests/dst/gsstest.c
+++ b/bin/tests/dst/gsstest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2007, 2009-2011, 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
diff --git a/bin/tests/dst/t_dst.c b/bin/tests/dst/t_dst.c
index 89d62e4188..2042ef493d 100644
--- a/bin/tests/dst/t_dst.c
+++ b/bin/tests/dst/t_dst.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2012, 2013  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/hashes/t_hashes.c b/bin/tests/hashes/t_hashes.c
index ac78c9998f..3ad01e3949 100644
--- a/bin/tests/hashes/t_hashes.c
+++ b/bin/tests/hashes/t_hashes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 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
diff --git a/bin/tests/master/t_master.c b/bin/tests/master/t_master.c
index 1c1f679a92..e71a34bf41 100644
--- a/bin/tests/master/t_master.c
+++ b/bin/tests/master/t_master.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011, 2013  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
diff --git a/bin/tests/mem/t_mem.c b/bin/tests/mem/t_mem.c
index 20509af0d2..b2e0545ab5 100644
--- a/bin/tests/mem/t_mem.c
+++ b/bin/tests/mem/t_mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2009, 2013  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/names/t_names.c b/bin/tests/names/t_names.c
index ebfdb0e7d9..a2e9ab4318 100644
--- a/bin/tests/names/t_names.c
+++ b/bin/tests/names/t_names.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/tests/rbt/t_rbt.c b/bin/tests/rbt/t_rbt.c
index 86058b81de..b50bec7398 100644
--- a/bin/tests/rbt/t_rbt.c
+++ b/bin/tests/rbt/t_rbt.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-2013  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
diff --git a/bin/tests/resolver/t_resolver.c b/bin/tests/resolver/t_resolver.c
index d2cc1bbc75..089726fc3b 100644
--- a/bin/tests/resolver/t_resolver.c
+++ b/bin/tests/resolver/t_resolver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-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
diff --git a/bin/tests/rwlock_test.c b/bin/tests/rwlock_test.c
index 05d279f1bc..6876ead410 100644
--- a/bin/tests/rwlock_test.c
+++ b/bin/tests/rwlock_test.c
@@ -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) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/tests/sockaddr/t_sockaddr.c b/bin/tests/sockaddr/t_sockaddr.c
index b1e05a4816..305110540a 100644
--- a/bin/tests/sockaddr/t_sockaddr.c
+++ b/bin/tests/sockaddr/t_sockaddr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2013  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/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c
index 301d81c907..3d3a1ff4f8 100644
--- a/bin/tests/tasks/t_tasks.c
+++ b/bin/tests/tasks/t_tasks.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-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/bin/tests/timers/t_timers.c b/bin/tests/timers/t_timers.c
index f2e44666e0..1de473379d 100644
--- a/bin/tests/timers/t_timers.c
+++ b/bin/tests/timers/t_timers.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007-2009, 2011-2013  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/win32/BINDInstall/AccountInfo.cpp b/bin/win32/BINDInstall/AccountInfo.cpp
index c3d8fc06e5..8f5befdf83 100644
--- a/bin/win32/BINDInstall/AccountInfo.cpp
+++ b/bin/win32/BINDInstall/AccountInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2007, 2009, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001, 2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/config.h.win32 b/config.h.win32
index 8315dcece8..17e642ef99 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2009, 2011-2013  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/lib/dns/gssapi_link.c b/lib/dns/gssapi_link.c
index ebe793e68c..bd5a862fda 100644
--- a/lib/dns/gssapi_link.c
+++ b/lib/dns/gssapi_link.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/include/dst/gssapi.h b/lib/dns/include/dst/gssapi.h
index 4435881366..53c594e6b2 100644
--- a/lib/dns/include/dst/gssapi.h
+++ b/lib/dns/include/dst/gssapi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009-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
diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c
index 518736c39a..aaaf69c00f 100644
--- a/lib/dns/openssldh_link.c
+++ b/lib/dns/openssldh_link.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c
index 2e25bf2db4..9dc80d501e 100644
--- a/lib/dns/rcode.c
+++ b/lib/dns/rcode.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/rdata/generic/hip_55.c b/lib/dns/rdata/generic/hip_55.c
index 4b6b595b62..5198497dcb 100644
--- a/lib/dns/rdata/generic/hip_55.c
+++ b/lib/dns/rdata/generic/hip_55.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2011, 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
diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index 7f5b45eaa0..c53c24c23e 100644
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/dns/ssu_external.c b/lib/dns/ssu_external.c
index 3ded9985b9..759482768d 100644
--- a/lib/dns/ssu_external.c
+++ b/lib/dns/ssu_external.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-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
diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c
index 606834f426..d33f0b4dd3 100644
--- a/lib/dns/ttl.c
+++ b/lib/dns/ttl.c
@@ -1,5 +1,5 @@
 /*
- * 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) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/backtrace.c b/lib/isc/backtrace.c
index 2c7f6f9df8..a5b1a0fdba 100644
--- a/lib/isc/backtrace.c
+++ b/lib/isc/backtrace.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 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
diff --git a/lib/isc/base32.c b/lib/isc/base32.c
index 361847a9c5..f595cf14f7 100644
--- a/lib/isc/base32.c
+++ b/lib/isc/base32.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2009, 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
diff --git a/lib/isc/base64.c b/lib/isc/base64.c
index 78a7c8a3f1..00d00d4bc6 100644
--- a/lib/isc/base64.c
+++ b/lib/isc/base64.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2013  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
diff --git a/lib/isc/hash.c b/lib/isc/hash.c
index 92814a37e2..fc4e4f3384 100644
--- a/lib/isc/hash.c
+++ b/lib/isc/hash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2013  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/lib/isc/heap.c b/lib/isc/heap.c
index da65999780..4edaface85 100644
--- a/lib/isc/heap.c
+++ b/lib/isc/heap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2010-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2010-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/hex.c b/lib/isc/hex.c
index 7f0ebb5160..60addf5ce8 100644
--- a/lib/isc/hex.c
+++ b/lib/isc/hex.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h
index 8bad50ba81..a974bbd721 100644
--- a/lib/isc/include/isc/file.h
+++ b/lib/isc/include/isc/file.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 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
diff --git a/lib/isc/include/isc/hash.h b/lib/isc/include/isc/hash.h
index 3b420b0ef7..0bfe936d7f 100644
--- a/lib/isc/include/isc/hash.h
+++ b/lib/isc/include/isc/hash.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2013  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/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index feb827a9ed..8c5bd1d8af 100644
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/inet_aton.c b/lib/isc/inet_aton.c
index cfe2e7767d..4b5571f499 100644
--- a/lib/isc/inet_aton.c
+++ b/lib/isc/inet_aton.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005, 2007, 2008, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2005, 2007, 2008, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1996-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/inet_pton.c b/lib/isc/inet_pton.c
index 9654b8292e..ac4defde75 100644
--- a/lib/isc/inet_pton.c
+++ b/lib/isc/inet_pton.c
@@ -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) 1996-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -44,7 +44,7 @@ static char rcsid[] =
 static int inet_pton4(const char *src, unsigned char *dst);
 static int inet_pton6(const char *src, unsigned char *dst);
 
-/*% 
+/*%
  *	convert from presentation format (which usually means ASCII printable)
  *	to network format (which is usually some kind of binary format).
  * \return
diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 4e0873cd7e..f2a3adba70 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/random.c b/lib/isc/random.c
index 05bb168845..4c48e60fd7 100644
--- a/lib/isc/random.c
+++ b/lib/isc/random.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index 7c6d6611e7..d88ca29a15 100644
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.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-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/win32/include/isc/platform.h.in b/lib/isc/win32/include/isc/platform.h.in
index 2e1d055a69..29053fa2af 100644
--- a/lib/isc/win32/include/isc/platform.h.in
+++ b/lib/isc/win32/include/isc/platform.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/isc/win32/interfaceiter.c b/lib/isc/win32/interfaceiter.c
index 9dfa6b7ffd..c7a9cbb241 100644
--- a/lib/isc/win32/interfaceiter.c
+++ b/lib/isc/win32/interfaceiter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007-2009, 2013  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/lib/isc/win32/stdtime.c b/lib/isc/win32/stdtime.c
index 119beca240..a45d17bace 100644
--- a/lib/isc/win32/stdtime.c
+++ b/lib/isc/win32/stdtime.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2013  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/lib/isccc/base64.c b/lib/isccc/base64.c
index 03d342ffc8..bf8487e2d6 100644
--- a/lib/isccc/base64.c
+++ b/lib/isccc/base64.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2005, 2007, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/lwres/context.c b/lib/lwres/context.c
index c2a286b329..e16bc0aa6b 100644
--- a/lib/lwres/context.c
+++ b/lib/lwres/context.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2012, 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
diff --git a/lib/lwres/gethost.c b/lib/lwres/gethost.c
index 49d74a14b0..60d9d5ee99 100644
--- a/lib/lwres/gethost.c
+++ b/lib/lwres/gethost.c
@@ -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
@@ -24,7 +24,7 @@
  *    lookups by means of the lightweight resolver. They are similar to the
  *    standard gethostent(3) functions provided by most operating systems.
  *    They use a struct hostent which is usually defined in <namedb.h>.
- * 
+ *
  * \code
  * struct  hostent {
  *         char    *h_name;        // official name of host
@@ -35,36 +35,36 @@
  * };
  * #define h_addr  h_addr_list[0]  // address, for backward compatibility
  * \endcode
- * 
+ *
  *    The members of this structure are:
- * 
+ *
  * \li   h_name:
  *           The official (canonical) name of the host.
- * 
+ *
  * \li   h_aliases:
  *           A NULL-terminated array of alternate names (nicknames) for the
  *           host.
- * 
+ *
  * \li   h_addrtype:
  *           The type of address being returned -- PF_INET or PF_INET6.
- * 
+ *
  * \li   h_length:
  *           The length of the address in bytes.
- * 
+ *
  * \li   h_addr_list:
  *           A NULL terminated array of network addresses for the host. Host
  *           addresses are returned in network byte order.
- * 
+ *
  *    For backward compatibility with very old software, h_addr is the first
  *    address in h_addr_list.
- * 
+ *
  *    lwres_gethostent(), lwres_sethostent(), lwres_endhostent(),
  *    lwres_gethostent_r(), lwres_sethostent_r() and lwres_endhostent_r()
  *    provide iteration over the known host entries on systems that provide
  *    such functionality through facilities like /etc/hosts or NIS. The
  *    lightweight resolver does not currently implement these functions; it
  *    only provides them as stub functions that always return failure.
- * 
+ *
  *    lwres_gethostbyname() and lwres_gethostbyname2() look up the hostname
  *    name. lwres_gethostbyname() always looks for an IPv4 address while
  *    lwres_gethostbyname2() looks for an address of protocol family af:
@@ -72,7 +72,7 @@
  *    Successful calls of the functions return a struct hostent for the name
  *    that was looked up. NULL is returned if the lookups by
  *    lwres_gethostbyname() or lwres_gethostbyname2() fail.
- * 
+ *
  *    Reverse lookups of addresses are performed by lwres_gethostbyaddr().
  *    addr is an address of length len bytes and protocol family type --
  *    PF_INET or PF_INET6. lwres_gethostbyname_r() is a thread-safe function
@@ -83,7 +83,7 @@
  *    h_addr_list elements of the struct hostent returned in resbuf.
  *    Successful calls to lwres_gethostbyname_r() return resbuf, which is a
  *    pointer to the struct hostent it created.
- * 
+ *
  *    lwres_gethostbyaddr_r() is a thread-safe function that performs a
  *    reverse lookup of address addr which is len bytes long and is of
  *    protocol family type -- PF_INET or PF_INET6. If an error occurs, the
@@ -95,35 +95,35 @@
  *    struct hostent returned in resbuf. Successful calls to
  *    lwres_gethostbyaddr_r() return resbuf, which is a pointer to the
  *    struct hostent it created.
- * 
+ *
  * \section gethost_return Return Values
- * 
+ *
  *    The functions lwres_gethostbyname(), lwres_gethostbyname2(),
  *    lwres_gethostbyaddr(), and lwres_gethostent() return NULL to indicate
  *    an error. In this case the global variable lwres_h_errno will contain
  *    one of the following error codes defined in \link netdb.h <lwres/netdb.h>:\endlink
- * 
+ *
  * \li #HOST_NOT_FOUND:
  *           The host or address was not found.
- * 
+ *
  * \li #TRY_AGAIN:
  *           A recoverable error occurred, e.g., a timeout. Retrying the
  *           lookup may succeed.
- * 
+ *
  * \li #NO_RECOVERY:
  *           A non-recoverable error occurred.
- * 
+ *
  * \li #NO_DATA:
  *           The name exists, but has no address information associated with
  *           it (or vice versa in the case of a reverse lookup). The code
  *           NO_ADDRESS is accepted as a synonym for NO_DATA for backwards
  *           compatibility.
- * 
+ *
  *    lwres_hstrerror() translates these error codes to suitable error
  *    messages.
- * 
+ *
  *    lwres_gethostent() and lwres_gethostent_r() always return NULL.
- * 
+ *
  *    Successful calls to lwres_gethostbyname_r() and
  *    lwres_gethostbyaddr_r() return resbuf, a pointer to the struct hostent
  *    that was initialised by these functions. They return NULL if the
@@ -131,19 +131,19 @@
  *    names referenced by the h_name, h_aliases, and h_addr_list elements of
  *    the struct hostent. If buf was too small, both lwres_gethostbyname_r()
  *    and lwres_gethostbyaddr_r() set the global variable errno to ERANGE.
- * 
+ *
  * \section gethost_see See Also
- * 
+ *
  *    gethostent(), \link getipnode.c getipnode\endlink, lwres_hstrerror()
- * 
+ *
  * \section gethost_bugs Bugs
- * 
+ *
  *    lwres_gethostbyname(), lwres_gethostbyname2(), lwres_gethostbyaddr()
  *    and lwres_endhostent() are not thread safe; they return pointers to
  *    static data and provide error codes through a global variable.
  *    Thread-safe versions for name and address lookup are provided by
  *    lwres_gethostbyname_r(), and lwres_gethostbyaddr_r() respectively.
- * 
+ *
  *    The resolver daemon does not currently support any non-DNS name
  *    services such as /etc/hosts or NIS, consequently the above functions
  *    don't, either.
@@ -294,69 +294,69 @@ lwres_endhostent_r(void) {
 
 static int
 copytobuf(struct hostent *he, struct hostent *hptr, char *buf, int buflen) {
-        char *cp;
-        char **ptr;
-        int i, n;
-        int nptr, len;
+	char *cp;
+	char **ptr;
+	int i, n;
+	int nptr, len;
 
-        /*
+	/*
 	 * Find out the amount of space required to store the answer.
 	 */
-        nptr = 2; /* NULL ptrs */
-        len = (int)((char *)LWRES_ALIGN(buf) - buf);
-        for (i = 0; he->h_addr_list[i]; i++, nptr++) {
-                len += he->h_length;
-        }
-        for (i = 0; he->h_aliases[i]; i++, nptr++) {
-                len += strlen(he->h_aliases[i]) + 1;
-        }
-        len += strlen(he->h_name) + 1;
-        len += nptr * sizeof(char*);
+	nptr = 2; /* NULL ptrs */
+	len = (int)((char *)LWRES_ALIGN(buf) - buf);
+	for (i = 0; he->h_addr_list[i]; i++, nptr++) {
+		len += he->h_length;
+	}
+	for (i = 0; he->h_aliases[i]; i++, nptr++) {
+		len += strlen(he->h_aliases[i]) + 1;
+	}
+	len += strlen(he->h_name) + 1;
+	len += nptr * sizeof(char*);
 
-        if (len > buflen) {
-                return (-1);
-        }
+	if (len > buflen) {
+		return (-1);
+	}
 
-        /*
+	/*
 	 * Copy address size and type.
 	 */
-        hptr->h_addrtype = he->h_addrtype;
-        n = hptr->h_length = he->h_length;
+	hptr->h_addrtype = he->h_addrtype;
+	n = hptr->h_length = he->h_length;
 
-        ptr = (char **)LWRES_ALIGN(buf);
-        cp = (char *)LWRES_ALIGN(buf) + nptr * sizeof(char *);
+	ptr = (char **)LWRES_ALIGN(buf);
+	cp = (char *)LWRES_ALIGN(buf) + nptr * sizeof(char *);
 
-        /*
+	/*
 	 * Copy address list.
 	 */
-        hptr->h_addr_list = ptr;
-        for (i = 0; he->h_addr_list[i]; i++, ptr++) {
-                memcpy(cp, he->h_addr_list[i], n);
-                hptr->h_addr_list[i] = cp;
-                cp += n;
-        }
-        hptr->h_addr_list[i] = NULL;
-        ptr++;
+	hptr->h_addr_list = ptr;
+	for (i = 0; he->h_addr_list[i]; i++, ptr++) {
+		memcpy(cp, he->h_addr_list[i], n);
+		hptr->h_addr_list[i] = cp;
+		cp += n;
+	}
+	hptr->h_addr_list[i] = NULL;
+	ptr++;
 
-        /*
+	/*
 	 * Copy official name.
 	 */
-        n = strlen(he->h_name) + 1;
-        strcpy(cp, he->h_name);
-        hptr->h_name = cp;
-        cp += n;
+	n = strlen(he->h_name) + 1;
+	strcpy(cp, he->h_name);
+	hptr->h_name = cp;
+	cp += n;
 
-        /*
+	/*
 	 * Copy aliases.
 	 */
-        hptr->h_aliases = ptr;
-        for (i = 0; he->h_aliases[i]; i++) {
-                n = strlen(he->h_aliases[i]) + 1;
-                strcpy(cp, he->h_aliases[i]);
-                hptr->h_aliases[i] = cp;
-                cp += n;
-        }
-        hptr->h_aliases[i] = NULL;
+	hptr->h_aliases = ptr;
+	for (i = 0; he->h_aliases[i]; i++) {
+		n = strlen(he->h_aliases[i]) + 1;
+		strcpy(cp, he->h_aliases[i]);
+		hptr->h_aliases[i] = cp;
+		cp += n;
+	}
+	hptr->h_aliases[i] = NULL;
 
-        return (0);
+	return (0);
 }
diff --git a/lib/lwres/lwinetaton.c b/lib/lwres/lwinetaton.c
index 707c66d8ab..5ca5254860 100644
--- a/lib/lwres/lwinetaton.c
+++ b/lib/lwres/lwinetaton.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2005, 2007, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1996-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/lwres/lwinetpton.c b/lib/lwres/lwinetpton.c
index 94dcebf3c6..65a8998ce1 100644
--- a/lib/lwres/lwinetpton.c
+++ b/lib/lwres/lwinetpton.c
@@ -1,5 +1,5 @@
 /*
- * 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) 1996-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/lwres/lwres_gabn.c b/lib/lwres/lwres_gabn.c
index 32579f136d..d770579cb4 100644
--- a/lib/lwres/lwres_gabn.c
+++ b/lib/lwres/lwres_gabn.c
@@ -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
@@ -40,23 +40,23 @@ typedef struct lwres_addr lwres_addr_t;
 typedef LWRES_LIST(lwres_addr_t) lwres_addrlist_t;
 
 typedef struct {
-        lwres_uint32_t  flags;
-        lwres_uint32_t  addrtypes;
-        lwres_uint16_t  namelen;
-        char           *name;
+	lwres_uint32_t  flags;
+	lwres_uint32_t  addrtypes;
+	lwres_uint16_t  namelen;
+	char           *name;
 } lwres_gabnrequest_t;
 
 typedef struct {
-        lwres_uint32_t          flags;
-        lwres_uint16_t          naliases;
-        lwres_uint16_t          naddrs;
-        char                   *realname;
-        char                  **aliases;
-        lwres_uint16_t          realnamelen;
-        lwres_uint16_t         *aliaslen;
-        lwres_addrlist_t        addrs;
-        void                   *base;
-        size_t                  baselen;
+	lwres_uint32_t          flags;
+	lwres_uint16_t          naliases;
+	lwres_uint16_t          naddrs;
+	char                   *realname;
+	char                  **aliases;
+	lwres_uint16_t          realnamelen;
+	lwres_uint16_t         *aliaslen;
+	lwres_addrlist_t        addrs;
+	void                   *base;
+	size_t                  baselen;
 } lwres_gabnresponse_t;
 \endcode
 
diff --git a/lib/lwres/lwres_gnba.c b/lib/lwres/lwres_gnba.c
index aabf59bc8a..43d8ac53e2 100644
--- a/lib/lwres/lwres_gnba.c
+++ b/lib/lwres/lwres_gnba.c
@@ -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-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -29,7 +29,7 @@
    structure. Another render function converts the getnamebyaddr
    response structure -- lwres_gnbaresponse_t to the canonical format.
    This is complemented by a parse function which converts a packet in
-   canonical format to a getnamebyaddr response structure.       
+   canonical format to a getnamebyaddr response structure.
 
    These structures are defined in \link lwres.h <lwres/lwres.h.>\endlink They are shown
    below.
@@ -38,19 +38,19 @@
 #define LWRES_OPCODE_GETNAMEBYADDR      0x00010002U
 
 typedef struct {
-        lwres_uint32_t  flags;
-        lwres_addr_t    addr;
+	lwres_uint32_t  flags;
+	lwres_addr_t    addr;
 } lwres_gnbarequest_t;
 
 typedef struct {
-        lwres_uint32_t  flags;
-        lwres_uint16_t  naliases;
-        char           *realname;
-        char          **aliases;
-        lwres_uint16_t  realnamelen;
-        lwres_uint16_t *aliaslen;
-        void           *base;
-        size_t          baselen;
+	lwres_uint32_t  flags;
+	lwres_uint16_t  naliases;
+	char           *realname;
+	char          **aliases;
+	lwres_uint16_t  realnamelen;
+	lwres_uint16_t *aliaslen;
+	void           *base;
+	size_t          baselen;
 } lwres_gnbaresponse_t;
 \endcode
 
@@ -66,14 +66,14 @@ typedef struct {
    of packet pkt to a lwres_gnbarequest_t structure. Buffer b provides
    space to be used for storing this structure. When the function
    succeeds, the resulting lwres_gnbarequest_t is made available
-   through *structp. lwres_gnbaresponse_parse() offers the same   
-semantics as lwres_gnbarequest_parse() except it yields a    
+   through *structp. lwres_gnbaresponse_parse() offers the same
+semantics as lwres_gnbarequest_parse() except it yields a
    lwres_gnbaresponse_t structure.
 
    lwres_gnbaresponse_free() and lwres_gnbarequest_free() release the
-   memory in resolver context ctx that was allocated to the     
-   lwres_gnbaresponse_t or lwres_gnbarequest_t structures referenced  
-   via structp. Any memory associated with ancillary buffers and      
+   memory in resolver context ctx that was allocated to the
+   lwres_gnbaresponse_t or lwres_gnbarequest_t structures referenced
+   via structp. Any memory associated with ancillary buffers and
    strings for those structures is also discarded.
 
 \section lwres_gbna_return Return Values
diff --git a/lib/lwres/lwres_grbn.c b/lib/lwres/lwres_grbn.c
index 6b77ba57e5..a8ff2342bd 100644
--- a/lib/lwres/lwres_grbn.c
+++ b/lib/lwres/lwres_grbn.c
@@ -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
diff --git a/lib/lwres/lwres_noop.c b/lib/lwres/lwres_noop.c
index 997e26ccf7..10b40ee950 100644
--- a/lib/lwres/lwres_noop.c
+++ b/lib/lwres/lwres_noop.c
@@ -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
@@ -22,11 +22,11 @@
 /**
  *    These are low-level routines for creating and parsing lightweight
  *    resolver no-op request and response messages.
- * 
+ *
  *    The no-op message is analogous to a ping packet: a packet is sent to
  *    the resolver daemon and is simply echoed back. The opcode is intended
  *    to allow a client to determine if the server is operational or not.
- * 
+ *
  *    There are four main functions for the no-op opcode. One render
  *    function converts a no-op request structure -- lwres_nooprequest_t --
  *    to the lighweight resolver's canonical format. It is complemented by a
@@ -35,27 +35,27 @@
  *    response structure -- lwres_noopresponse_t to the canonical format.
  *    This is complemented by a parse function which converts a packet in
  *    canonical format to a no-op response structure.
- * 
+ *
  *    These structures are defined in \link lwres.h <lwres/lwres.h.> \endlink They are shown below.
- * 
+ *
  * \code
  * #define LWRES_OPCODE_NOOP       0x00000000U
- * 
+ *
  * typedef struct {
  *         lwres_uint16_t  datalength;
  *         unsigned char   *data;
  * } lwres_nooprequest_t;
- * 
+ *
  * typedef struct {
  *         lwres_uint16_t  datalength;
  *         unsigned char   *data;
  * } lwres_noopresponse_t;
  * \endcode
- * 
+ *
  *    Although the structures have different types, they are identical. This
  *    is because the no-op opcode simply echos whatever data was sent: the
  *    response is therefore identical to the request.
- * 
+ *
  *    lwres_nooprequest_render() uses resolver context ctx to convert no-op
  *    request structure req to canonical format. The packet header structure
  *    pkt is initialised and transferred to buffer b. The contents of *req
@@ -63,7 +63,7 @@
  *    lwres_noopresponse_render() performs the same task, except it converts
  *    a no-op response structure lwres_noopresponse_t to the lightweight
  *    resolver's canonical format.
- * 
+ *
  *    lwres_nooprequest_parse() uses context ctx to convert the contents of
  *    packet pkt to a lwres_nooprequest_t structure. Buffer b provides space
  *    to be used for storing this structure. When the function succeeds, the
@@ -71,14 +71,14 @@
  *    lwres_noopresponse_parse() offers the same semantics as
  *    lwres_nooprequest_parse() except it yields a lwres_noopresponse_t
  *    structure.
- * 
+ *
  *    lwres_noopresponse_free() and lwres_nooprequest_free() release the
  *    memory in resolver context ctx that was allocated to the
  *    lwres_noopresponse_t or lwres_nooprequest_t structures referenced via
  *    structp.
- * 
+ *
  * \section lwres_noop_return Return Values
- * 
+ *
  *    The no-op opcode functions lwres_nooprequest_render(),
  *    lwres_noopresponse_render() lwres_nooprequest_parse() and
  *    lwres_noopresponse_parse() all return #LWRES_R_SUCCESS on success. They
@@ -91,9 +91,9 @@
  *    received packet. These functions will return #LWRES_R_FAILURE if
  *    pktflags in the packet header structure #lwres_lwpacket_t indicate that
  *    the packet is not a response to an earlier query.
- * 
+ *
  * \section lwres_noop_see See Also
- * 
+ *
  *    lwpacket.c
  */
 
diff --git a/lib/tests/include/tests/t_api.h b/lib/tests/include/tests/t_api.h
index 57cc7600f5..16a30173c7 100644
--- a/lib/tests/include/tests/t_api.h
+++ b/lib/tests/include/tests/t_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2010, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2010, 2012, 2013  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/util/merge_copyrights b/util/merge_copyrights
index d29b5e2380..498bfe5bb4 100644
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl -w
 #
-# Copyright (C) 2004-2007, 2009-2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2007, 2009-2013  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
diff --git a/win32utils/legacy/makedefs.pl b/win32utils/legacy/makedefs.pl
index 0644f1d30b..9e3e9305fe 100644
--- a/win32utils/legacy/makedefs.pl
+++ b/win32utils/legacy/makedefs.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2004, 2007, 2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any