diff --git a/bin/named/server.c b/bin/named/server.c index cf46efa812..91bc8209bf 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -3083,7 +3083,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, freq = cfg_obj_asuint32(obj2); obj2 = cfg_tuple_get(obj, "low"); - low = (double) cfg_obj_asfixedpoint(obj2) / 100.0; + low = (double) cfg_obj_asfixedpoint(obj2) / 100.0; obj2 = cfg_tuple_get(obj, "high"); high = (double) cfg_obj_asfixedpoint(obj2) / 100.0; @@ -5780,7 +5780,7 @@ load_configuration(const char *filename, ns_server_t *server, isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER, ISC_LOG_ERROR, "'recursive-clients %d' too low when " - "running with %d worker threads", + "running with %d worker threads", server->recursionquota.max, ns_g_cpus); CHECK(ISC_R_RANGE); } diff --git a/bin/tests/system/ditch.pl b/bin/tests/system/ditch.pl index 6c48d82b59..1e6ad491d4 100644 --- a/bin/tests/system/ditch.pl +++ b/bin/tests/system/ditch.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# Copyright (C) 2011, 2012 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2015 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/tests/system/fetchlimit/ans4/ans.pl b/bin/tests/system/fetchlimit/ans4/ans.pl index d844502702..7e6e0c59e8 100644 --- a/bin/tests/system/fetchlimit/ans4/ans.pl +++ b/bin/tests/system/fetchlimit/ans4/ans.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2015 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/tests/system/fetchlimit/clean.sh b/bin/tests/system/fetchlimit/clean.sh index 4976b3ae98..73ed8c8aea 100644 --- a/bin/tests/system/fetchlimit/clean.sh +++ b/bin/tests/system/fetchlimit/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2015 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/tests/system/fetchlimit/ns1/named.conf b/bin/tests/system/fetchlimit/ns1/named.conf index 4354b46e3b..27b5c885fa 100644 --- a/bin/tests/system/fetchlimit/ns1/named.conf +++ b/bin/tests/system/fetchlimit/ns1/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2015 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/tests/system/fetchlimit/ns1/root.db b/bin/tests/system/fetchlimit/ns1/root.db index cd74861619..b433cd8d04 100644 --- a/bin/tests/system/fetchlimit/ns1/root.db +++ b/bin/tests/system/fetchlimit/ns1/root.db @@ -1,4 +1,4 @@ -; Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2015 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/tests/system/fetchlimit/ns2/example.db b/bin/tests/system/fetchlimit/ns2/example.db index 128155420e..1197da4b55 100644 --- a/bin/tests/system/fetchlimit/ns2/example.db +++ b/bin/tests/system/fetchlimit/ns2/example.db @@ -1,4 +1,4 @@ -; Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2015 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/tests/system/fetchlimit/ns2/named.conf b/bin/tests/system/fetchlimit/ns2/named.conf index b276181ffe..2a5667a714 100644 --- a/bin/tests/system/fetchlimit/ns2/named.conf +++ b/bin/tests/system/fetchlimit/ns2/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2015 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/tests/system/fetchlimit/ns3/named1.conf b/bin/tests/system/fetchlimit/ns3/named1.conf index e4a5039111..95e138ecba 100644 --- a/bin/tests/system/fetchlimit/ns3/named1.conf +++ b/bin/tests/system/fetchlimit/ns3/named1.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2015 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/tests/system/fetchlimit/ns3/named2.conf b/bin/tests/system/fetchlimit/ns3/named2.conf index 2a40512928..3a4d43ac6e 100644 --- a/bin/tests/system/fetchlimit/ns3/named2.conf +++ b/bin/tests/system/fetchlimit/ns3/named2.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2015 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/tests/system/fetchlimit/ns3/named3.conf b/bin/tests/system/fetchlimit/ns3/named3.conf index e017e420f4..94bf0b9a41 100644 --- a/bin/tests/system/fetchlimit/ns3/named3.conf +++ b/bin/tests/system/fetchlimit/ns3/named3.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2015 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/tests/system/fetchlimit/ns3/root.hint b/bin/tests/system/fetchlimit/ns3/root.hint index 2b369268d3..1680d8e152 100644 --- a/bin/tests/system/fetchlimit/ns3/root.hint +++ b/bin/tests/system/fetchlimit/ns3/root.hint @@ -1,4 +1,4 @@ -; Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2015 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/tests/system/fetchlimit/setup.sh b/bin/tests/system/fetchlimit/setup.sh index 89772208a2..6f30b29fc2 100644 --- a/bin/tests/system/fetchlimit/setup.sh +++ b/bin/tests/system/fetchlimit/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2015 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/tests/system/fetchlimit/tests.sh b/bin/tests/system/fetchlimit/tests.sh index 83534e6501..bf3c63c44b 100644 --- a/bin/tests/system/fetchlimit/tests.sh +++ b/bin/tests/system/fetchlimit/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2015 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/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h index 4947b14a13..533c42679d 100644 --- a/lib/dns/include/dns/log.h +++ b/lib/dns/include/dns/log.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2009, 2011-2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009, 2011-2015 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 diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h index a843f99152..4f19ff4739 100644 --- a/lib/dns/include/dns/resolver.h +++ b/lib/dns/include/dns/resolver.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2015 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 @@ -684,7 +684,7 @@ dns_resolver_getquotaresponse(dns_resolver_t *resolver, dns_quotatype_t which); * are exceeded. If 'which' is set to quotatype "zone", then the * result specified in 'resp' will be used when the fetches-per-zone * quota is exceeded by a fetch. If 'which' is set to quotatype "server", - * then the reuslt specified in 'resp' will be used when the + * then the reuslt specified in 'resp' will be used when the * fetches-per-server quota has been exceeded for all the * authoritative servers for a zone. Valid choices are * DNS_R_DROP or DNS_R_SERVFAIL. diff --git a/lib/dns/log.c b/lib/dns/log.c index 3f1a831131..101c26639d 100644 --- a/lib/dns/log.c +++ b/lib/dns/log.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2009, 2011-2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009, 2011-2015 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 diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h index 0c1e94562f..6baf786bde 100644 --- a/lib/isc/include/isc/util.h +++ b/lib/isc/include/isc/util.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2010-2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2010-2012, 2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any