update copyright notice

diff --git a/bin/named/server.c b/bin/named/server.c
index 96e6bd1115311fc988969c265d93e7f0db84441e..4c85068fba9d35c6587a1161f818a444d0f22dce 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-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: server.c,v 1.520.12.12 2010/02/25 05:35:09 marka Exp $ */
+/* $Id: server.c,v 1.520.12.13 2010/02/25 10:56:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index 21d6e77c73177b4a8d8174e45d97ddee8b553738..93c51812f3a3a9ecefa7fc661b5546a93dac2018 100644 (file)
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-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: rdataset.h,v 1.65.50.3 2010/02/25 05:35:11 marka Exp $ */
+/* $Id: rdataset.h,v 1.65.50.4 2010/02/25 10:56:41 tbox Exp $ */
 
 #ifndef DNS_RDATASET_H
 #define DNS_RDATASET_H 1

diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index 9063029acadd92aa0443dccc95cb595d244fe326..89a257781ddb0e3afb1e41f475ea752fbea62ddf 100644 (file)
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 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: resolver.h,v 1.60.56.4 2010/02/25 05:35:11 marka Exp $ */
+/* $Id: resolver.h,v 1.60.56.5 2010/02/25 10:56:41 tbox Exp $ */
 
 #ifndef DNS_RESOLVER_H
 #define DNS_RESOLVER_H 1
@@ -510,7 +510,7 @@ dns_resolver_getoptions(dns_resolver_t *resolver);
 
 void
 dns_resolver_addbadcache(dns_resolver_t *resolver, dns_name_t *name,
-                         dns_rdatatype_t type, isc_time_t *expire);
+                        dns_rdatatype_t type, isc_time_t *expire);
 /*%<
  * Add a entry to the bad cache for <name,type> that will expire at 'expire'.
  *
@@ -521,7 +521,7 @@ dns_resolver_addbadcache(dns_resolver_t *resolver, dns_name_t *name,
 
 isc_boolean_t
 dns_resolver_getbadcache(dns_resolver_t *resolver, dns_name_t *name,
-                         dns_rdatatype_t type, isc_time_t *now);
+                        dns_rdatatype_t type, isc_time_t *now);
 /*%<
  * Check to see if there is a unexpired entry in the bad cache for
  * <name,type>.

diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h
index 351eceb38ab387ec35925d3d152c98222cbd6802..3db6a17426bc29b099bb500f7c000cdb66fafa6c 100644 (file)
--- a/lib/dns/include/dns/result.h
+++ b/lib/dns/include/dns/result.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-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: result.h,v 1.116.48.1 2010/02/25 05:35:11 marka Exp $ */
+/* $Id: result.h,v 1.116.48.2 2010/02/25 10:56:41 tbox Exp $ */
 
 #ifndef DNS_RESULT_H
 #define DNS_RESULT_H 1

diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h
index 5560122e74060fb7689c500157f5cef9bb8df770..49da784479787a6b62ffeba0e03a8215a123b605 100644 (file)
--- a/lib/dns/include/dns/validator.h
+++ b/lib/dns/include/dns/validator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  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: validator.h,v 1.41.48.4 2010/02/25 05:35:11 marka Exp $ */
+/* $Id: validator.h,v 1.41.48.5 2010/02/25 10:56:41 tbox Exp $ */
 
 #ifndef DNS_VALIDATOR_H
 #define DNS_VALIDATOR_H 1

diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index d5d5702b2589096c120efe57039f5998dd08ea95..ff21e43e18af891a02c8572e672749ef8a1ef6b8 100644 (file)
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-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: ncache.c,v 1.43.48.1 2010/02/25 05:35:09 marka Exp $ */
+/* $Id: ncache.c,v 1.43.48.2 2010/02/25 10:56:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index deea9db50808866c8ead9176fbef29d93f2b9820..11962f1bd4db62aff2b05b7489982dfeef5b802d 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-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: rbtdb.c,v 1.270.12.17 2010/02/25 05:35:09 marka Exp $ */
+/* $Id: rbtdb.c,v 1.270.12.18 2010/02/25 10:56:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c
index 109bc8a812c604b8624eee6e05b11f52487a3fc9..b9a46cc26f0545a67a93f6cac0f7e3234c81e932 100644 (file)
--- a/lib/dns/rdatalist.c
+++ b/lib/dns/rdatalist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 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: rdatalist.c,v 1.36.50.1 2010/02/25 05:35:10 marka Exp $ */
+/* $Id: rdatalist.c,v 1.36.50.2 2010/02/25 10:56:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 1e9aed0da5b752d237b40e10d5612dc3ef6cc9bf..7c684b83e99674c3e60bc978c53a6f48d9a81987 100644 (file)
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-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: rdataset.c,v 1.82.50.3 2010/02/25 05:35:10 marka Exp $ */
+/* $Id: rdataset.c,v 1.82.50.4 2010/02/25 10:56:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index 18fbee9cc17414e615d452a5db21142c64058446..34fcbeb9ae553e732e242bc6df17e20dcbd7f63c 100644 (file)
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-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: rdataslab.c,v 1.48.50.3 2010/02/25 05:35:10 marka Exp $ */
+/* $Id: rdataslab.c,v 1.48.50.4 2010/02/25 10:56:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index ad4a7dd3729eca67c51e1a4920715e781ae07d9d..5a1b3240f1d6faf389df853d0fb90766cc547d07 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.384.14.21 2010/02/25 05:35:10 marka Exp $ */
+/* $Id: resolver.c,v 1.384.14.22 2010/02/25 10:56:41 tbox Exp $ */
 
 /*! \file */
 
