update copyright notice

diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c
index 8bd2ea3af388cdb31c9fa1a06f0078865879c8c5..b861c6ef823e3cc4cf641ab55ab71d50c637fd34 100644 (file)
--- 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) {
-                                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 (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 ((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 85a51078feca8217ff29d078707a5b2f2110c89f..81172abb6760bb2b96ac3b5cae1efb4c9e525ba2 100644 (file)
--- 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 894b9ceee5408f251547fe792eb1bc05319d4958..452ba6d44f1a7b18ad9ccb2055f06b32181718a9 100644 (file)
--- 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 d066b1f58e797d7c250053cc02fcbe05dcd4e7a4..6c7ecd4c92c3b5b2c106158c4d44d1295cb2b0ac 100644 (file)
--- 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 a5e09ffdbb11851f1420656958b7bb676608bcf9..add96b02042fb0f4b551c797c14a827fa3265371 100644 (file)
--- 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 9fe3ba2e616e64c804c37193dce0e3302fb33b25..27455c7472243b495fe5afc52f6c8bd2bc760596 100644 (file)
--- 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