From be484acb22e4d903764ccb5ebe51be3a9d4ca29f Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Tue, 30 Sep 2014 23:45:22 +0000 Subject: [PATCH] update copyright notice --- bin/dig/dighost.c | 6 +++--- bin/tests/system/dnssec/ns3/future.example.db.in | 2 +- bin/tests/system/upforwd/ns1/named.conf | 2 +- bin/tests/system/upforwd/ns2/named.conf | 2 +- bin/tests/system/upforwd/ns3/named.conf | 2 +- bin/tests/system/upforwd/setup.sh | 2 +- bin/tests/system/upforwd/tests.sh | 2 +- lib/dns/dispatch.c | 2 +- lib/dns/include/dns/request.h | 2 +- lib/dns/zone.c | 4 ++-- lib/dns/zt.c | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index 846ccce4a3..c99dcfc567 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -5038,9 +5038,9 @@ contains_trusted_key(dns_name_t *name, dns_rdataset_t *rdataset, "DNSKEY RRset: %d\n", dst_key_id(dnsseckey)); result = sigchase_verify_sig_key(name, rdataset, - dnsseckey, - sigrdataset, - mctx); + dnsseckey, + sigrdataset, + mctx); if (result == ISC_R_SUCCESS) goto cleanup; } diff --git a/bin/tests/system/dnssec/ns3/future.example.db.in b/bin/tests/system/dnssec/ns3/future.example.db.in index e41d15b9af..446b89babf 100644 --- a/bin/tests/system/dnssec/ns3/future.example.db.in +++ b/bin/tests/system/dnssec/ns3/future.example.db.in @@ -1,4 +1,4 @@ -; Copyright (C) 2006, 2008 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 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/tests/system/upforwd/ns1/named.conf b/bin/tests/system/upforwd/ns1/named.conf index 25c6672ce3..65db79125f 100644 --- a/bin/tests/system/upforwd/ns1/named.conf +++ b/bin/tests/system/upforwd/ns1/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007, 2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/system/upforwd/ns2/named.conf b/bin/tests/system/upforwd/ns2/named.conf index ff576d2a13..4b609c3211 100644 --- a/bin/tests/system/upforwd/ns2/named.conf +++ b/bin/tests/system/upforwd/ns2/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007, 2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/system/upforwd/ns3/named.conf b/bin/tests/system/upforwd/ns3/named.conf index f5bbde2f21..4eaf24d77b 100644 --- a/bin/tests/system/upforwd/ns3/named.conf +++ b/bin/tests/system/upforwd/ns3/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007, 2011 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007, 2011, 2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/system/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh index 910cc4d2f9..5e10d88ccc 100644 --- a/bin/tests/system/upforwd/setup.sh +++ b/bin/tests/system/upforwd/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2011, 2012, 2014 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000, 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh index 8f6135c90d..0491596ff5 100644 --- a/bin/tests/system/upforwd/tests.sh +++ b/bin/tests/system/upforwd/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007, 2011-2013 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2011-2014 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000, 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c index 1648a20411..c5e73506ab 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -3126,7 +3126,7 @@ dns_dispatch_addresponse2(dns_dispatch_t *disp, isc_sockaddr_t *dest, return (dns_dispatch_addresponse3(disp, 0, dest, task, action, arg, idp, resp, sockmgr)); } - + isc_result_t dns_dispatch_addresponse3(dns_dispatch_t *disp, unsigned int options, isc_sockaddr_t *dest, isc_task_t *task, diff --git a/lib/dns/include/dns/request.h b/lib/dns/include/dns/request.h index a6aa31489a..b19e91164d 100644 --- a/lib/dns/include/dns/request.h +++ b/lib/dns/include/dns/request.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2009, 2010, 2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009, 2010, 2013, 2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/zone.c b/lib/dns/zone.c index a106b5688b..117cdbd6f1 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -14999,7 +14999,7 @@ sendtomaster(dns_forward_t *forward) { forward->msgbuf, &src, &forward->addr, dscp, forward->options, 15 /* XXX */, - 0, 0, forward->zone->task, + 0, 0, forward->zone->task, forward_callback, forward, &forward->request); if (result == ISC_R_SUCCESS) { @@ -15150,7 +15150,7 @@ dns_zone_forwardupdate(dns_zone_t *zone, dns_message_t *msg, * If we have a SIG(0) signed message we need to preserve the * query id as that is included in the SIG(0) computation. */ - if (msg->sig0 != NULL) + if (msg->sig0 != NULL) forward->options |= DNS_REQUESTOPT_FIXEDID; mr = dns_message_getrawmessage(msg); diff --git a/lib/dns/zt.c b/lib/dns/zt.c index 985e67a457..7a39d0d022 100644 --- a/lib/dns/zt.c +++ b/lib/dns/zt.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2011-2013 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2011-2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any