From e23798e2ab09d2714c6fb18aec3431826154e58a Mon Sep 17 00:00:00 2001
From: Tinderbox User <tbox@isc.org>
Date: Fri, 28 Feb 2014 23:46:19 +0000
Subject: [PATCH] update copyright notice

---
 bin/dnssec/dnssec-keyfromlabel.c | 40 ++++++++++++++++----------------
 bin/python/dnssec-checkds.8      |  2 +-
 bin/tools/named-rrchecker.1      |  2 +-
 bin/tools/named-rrchecker.html   |  2 +-
 isc-config.sh.1                  |  2 +-
 isc-config.sh.html               |  2 +-
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c
index 8bd2ea3af3..b861c6ef82 100644
--- a/bin/dnssec/dnssec-keyfromlabel.c
+++ b/bin/dnssec/dnssec-keyfromlabel.c
@@ -358,7 +358,7 @@ main(int argc, char **argv) {
 
 		if (strcasecmp(algname, "RSA") == 0) {
 			fprintf(stderr, "The use of RSA (RSAMD5) is not "
-				        "recommended.\nIf you still wish to "
+					"recommended.\nIf you still wish to "
 					"use RSA (RSAMD5) please specify "
 					"\"-a RSAMD5\"\n");
 			if (freeit != NULL)
@@ -398,27 +398,27 @@ main(int argc, char **argv) {
 		}
 
 		if (!oldstyle && prepub > 0) {
-                        if (setpub && setact && (activate - prepub) < publish)
-                                fatal("Activation and publication dates "
-                                      "are closer together than the\n\t"
-                                      "prepublication interval.");
+			if (setpub && setact && (activate - prepub) < publish)
+				fatal("Activation and publication dates "
+				      "are closer together than the\n\t"
+				      "prepublication interval.");
 
-                        if (!setpub && !setact) {
-                                setpub = setact = ISC_TRUE;
-                                publish = now;
-                                activate = now + prepub;
-                        } else if (setpub && !setact) {
-                                setact = ISC_TRUE;
-                                activate = publish + prepub;
-                        } else if (setact && !setpub) {
-                                setpub = ISC_TRUE;
-                                publish = activate - prepub;
-                        }
+			if (!setpub && !setact) {
+				setpub = setact = ISC_TRUE;
+				publish = now;
+				activate = now + prepub;
+			} else if (setpub && !setact) {
+				setact = ISC_TRUE;
+				activate = publish + prepub;
+			} else if (setact && !setpub) {
+				setpub = ISC_TRUE;
+				publish = activate - prepub;
+			}
 
-                        if ((activate - prepub) < now)
-                                fatal("Time until activation is shorter "
-                                      "than the\n\tprepublication interval.");
-                }
+			if ((activate - prepub) < now)
+				fatal("Time until activation is shorter "
+				      "than the\n\tprepublication interval.");
+		}
 	} else {
 		char keystr[DST_KEY_FORMATSIZE];
 		isc_stdtime_t when;
diff --git a/bin/python/dnssec-checkds.8 b/bin/python/dnssec-checkds.8
index 85a51078fe..81172abb67 100644
--- a/bin/python/dnssec-checkds.8
+++ b/bin/python/dnssec-checkds.8
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2012-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/tools/named-rrchecker.1 b/bin/tools/named-rrchecker.1
index 894b9ceee5..452ba6d44f 100644
--- a/bin/tools/named-rrchecker.1
+++ b/bin/tools/named-rrchecker.1
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2013, 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/tools/named-rrchecker.html b/bin/tools/named-rrchecker.html
index d066b1f58e..6c7ecd4c92 100644
--- a/bin/tools/named-rrchecker.html
+++ b/bin/tools/named-rrchecker.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2013, 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/isc-config.sh.1 b/isc-config.sh.1
index a5e09ffdbb..add96b0204 100644
--- a/isc-config.sh.1
+++ b/isc-config.sh.1
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2009, 2012, 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/isc-config.sh.html b/isc-config.sh.html
index 9fe3ba2e61..27455c7472 100644
--- a/isc-config.sh.html
+++ b/isc-config.sh.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2009, 2011, 2012, 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