update copyright notice

diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
index 2266990d7fc1539460482dad6ce6edaa0b994cfb..08b55166b50a67a9a41a952113eef63b47cd1ad0 100644 (file)
--- a/bin/confgen/Makefile.in
+++ b/bin/confgen/Makefile.in
@@ -1,5 +1,4 @@
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2002  Internet Software Consortium.
+# Copyright (C) 2009  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
@@ -13,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2009/06/10 00:27:21 each Exp $
+# $Id: Makefile.in,v 1.3 2009/06/11 23:47:55 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/confgen/ddns-confgen.c b/bin/confgen/ddns-confgen.c
index ddb517e41224116a4221d4b83651febef498e3de..d3b0741e1af18c1baf4ac747363df1ce3c3ab866 100644 (file)
--- a/bin/confgen/ddns-confgen.c
+++ b/bin/confgen/ddns-confgen.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ddns-confgen.c,v 1.3 2009/06/11 20:01:22 jinmei Exp $ */
+/* $Id: ddns-confgen.c,v 1.4 2009/06/11 23:47:55 tbox Exp $ */
 
 /*! \file */
 
@@ -107,10 +107,10 @@ main(int argc, char **argv) {
                switch (ch) {
                case 'a':
                        algname = isc_commandline_argument;
-                        alg = alg_fromtext(algname);
-                        if (alg == DST_ALG_UNKNOWN)
+                       alg = alg_fromtext(algname);
+                       if (alg == DST_ALG_UNKNOWN)
                                fatal("Unsupported algorithm '%s'", algname);
-                        keysize = alg_bits(alg);
+                       keysize = alg_bits(alg);
                        break;
                case 'h':
                        usage(0);
@@ -154,29 +154,29 @@ main(int argc, char **argv) {
        argc -= isc_commandline_index;
        argv += isc_commandline_index;
 
-        if (argc == 1)
-                zone = argv[0];
+       if (argc == 1)
+               zone = argv[0];
 
        if (argc > 1)
                usage(1);
 
        DO("create memory context", isc_mem_create(0, 0, &mctx));
 
-        if (self) {
-                if (zone == NULL)
-                        usage(1);
-                keyname = zone;
-        } else {
-                if (keyname == NULL)
-                        keyname = DEFAULT_KEYNAME;
-
-                if (zone != NULL) {
-                        len = strlen(keyname) + strlen(zone) + 2;
-                        keybuf = isc_mem_get(mctx, len);
-                        snprintf(keybuf, len, "%s.%s", keyname, zone);
-                        keyname = (const char *) keybuf;
-                }
-        }
+       if (self) {
+               if (zone == NULL)
+                       usage(1);
+               keyname = zone;
+       } else {
+               if (keyname == NULL)
+                       keyname = DEFAULT_KEYNAME;
+
+               if (zone != NULL) {
+                       len = strlen(keyname) + strlen(zone) + 2;
+                       keybuf = isc_mem_get(mctx, len);
+                       snprintf(keybuf, len, "%s.%s", keyname, zone);
+                       keyname = (const char *) keybuf;
+               }
+       }
 
        isc_buffer_init(&key_txtbuffer, &key_txtsecret, sizeof(key_txtsecret));
 
@@ -227,7 +227,7 @@ update-policy {\n\
          grant %s subdomain %s%s ANY;\n\
 };\n",
                               zone, keyname, zone,
-                               zone[strlen(zone) - 1] == '.' ? "" : ".");
+                              zone[strlen(zone) - 1] == '.' ? "" : ".");
                }
 
        printf("\n\

diff --git a/bin/confgen/ddns-confgen.docbook b/bin/confgen/ddns-confgen.docbook
index 3eb56945a314429bd3a571846e38db2f4c2f8864..bfe7b74b5d540a42c2d446da2cda86a62862a3db 100644 (file)
--- a/bin/confgen/ddns-confgen.docbook
+++ b/bin/confgen/ddns-confgen.docbook
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: ddns-confgen.docbook,v 1.2 2009/06/10 00:27:21 each Exp $ -->
+<!-- $Id: ddns-confgen.docbook,v 1.3 2009/06/11 23:47:55 tbox Exp $ -->
 <refentry id="man.ddns-confgen">
   <refentryinfo>
     <date>Jan 29, 2009</date>
@@ -36,17 +36,9 @@
 
   <docinfo>
     <copyright>
-      <year>2004</year>
-      <year>2005</year>
-      <year>2007</year>
       <year>2009</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>

diff --git a/bin/confgen/include/confgen/os.h b/bin/confgen/include/confgen/os.h
index aa4cf44afd71b0184301d8c2a20693d5b3a7e6ce..2019701fa62d2df4f88ebd09039b6a5fe830cb4c 100644 (file)
--- a/bin/confgen/include/confgen/os.h
+++ b/bin/confgen/include/confgen/os.h
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2001  Internet Software Consortium.
+ * Copyright (C) 2009  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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.h,v 1.2 2009/06/10 00:55:02 each Exp $ */
+/* $Id: os.h,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c
index c0533108245cd1d1247f4ec2c157107557ea99a7..bdeac94d88cf68c23a1da6f26643e764f4b8ee80 100644 (file)
--- a/bin/confgen/keygen.c
+++ b/bin/confgen/keygen.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004-2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2001, 2003 Internet Software Consortium.
+ * Copyright (C) 2009  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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keygen.c,v 1.2 2009/06/10 00:27:21 each Exp $ */
+/* $Id: keygen.c,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 /*! \file */
 
@@ -70,19 +69,19 @@ alg_totext(dns_secalg_t alg) {
  */
 dns_secalg_t
 alg_fromtext(const char *name) {
-        if (strcmp(name, "hmac-md5") == 0)
-                return DST_ALG_HMACMD5;
-        if (strcmp(name, "hmac-sha1") == 0)
-                return DST_ALG_HMACSHA1;
-        if (strcmp(name, "hmac-sha224") == 0)
-                return DST_ALG_HMACSHA224;
-        if (strcmp(name, "hmac-sha256") == 0)
-                return DST_ALG_HMACSHA256;
-        if (strcmp(name, "hmac-sha384") == 0)
-                return DST_ALG_HMACSHA384;
-        if (strcmp(name, "hmac-sha512") == 0)
-                return DST_ALG_HMACSHA512;
-        return DST_ALG_UNKNOWN;
+       if (strcmp(name, "hmac-md5") == 0)
+               return DST_ALG_HMACMD5;
+       if (strcmp(name, "hmac-sha1") == 0)
+               return DST_ALG_HMACSHA1;
+       if (strcmp(name, "hmac-sha224") == 0)
+               return DST_ALG_HMACSHA224;
+       if (strcmp(name, "hmac-sha256") == 0)
+               return DST_ALG_HMACSHA256;
+       if (strcmp(name, "hmac-sha384") == 0)
+               return DST_ALG_HMACSHA384;
+       if (strcmp(name, "hmac-sha512") == 0)
+               return DST_ALG_HMACSHA512;
+       return DST_ALG_UNKNOWN;
 }
 
 /*%
@@ -90,7 +89,7 @@ alg_fromtext(const char *name) {
  */
 int
 alg_bits(dns_secalg_t alg) {
-        switch (alg) {
+       switch (alg) {
            case DST_ALG_HMACMD5:
                return 128;
            case DST_ALG_HMACSHA1:
@@ -105,7 +104,7 @@ alg_bits(dns_secalg_t alg) {
                return 512;
            default:
                return 0;
-        }
+       }
 }
 
 /*%
@@ -139,7 +138,7 @@ generate_key(isc_mem_t *mctx, const char *randomfile, dns_secalg_t alg,
            default:
                fatal("unsupported algorithm %d\n", alg);
        }
-               
+
 
        DO("create entropy context", isc_entropy_create(mctx, &ectx));
 

diff --git a/bin/confgen/keygen.h b/bin/confgen/keygen.h
index 7dcaa3f0ef0625a3cc08fb5bc74f45bd2f473e9d..a9ded4092f544a9af39ac95bb818c153dcf3188a 100644 (file)
--- a/bin/confgen/keygen.h
+++ b/bin/confgen/keygen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keygen.h,v 1.2 2009/06/10 00:27:21 each Exp $ */
+/* $Id: keygen.h,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 #ifndef RNDC_KEYGEN_H
 #define RNDC_KEYGEN_H 1
@@ -26,11 +26,11 @@
 ISC_LANG_BEGINDECLS
 
 void generate_key(isc_mem_t *mctx, const char *randomfile, dns_secalg_t alg,
-                 int keysize, isc_buffer_t *key_txtbuffer);
+                 int keysize, isc_buffer_t *key_txtbuffer);
 
 void write_key_file(const char *keyfile, const char *user,
-                   const char *keyname, isc_buffer_t *secret,
-                   dns_secalg_t alg);
+                   const char *keyname, isc_buffer_t *secret,
+                   dns_secalg_t alg);
 
 const char *alg_totext(dns_secalg_t alg);
 dns_secalg_t alg_fromtext(const char *name);

diff --git a/bin/confgen/rndc-confgen.c b/bin/confgen/rndc-confgen.c
index 3855645a0c249f912a71a0d93bc0b8ed9f2a03c7..8f716a17d35292edb1fee44d5a15e7ff2d3c21bf 100644 (file)
--- a/bin/confgen/rndc-confgen.c
+++ b/bin/confgen/rndc-confgen.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2001, 2003  Internet Software Consortium.
+ * Copyright (C) 2009  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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc-confgen.c,v 1.2 2009/06/10 00:27:21 each Exp $ */
+/* $Id: rndc-confgen.c,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/confgen/rndc-confgen.docbook b/bin/confgen/rndc-confgen.docbook
index d8c01aaf3752f4fc3bae6401b9a41d3b72c30d6a..9d9f46b224cd6f7b2005c47319ddde646e6c54a5 100644 (file)
--- a/bin/confgen/rndc-confgen.docbook
+++ b/bin/confgen/rndc-confgen.docbook
@@ -2,8 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
               [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) 2001, 2003  Internet Software Consortium.
+ - Copyright (C) 2009  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
@@ -18,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: rndc-confgen.docbook,v 1.2 2009/06/10 00:27:21 each Exp $ -->
+<!-- $Id: rndc-confgen.docbook,v 1.3 2009/06/11 23:47:55 tbox Exp $ -->
 <refentry id="man.rndc-confgen">
   <refentryinfo>
     <date>Aug 27, 2001</date>
@@ -37,16 +36,9 @@
 
   <docinfo>
     <copyright>
-      <year>2004</year>
-      <year>2005</year>
-      <year>2007</year>
+      <year>2009</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>

diff --git a/bin/confgen/unix/Makefile.in b/bin/confgen/unix/Makefile.in
index c79100fad7ab76a2bc345fad47b2627e6cb18bda..924701e61ff2ec5c86555b3e45edf319a7daedd3 100644 (file)
--- a/bin/confgen/unix/Makefile.in
+++ b/bin/confgen/unix/Makefile.in
@@ -1,5 +1,4 @@
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2001  Internet Software Consortium.
+# Copyright (C) 2009  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
@@ -13,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2009/06/10 00:27:21 each Exp $
+# $Id: Makefile.in,v 1.3 2009/06/11 23:47:55 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/confgen/unix/os.c b/bin/confgen/unix/os.c
index 7e11a2e36ac0340cc4f77a13b05fdc7fcd900146..3901350d7705d750705d706f59da6e3783d89bd9 100644 (file)
--- a/bin/confgen/unix/os.c
+++ b/bin/confgen/unix/os.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2001  Internet Software Consortium.
+ * Copyright (C) 2009  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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.2 2009/06/10 00:27:21 each Exp $ */
+/* $Id: os.c,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/confgen/util.c b/bin/confgen/util.c
index b2a87a8e33614acf4c7dabc3995973860c421df2..5f5f817a5d3d92d0a8595ced8c13f14b8694a93d 100644 (file)
--- a/bin/confgen/util.c
+++ b/bin/confgen/util.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2009  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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: util.c,v 1.2 2009/06/10 00:27:21 each Exp $ */
+/* $Id: util.c,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 /*! \file */
 
@@ -44,7 +43,7 @@ notify(const char *fmt, ...) {
        }
 }
 
-void            
+void
 fatal(const char *format, ...) {
        va_list args;
 
@@ -54,4 +53,4 @@ fatal(const char *format, ...) {
        va_end(args);
        fprintf(stderr, "\n");
        exit(1);
-}               
+}

diff --git a/bin/confgen/util.h b/bin/confgen/util.h
index 3f9c01ef0658c1cf551aeb89f183464dc5ce4e69..89a09d7ca7fc4fe8cd74f1d4461e4fdb409477df 100644 (file)
--- a/bin/confgen/util.h
+++ b/bin/confgen/util.h
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2009  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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: util.h,v 1.2 2009/06/10 00:27:21 each Exp $ */
+/* $Id: util.h,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 #ifndef RNDC_UTIL_H
 #define RNDC_UTIL_H 1
@@ -43,7 +42,7 @@ ISC_LANG_BEGINDECLS
 void
 notify(const char *fmt, ...) ISC_FORMAT_PRINTF(1, 2);
 
-void            
+void
 fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
 
 ISC_LANG_ENDDECLS

diff --git a/bin/confgen/win32/os.c b/bin/confgen/win32/os.c
index aca56405e9e643cae09b0b9ab114339e07d08cb4..a428c5f918d2c4ebc41444dffd00d483c0fc025f 100644 (file)
--- a/bin/confgen/win32/os.c
+++ b/bin/confgen/win32/os.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2001  Internet Software Consortium.
+ * Copyright (C) 2009  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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.2 2009/06/10 00:27:21 each Exp $ */
+/* $Id: os.c,v 1.3 2009/06/11 23:47:55 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h
index dbecdc70853f4cd0ddc9fc48698c22a6210676df..c16c800fe12661fed80a0e3a600be04514de50c2 100644 (file)
--- a/bin/named/include/named/config.h
+++ b/bin/named/include/named/config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001, 2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h,v 1.15 2009/06/10 00:27:21 each Exp $ */
+/* $Id: config.h,v 1.16 2009/06/11 23:47:55 tbox Exp $ */
 
 #ifndef NAMED_CONFIG_H
 #define NAMED_CONFIG_H 1

diff --git a/bin/named/include/named/tsigconf.h b/bin/named/include/named/tsigconf.h
index 377f0d396f1c1de717cb71845890c8a6afb669eb..30bdf319d31898d2b13405acc978190b41daca46 100644 (file)
--- a/bin/named/include/named/tsigconf.h
+++ b/bin/named/include/named/tsigconf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsigconf.h,v 1.17 2009/06/10 00:27:21 each Exp $ */
+/* $Id: tsigconf.h,v 1.18 2009/06/11 23:47:55 tbox Exp $ */
 
 #ifndef NS_TSIGCONF_H
 #define NS_TSIGCONF_H 1

diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c
index 6c9979002ca54ffe01a07987b30ca8c0f56d7f31..f44dcd7eb48296622b74f88a510595697b1c9cf2 100644 (file)
--- a/bin/named/tsigconf.c
+++ b/bin/named/tsigconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsigconf.c,v 1.31 2009/06/10 00:27:21 each Exp $ */
+/* $Id: tsigconf.c,v 1.32 2009/06/11 23:47:55 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c
index 5c2bb85acb8406cfb9f6693eed86fff19afc5fd4..ec5a2182d9d3871458397cd5e21f2294d1853953 100644 (file)
--- a/bin/named/win32/os.c
+++ b/bin/named/win32/os.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.32 2009/06/10 00:27:21 each Exp $ */
+/* $Id: os.c,v 1.33 2009/06/11 23:47:55 tbox Exp $ */
 
 #include <config.h>
 #include <stdarg.h>

diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index dab74e9509c3b658791a1597ee87b07be3d5aaf9..150bfcf578c76731692d0261ea82f804b055af5b 100644 (file)
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2006-2008  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006-2009  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.30 2009/06/10 00:27:21 each Exp $
+# $Id: Makefile.in,v 1.31 2009/06/11 23:47:55 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index 3702b63f03579fc8b9fe40649eb10abe523fbeae..d6892d1270c6d0d8e970f839cae27d58b6ab8d33 100644 (file)
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.45 2009/06/10 00:27:21 each Exp $
+# $Id: Makefile.in,v 1.46 2009/06/11 23:47:55 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
index 4df14ece88ca3eec490abe0786fe467de4751137..f531ad06500d036937143aeca06e7b1c2a89be7d 100644 (file)
--- a/lib/dns/dst_internal.h
+++ b/lib/dns/dst_internal.h
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_internal.h,v 1.12 2009/06/10 00:27:22 each Exp $ */
+/* $Id: dst_internal.h,v 1.13 2009/06/11 23:47:55 tbox Exp $ */
 
 #ifndef DST_DST_INTERNAL_H
 #define DST_DST_INTERNAL_H 1

diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h
index 3db1b3a3cee1f34060b615a2eefcbcf21df93efc..b4770b4ed1c18d32ab2b25b55655a82b7337c2e2 100644 (file)
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsig.h,v 1.52 2009/06/10 00:27:22 each Exp $ */
+/* $Id: tsig.h,v 1.53 2009/06/11 23:47:55 tbox Exp $ */
 
 #ifndef DNS_TSIG_H
 #define DNS_TSIG_H 1
@@ -81,8 +81,8 @@ struct dns_tsigkey {
 
 #define dns_tsigkey_identity(tsigkey) \
        ((tsigkey) == NULL ? NULL : \
-         (tsigkey)->generated ? ((tsigkey)->creator) : \
-         (&((tsigkey)->name)))
+        (tsigkey)->generated ? ((tsigkey)->creator) : \
+        (&((tsigkey)->name)))
 
 ISC_LANG_BEGINDECLS
 
@@ -244,7 +244,7 @@ dns_tsigkeyring_create(isc_mem_t *mctx, dns_tsig_keyring_t **ringp);
 
 isc_result_t
 dns_tsigkeyring_add(dns_tsig_keyring_t *ring, dns_name_t *name,
-                    dns_tsigkey_t *tkey);
+                   dns_tsigkey_t *tkey);
 /*%<
  *      Place a TSIG key onto a key ring.
  *

diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h
index 858a675e96271fb209b8f76713155bc9a252e6e2..0708e5fb04979aff5eb9d8d8912c372d77b214a1 100644 (file)
--- a/lib/dns/include/dst/dst.h
+++ b/lib/dns/include/dst/dst.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst.h,v 1.13 2009/06/10 00:27:22 each Exp $ */
+/* $Id: dst.h,v 1.14 2009/06/11 23:47:55 tbox Exp $ */
 
 #ifndef DST_DST_H
 #define DST_DST_H 1

diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index 4eff271bc68f5132b9adbd03904b474907f24d96..d164530654f3715c4ecd9117031eeeb19e267862 100644 (file)
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.137 2009/06/10 00:27:22 each Exp $
+ * $Id: tsig.c,v 1.138 2009/06/11 23:47:55 tbox Exp $
  */
 /*! \file */
 #include <config.h>

diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index 70fa0e45b7d37d13513930fa507c213501209424..026182e4c36abe6a093e150cdef03d471ff7fb8a 100644 (file)
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: file.c,v 1.32 2009/06/10 00:27:22 each Exp $ */
+/* $Id: file.c,v 1.33 2009/06/11 23:47:55 tbox Exp $ */
 
 #include <config.h>
 
@@ -213,9 +213,9 @@ isc_file_getmodtime(const char *file, isc_time_t *time) {
                         &time->absolute))
        {
                close(fh);
-                errno = EINVAL;
-                return (isc__errno2result(errno));
-        }
+               errno = EINVAL;
+               return (isc__errno2result(errno));
+       }
        close(fh);
        return (ISC_R_SUCCESS);
 }
