update copyright notice

diff --git a/bin/named/server.c b/bin/named/server.c
index dcc8a606dbfcb581ee8d37588bb527c3641fd020..6608fdfe1409f37b0926e02ec58221ade8220e77 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.11.8.1 2010/02/25 05:39:32 marka Exp $ */
+/* $Id: server.c,v 1.520.12.11.8.2 2010/02/25 10:57:11 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index fec7ddc977376ce88980743c152c444adbb5261a..d435ed009d4ffa7e3e76abee662a229b318bec94 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.2.22.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: rdataset.h,v 1.65.50.2.22.2 2010/02/25 10:57:12 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 909245b5f649290a9fd92af5a2368acda839cbca..8c7ad7254b0aa063de956e24431767e74291db6e 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.3.22.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: resolver.h,v 1.60.56.3.22.2 2010/02/25 10:57:12 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 d2c28e16575437451186eed90f523827c5ae1036..a1e7f535dee81d3a2f04146a8c13ca23d70070f5 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.226.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: result.h,v 1.116.226.2 2010/02/25 10:57:12 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 7a70b71812bddfab49aded3e6c5177e4ef17d022..1da4e0c4c3908cf35f665fec6ceabf88c5991b2e 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.3.22.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: validator.h,v 1.41.48.3.22.2 2010/02/25 10:57:12 tbox Exp $ */
 
 #ifndef DNS_VALIDATOR_H
 #define DNS_VALIDATOR_H 1

diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index 54433e5a373165f9f4a5219df46ad85dee9de4b9..733d138dda24c68f02f9ca9fd8b5137ccb75a912 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.334.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: ncache.c,v 1.43.334.2 2010/02/25 10:57:11 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index da6d15ff55721671f1a59615ffe4e4e01cc20b60..391e32fb55b271a4f7c9dcdf30fd07e98906e809 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.16.8.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: rbtdb.c,v 1.270.12.16.8.2 2010/02/25 10:57:11 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c
index 8155d1274e4ebf65fe6780057fcf1b1863b45b47..d07261989640a221ef1caa11e26ef3aaf6374d3a 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.336.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: rdatalist.c,v 1.36.336.2 2010/02/25 10:57:12 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 1cefb98dd5c75bc45ad7e2d647c27e795d53ba6d..946ec9ae9aab8339427201b842161919c007357f 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.2.22.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: rdataset.c,v 1.82.50.2.22.2 2010/02/25 10:57:12 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index 8f11616c7c7913dacc83549fe7d1d9a7b0696780..4eadff9881e7ac543ca86c9e5ce904ce6930e7a7 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.2.22.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: rdataslab.c,v 1.48.50.2.22.2 2010/02/25 10:57:12 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 0555e43ea122ba9ae14ba3dcc371473ba2e27ff2..244718fb5db0cc5c258f9cab39924491a59e597f 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.20.8.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: resolver.c,v 1.384.14.20.8.2 2010/02/25 10:57:12 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 dc488a4890110ca596a03a28e5f3f97e2a6d6df2..e3361975823ba184befb2b64dd2fae5020a1c8e8 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.122.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: result.c,v 1.125.122.2 2010/02/25 10:57:12 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index 026be2a2883b5dc4e33dfe6de4867ec32d6a26f1..e0c8786b21306f21a11514c5b348c94b3dce2ca1 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.3.8.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: sdb.c,v 1.66.48.3.8.2 2010/02/25 10:57:12 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index 7c0327fbad34782fead19952eaabed30e15a7918..caf71b5af7cff28506f11d35c86a5f465ef27401 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.3.8.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: sdlz.c,v 1.18.50.3.8.2 2010/02/25 10:57:12 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 0ffcd4b30b850741a386a01a463e453aaefb029f..0ccdc41980cec80050bc96da820d9ec8d11f22a3 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.11.8.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: validator.c,v 1.164.12.11.8.2 2010/02/25 10:57:12 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 04232c6816e6e240ff94c894d4fdf15f739446e4..72163b4ab896154c7722b1ab7ca3a2887cb5d997 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.3.8.1 2010/02/25 05:39:33 marka Exp $ */
+/* $Id: view.c,v 1.150.84.3.8.2 2010/02/25 10:57:12 tbox Exp $ */
 
 /*! \file */