@@ -7831,7 +7831,7 @@ dns_resolver_flushbadcache(dns_resolver_t *resolver, dns_name_t *name) {
                        } else
                                prev = bad;
                }
-       } else 
+       } else
                destroy_badcache(resolver);
 
  unlock:

diff --git a/lib/dns/result.c b/lib/dns/result.c
index 95b9a4c1ebdb2d8941b35c1210cef25a78bfc116..a92022502f07ceff000d791f6928571ef4592920 100644 (file)
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-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: result.c,v 1.125.48.1 2010/02/25 05:35:11 marka Exp $ */
+/* $Id: result.c,v 1.125.48.2 2010/02/25 10:56:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index 45fb56ac93f72b6a8d8b485704caf53555dfedde..2d20ebcc273481ce9a689dbeee21f740f14b39da 100644 (file)
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  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
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdb.c,v 1.66.48.4 2010/02/25 05:35:11 marka Exp $ */
+/* $Id: sdb.c,v 1.66.48.5 2010/02/25 10:56:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index de1c3d1feef6554035f1c4bacb99e8ca51b2e9c2..4cd05788fb0c9baf9cbcb5df1d256d6526b84ac8 100644 (file)
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2005-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2005-2010  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -50,7 +50,7 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdlz.c,v 1.18.50.4 2010/02/25 05:35:11 marka Exp $ */
+/* $Id: sdlz.c,v 1.18.50.5 2010/02/25 10:56:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 323c676a6174a34d887e0c009e956123c2710e64..cfa79b54a33846ec33f1f76ada803b489f44b9fe 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  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: validator.c,v 1.164.12.12 2010/02/25 05:35:11 marka Exp $ */
+/* $Id: validator.c,v 1.164.12.13 2010/02/25 10:56:41 tbox Exp $ */
 
 #include <config.h>
 
@@ -3265,24 +3265,24 @@ finddlvsep(dns_validator_t *val, isc_boolean_t resume) {
                              namebuf);
                result = view_find(val, dlvname, dns_rdatatype_dlv);
                if (result == ISC_R_SUCCESS) {
-                        if (DNS_TRUST_PENDING(val->frdataset.trust) &&
-                            dns_rdataset_isassociated(&val->fsigrdataset))
-                        {
-                                dns_fixedname_init(&val->fname);
-                                dns_name_copy(dlvname,
-                                              dns_fixedname_name(&val->fname),
-                                              NULL);
-                                result = create_validator(val,
-                                                dns_fixedname_name(&val->fname),
-                                                          dns_rdatatype_dlv,
-                                                          &val->frdataset,
-                                                          &val->fsigrdataset,
-                                                          dlvvalidated,
-                                                          "finddlvsep");
-                                if (result != ISC_R_SUCCESS)
-                                        return (result);
-                                return (DNS_R_WAIT);
-                        }
+                       if (DNS_TRUST_PENDING(val->frdataset.trust) &&
+                           dns_rdataset_isassociated(&val->fsigrdataset))
+                       {
+                               dns_fixedname_init(&val->fname);
+                               dns_name_copy(dlvname,
+                                             dns_fixedname_name(&val->fname),
+                                             NULL);
+                               result = create_validator(val,
+                                               dns_fixedname_name(&val->fname),
+                                                         dns_rdatatype_dlv,
+                                                         &val->frdataset,
+                                                         &val->fsigrdataset,
+                                                         dlvvalidated,
+                                                         "finddlvsep");
+                               if (result != ISC_R_SUCCESS)
+                                       return (result);
+                               return (DNS_R_WAIT);
+                       }
                        if (val->frdataset.trust < dns_trust_secure)
                                return (DNS_R_NOVALIDSIG);
                        val->havedlvsep = ISC_TRUE;

diff --git a/lib/dns/view.c b/lib/dns/view.c
index c6069fc92e8bdf7dba8c344b043b1c0351da7e6d..b3acf1a256d21ecdf0aaa7c54aeec405132132b6 100644 (file)
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-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: view.c,v 1.150.84.4 2010/02/25 05:35:11 marka Exp $ */
+/* $Id: view.c,v 1.150.84.5 2010/02/25 10:56:41 tbox Exp $ */
 
 /*! \file */