From 26d8ffe715e74d1e67d268551449b780fec1b95f Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Sun, 19 Jul 2009 23:47:55 +0000 Subject: [PATCH] update copyright notice --- bin/dnssec/dnssec-dsfromkey.c | 20 ++++++++++---------- bin/dnssec/dnssec-keyfromlabel.docbook | 5 +++-- bin/dnssec/dnssec-keygen.c | 4 ++-- bin/dnssec/dnssec-settime.8 | 10 +++++----- bin/dnssec/dnssec-settime.html | 11 ++++++----- bin/dnssec/dnssectool.c | 4 ++-- bin/tests/system/tkey/keycreate.c | 6 +++--- bin/tests/system/tkey/keydelete.c | 4 ++-- bin/tests/system/tkey/ns1/setup.sh | 4 ++-- bin/tests/system/tkey/tests.sh | 4 ++-- lib/dns/db.c | 4 ++-- lib/dns/dnssec.c | 6 +++--- lib/dns/dst_api.c | 4 ++-- lib/dns/dst_parse.c | 6 +++--- lib/dns/dst_parse.h | 4 ++-- lib/dns/include/dns/db.h | 4 ++-- 16 files changed, 51 insertions(+), 49 deletions(-) diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c index a011f3bd17..18fb64e901 100644 --- a/bin/dnssec/dnssec-dsfromkey.c +++ b/bin/dnssec/dnssec-dsfromkey.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-dsfromkey.c,v 1.10 2009/07/19 05:06:48 each Exp $ */ +/* $Id: dnssec-dsfromkey.c,v 1.11 2009/07/19 23:47:55 tbox Exp $ */ /*! \file */ @@ -67,12 +67,12 @@ initname(char *setname) { isc_result_t result; isc_buffer_t buf; - dns_fixedname_init(&fixed); - name = dns_fixedname_name(&fixed); - - isc_buffer_init(&buf, setname, strlen(setname)); - isc_buffer_add(&buf, strlen(setname)); - result = dns_name_fromtext(name, &buf, dns_rootname, ISC_FALSE, NULL); + dns_fixedname_init(&fixed); + name = dns_fixedname_name(&fixed); + + isc_buffer_init(&buf, setname, strlen(setname)); + isc_buffer_add(&buf, strlen(setname)); + result = dns_name_fromtext(name, &buf, dns_rootname, ISC_FALSE, NULL); return (result); } @@ -424,7 +424,7 @@ main(int argc, char **argv) { if (filename == NULL) showall = ISC_TRUE; - if (argc < isc_commandline_index + 1 && filename == NULL) + if (argc < isc_commandline_index + 1 && filename == NULL) fatal("the key file name was not specified"); if (argc > isc_commandline_index + 1) fatal("extraneous arguments"); @@ -475,9 +475,9 @@ main(int argc, char **argv) { if (both) { emit(DNS_DSDIGEST_SHA1, showall, lookaside, - &rdata); + &rdata); emit(DNS_DSDIGEST_SHA256, showall, lookaside, - &rdata); + &rdata); } else emit(dtype, showall, lookaside, &rdata); } diff --git a/bin/dnssec/dnssec-keyfromlabel.docbook b/bin/dnssec/dnssec-keyfromlabel.docbook index f7af284dff..1e478d93a3 100644 --- a/bin/dnssec/dnssec-keyfromlabel.docbook +++ b/bin/dnssec/dnssec-keyfromlabel.docbook @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []> - + February 8, 2008 @@ -37,6 +37,7 @@ 2008 + 2009 Internet Systems Consortium, Inc. ("ISC") diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index 454bce9f81..d2188478f2 100644 --- a/bin/dnssec/dnssec-keygen.c +++ b/bin/dnssec/dnssec-keygen.c @@ -29,7 +29,7 @@ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-keygen.c,v 1.88 2009/07/19 04:18:04 each Exp $ */ +/* $Id: dnssec-keygen.c,v 1.89 2009/07/19 23:47:55 tbox Exp $ */ /*! \file */ @@ -317,7 +317,7 @@ main(int argc, char **argv) { now, now); break; case 'U': - unpublish = strtotime(isc_commandline_argument, + unpublish = strtotime(isc_commandline_argument, now, now); break; case 'D': diff --git a/bin/dnssec/dnssec-settime.8 b/bin/dnssec/dnssec-settime.8 index 9ac9faeeb3..c3f6e982b7 100644 --- a/bin/dnssec/dnssec-settime.8 +++ b/bin/dnssec/dnssec-settime.8 @@ -1,18 +1,18 @@ -.\" 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 .\" copyright notice and this permission notice appear in all copies. -.\" +.\" .\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH .\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, .\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM .\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: dnssec-settime.8,v 1.3 2009/07/19 04:27:55 tbox Exp $ +.\" $Id: dnssec-settime.8,v 1.4 2009/07/19 23:47:55 tbox Exp $ .\" .hy 0 .ad l diff --git a/bin/dnssec/dnssec-settime.html b/bin/dnssec/dnssec-settime.html index 73f4b3e5bd..06dda04c43 100644 --- a/bin/dnssec/dnssec-settime.html +++ b/bin/dnssec/dnssec-settime.html @@ -1,19 +1,20 @@ - + + diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c index 14d888f25f..df58ad3d24 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssectool.c,v 1.48 2009/07/19 04:18:04 each Exp $ */ +/* $Id: dnssectool.c,v 1.49 2009/07/19 23:47:55 tbox Exp $ */ /*! \file */ @@ -265,7 +265,7 @@ cleanup_entropy(isc_entropy_t **ectx) { isc_entropy_detach(ectx); } -static isc_stdtime_t +static isc_stdtime_t time_units(isc_stdtime_t offset, char suffix, const char *str) { switch(suffix) { case 'Y': case 'y': diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c index cf4f6ce81c..cbb27d3119 100644 --- a/bin/tests/system/tkey/keycreate.c +++ b/bin/tests/system/tkey/keycreate.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 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: keycreate.c,v 1.16 2009/07/19 04:18:04 each Exp $ */ +/* $Id: keycreate.c,v 1.17 2009/07/19 23:47:55 tbox Exp $ */ #include @@ -135,7 +135,7 @@ sendquery(isc_task_t *task, isc_event_t *event) { isc_region_t r; isc_result_t result; dns_fixedname_t keyname; - dns_fixedname_t ownername; + dns_fixedname_t ownername; isc_buffer_t namestr, keybuf; unsigned char keydata[9]; dns_message_t *query; diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c index 66ac7dd290..24bb0b3c2c 100644 --- a/bin/tests/system/tkey/keydelete.c +++ b/bin/tests/system/tkey/keydelete.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 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: keydelete.c,v 1.12 2009/07/19 04:18:04 each Exp $ */ +/* $Id: keydelete.c,v 1.13 2009/07/19 23:47:55 tbox Exp $ */ #include diff --git a/bin/tests/system/tkey/ns1/setup.sh b/bin/tests/system/tkey/ns1/setup.sh index 269710a8c2..fef0e71f2b 100644 --- a/bin/tests/system/tkey/ns1/setup.sh +++ b/bin/tests/system/tkey/ns1/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# 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 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.9 2009/07/19 04:18:04 each Exp $ +# $Id: setup.sh,v 1.10 2009/07/19 23:47:55 tbox Exp $ RANDFILE=../random.data diff --git a/bin/tests/system/tkey/tests.sh b/bin/tests/system/tkey/tests.sh index f53b2d2df9..d9dd3ec77d 100644 --- a/bin/tests/system/tkey/tests.sh +++ b/bin/tests/system/tkey/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# 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 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.8 2009/07/19 04:18:04 each Exp $ +# $Id: tests.sh,v 1.9 2009/07/19 23:47:55 tbox Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/lib/dns/db.c b/lib/dns/db.c index ed2a06c14b..f120fcbb19 100644 --- a/lib/dns/db.c +++ b/lib/dns/db.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: db.c,v 1.92 2009/07/19 04:18:05 each Exp $ */ +/* $Id: db.c,v 1.93 2009/07/19 23:47:55 tbox Exp $ */ /*! \file */ @@ -330,7 +330,7 @@ dns_db_load2(dns_db_t *db, const char *filename, dns_masterformat_t format) { isc_result_t dns_db_load3(dns_db_t *db, const char *filename, dns_masterformat_t format, - unsigned int options) { + unsigned int options) { isc_result_t result, eresult; dns_rdatacallbacks_t callbacks; diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c index 84f048534c..ba65203889 100644 --- a/lib/dns/dnssec.c +++ b/lib/dns/dnssec.c @@ -16,7 +16,7 @@ */ /* - * $Id: dnssec.c,v 1.97 2009/07/19 04:50:15 each Exp $ + * $Id: dnssec.c,v 1.98 2009/07/19 23:47:55 tbox Exp $ */ /*! \file */ @@ -1049,7 +1049,7 @@ get_hints(dns_dnsseckey_t *key) { } /* - * Activation date is set (maybe in the future), but + * Activation date is set (maybe in the future), but * publication date isn't. Most likely the user wants to * publish now and activate later. */ @@ -1111,7 +1111,7 @@ dns_dnssec_findmatchingkeys(dns_name_t *origin, const char *directory, isc_dir_init(&dir); RETERR(isc_dir_open(&dir, directory)); - + while (isc_dir_read(&dir) == ISC_R_SUCCESS) { if (dir.entry.name[0] == 'K' && dir.entry.length > len + 1 && diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c index 66915338e9..31b0880673 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c @@ -31,7 +31,7 @@ /* * Principal Author: Brian Wellington - * $Id: dst_api.c,v 1.23 2009/07/19 04:18:05 each Exp $ + * $Id: dst_api.c,v 1.24 2009/07/19 23:47:55 tbox Exp $ */ /*! \file */ @@ -1207,7 +1207,7 @@ write_public_key(const dst_key_t *key, int type, const char *directory) { /* Write key information in comments */ if ((type & DST_TYPE_KEY) == 0) { - fprintf(fp, "; This is a %s%s-signing key, keyid %d, for ", + fprintf(fp, "; This is a %s%s-signing key, keyid %d, for ", (key->key_flags & DNS_KEYFLAG_REVOKE) != 0 ? "revoked " : "", diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c index 6fa3eb9f4d..af66e74670 100644 --- a/lib/dns/dst_parse.c +++ b/lib/dns/dst_parse.c @@ -31,7 +31,7 @@ /*% * Principal Author: Brian Wellington - * $Id: dst_parse.c,v 1.18 2009/07/19 04:18:05 each Exp $ + * $Id: dst_parse.c,v 1.19 2009/07/19 23:47:55 tbox Exp $ */ #include @@ -138,7 +138,7 @@ find_metadata(const char *s) { } return (-1); -} +} static const char * find_tag(const int value) { @@ -419,7 +419,7 @@ dst__privstruct_parse(dst_key_t *key, unsigned int alg, isc_lex_t *lex, tag = find_metadata(DST_AS_STR(token)); if (tag >= 0) { INSIST(tag < METADATA_NTAGS); - + NEXTTOKEN(lex, opt, &token); if (token.type != isc_tokentype_string) { ret = DST_R_INVALIDPRIVATEKEY; diff --git a/lib/dns/dst_parse.h b/lib/dns/dst_parse.h index effc4c6af4..66c4399fa9 100644 --- a/lib/dns/dst_parse.h +++ b/lib/dns/dst_parse.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_parse.h,v 1.12 2009/07/19 04:18:05 each Exp $ */ +/* $Id: dst_parse.h,v 1.13 2009/07/19 23:47:55 tbox Exp $ */ /*! \file */ #ifndef DST_DST_PARSE_H diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h index 5e3c214d1e..e3b0e550c6 100644 --- a/lib/dns/include/dns/db.h +++ b/lib/dns/include/dns/db.h @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: db.h,v 1.99 2009/07/19 04:18:05 each Exp $ */ +/* $Id: db.h,v 1.100 2009/07/19 23:47:55 tbox Exp $ */ #ifndef DNS_DB_H #define DNS_DB_H 1 @@ -496,7 +496,7 @@ dns_db_load2(dns_db_t *db, const char *filename, dns_masterformat_t format); isc_result_t dns_db_load3(dns_db_t *db, const char *filename, dns_masterformat_t format, - unsigned int options); + unsigned int options); /*%< * Load master file 'filename' into 'db'. *