@@ -229,23 +229,23 @@ isc_file_settime(const char *file, isc_time_t *time) {
        if ((fh = open(file, _O_RDWR | _O_BINARY)) < 0)
                return (isc__errno2result(errno));
 
-        /*
+       /*
         * Set the date via the filedate system call and return.  Failing
-         * this call implies the new file times are not supported by the
-         * underlying file system.
-         */
+        * this call implies the new file times are not supported by the
+        * underlying file system.
+        */
        if (!SetFileTime((HANDLE) _get_osfhandle(fh),
                         NULL,
                         &time->absolute,
                         &time->absolute))
        {
                close(fh);
-                errno = EINVAL;
-                return (isc__errno2result(errno));
-        }
+               errno = EINVAL;
+               return (isc__errno2result(errno));
+       }
 
        close(fh);
-        return (ISC_R_SUCCESS);
+       return (ISC_R_SUCCESS);
 
 }
 
@@ -457,7 +457,7 @@ isc_file_progname(const char *filename, char *progname, size_t namelen) {
                return (ISC_R_SUCCESS);
        }
 
-       /* 
+       /*
         * Copy the result to the buffer
         */
        len = p - s;

diff --git a/lib/isc/win32/include/isc/ntpaths.h b/lib/isc/win32/include/isc/ntpaths.h
index 47e8c7929271a8c34c9b7f4bf0207012b621f974..4d4d3a451e0f93641bd716c785c1d1f87152e741 100644 (file)
--- a/lib/isc/win32/include/isc/ntpaths.h
+++ b/lib/isc/win32/include/isc/ntpaths.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntpaths.h,v 1.17 2009/06/10 00:27:22 each Exp $ */
+/* $Id: ntpaths.h,v 1.18 2009/06/11 23:47:55 tbox Exp $ */
 
 /*
  * Windows-specific path definitions

diff --git a/lib/isc/win32/ntpaths.c b/lib/isc/win32/ntpaths.c
index 16c5465a84c2ca906404fa63b5953b3ce49a5f65..47a11dcbcb5ba1b3d0421a16381fc331b15598aa 100644 (file)
--- a/lib/isc/win32/ntpaths.c
+++ b/lib/isc/win32/ntpaths.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntpaths.c,v 1.12 2009/06/10 00:27:22 each Exp $ */
+/* $Id: ntpaths.c,v 1.13 2009/06/11 23:47:55 tbox Exp $ */
 
 /*
  * This module fetches the required path information that is specific
@@ -57,7 +57,7 @@ isc_ntpaths_init() {
        if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, BIND_SUBKEY, 0, KEY_READ, &hKey)
                != ERROR_SUCCESS)
                keyFound = FALSE;
-       
+
        if (keyFound == TRUE) {
                /* Get the named directory */
                if (RegQueryValueEx(hKey, "InstallDir", NULL, NULL,
@@ -100,7 +100,7 @@ isc_ntpaths_init() {
 
        strcpy(sys_conf_dir, namedBase);
        strcat(sys_conf_dir, "\\etc");
-       
+
        Initialized = TRUE;
 }
 

diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index 47e82d705e3293f7b137b0497c5e881d2bf4597c..c07cee537c788ee16726f9839a7bfc4608781a49 100644 (file)
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: grammar.h,v 1.18 2009/06/10 00:27:22 each Exp $ */
+/* $Id: grammar.h,v 1.19 2009/06/11 23:47:55 tbox Exp $ */
 
 #ifndef ISCCFG_GRAMMAR_H
 #define ISCCFG_GRAMMAR_H 1

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index a931b923f2ed2955746da301d8dc6b6f6cdcbd3a..1314e7a5de5a2e60504e5857eecce1f307d41d0e 100644 (file)
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parser.c,v 1.130 2009/06/10 00:27:22 each Exp $ */
+/* $Id: parser.c,v 1.131 2009/06/11 23:47:55 tbox Exp $ */
 
 /*! \file */
 
@@ -400,7 +400,7 @@ cfg_parser_create(isc_mem_t *mctx, isc_log_t *lctx, cfg_parser_t **ret) {
        pctx->callback = NULL;
        pctx->callbackarg = NULL;
        pctx->token.type = isc_tokentype_unknown;
-        pctx->flags = 0;
+       pctx->flags = 0;
 
        memset(specials, 0, sizeof(specials));
        specials['{'] = 1;

diff --git a/util/merge_copyrights b/util/merge_copyrights
index 6ca41b7c30aaab1f3a96dc2c1f1409665a1b83ee..e957aefc5d6b2922ea484b6e18fad891786042f8 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl -w
 #
-# Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2007, 2009  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
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: merge_copyrights,v 1.32 2009/06/10 23:52:44 marka Exp $
+# $Id: merge_copyrights,v 1.33 2009/06/11 23:47:56 tbox Exp $
 
 %file_types = ();
 %file_years = ();