From d7201de09b85929a86b157f4b2d91667c68c6b52 Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Wed, 2 Sep 2009 23:48:03 +0000 Subject: [PATCH] update copyright notice --- bin/check/Makefile.in | 4 +- bin/dig/Makefile.in | 4 +- bin/dnssec/dnssec-keygen.c | 36 ++++++------ bin/dnssec/dnssec-revoke.c | 6 +- bin/dnssec/dnssec-settime.c | 34 +++++------ bin/dnssec/dnssectool.c | 6 +- bin/dnssec/dnssectool.h | 4 +- bin/named/lwdgabn.c | 4 +- bin/named/lwdgrbn.c | 4 +- bin/named/lwresd.c | 4 +- bin/named/tkeyconf.c | 4 +- bin/named/unix/Makefile.in | 4 +- bin/tests/adb_test.c | 4 +- bin/tests/backtrace_test.c | 6 +- bin/tests/byname_test.c | 4 +- bin/tests/db/Makefile.in | 4 +- bin/tests/db_test.c | 4 +- bin/tests/dst/gsstest.c | 28 ++++----- bin/tests/master/Makefile.in | 4 +- bin/tests/master_test.c | 6 +- bin/tests/mem/Makefile.in | 4 +- bin/tests/name_test.c | 4 +- bin/tests/names/Makefile.in | 4 +- bin/tests/net/Makefile.in | 4 +- bin/tests/nsecify.c | 4 +- bin/tests/rbt/Makefile.in | 4 +- bin/tests/rbt_test.c | 4 +- bin/tests/sig0_test.c | 4 +- bin/tests/system/lwresd/Makefile.in | 4 +- bin/tests/system/tkey/Makefile.in | 4 +- bin/tests/zone_test.c | 28 ++++----- contrib/sdb/pgsql/zonetodb.c | 4 +- lib/bind9/Makefile.in | 4 +- lib/dns/byaddr.c | 4 +- lib/dns/client.c | 34 +++++------ lib/dns/dnssec.c | 16 ++--- lib/dns/ecdb.c | 6 +- lib/dns/forward.c | 6 +- lib/dns/gssapictx.c | 4 +- lib/dns/include/dns/client.h | 8 +-- lib/dns/include/dns/ecdb.h | 6 +- lib/dns/include/dns/forward.h | 4 +- lib/dns/include/dns/lib.h | 4 +- lib/dns/include/dns/tsec.h | 8 +-- lib/dns/lib.c | 4 +- lib/dns/peer.c | 4 +- lib/dns/rdata.c | 4 +- lib/dns/tkey.c | 4 +- lib/dns/tsec.c | 8 +-- lib/export/Makefile.in | 6 +- lib/export/dns/Makefile.in | 6 +- lib/export/dns/include/Makefile.in | 6 +- lib/export/dns/include/dns/Makefile.in | 6 +- lib/export/dns/include/dst/Makefile.in | 4 +- lib/export/irs/Makefile.in | 6 +- lib/export/irs/include/irs/Makefile.in | 4 +- lib/export/isc/Makefile.in | 6 +- lib/export/isc/nls/Makefile.in | 6 +- lib/export/isc/nothreads/Makefile.in | 6 +- lib/export/isc/pthreads/Makefile.in | 6 +- lib/export/isc/unix/Makefile.in | 6 +- lib/export/isccfg/Makefile.in | 7 +-- lib/export/isccfg/include/isccfg/Makefile.in | 4 +- lib/export/samples/Makefile-postinstall.in | 6 +- lib/export/samples/Makefile.in | 6 +- lib/export/samples/nsprobe.c | 12 ++-- lib/export/samples/sample-async.c | 6 +- lib/export/samples/sample-gai.c | 6 +- lib/export/samples/sample-request.c | 6 +- lib/export/samples/sample-update.c | 8 +-- lib/export/samples/sample.c | 10 ++-- lib/irs/Makefile.in | 6 +- lib/irs/context.c | 23 ++++---- lib/irs/dnsconf.c | 25 ++++---- lib/irs/gai_strerror.c | 7 +-- lib/irs/getaddrinfo.c | 62 +++++++++----------- lib/irs/getnameinfo.c | 33 +++++------ lib/irs/include/Makefile.in | 6 +- lib/irs/include/irs/Makefile.in | 6 +- lib/irs/include/irs/context.h | 23 ++++---- lib/irs/include/irs/dnsconf.h | 23 ++++---- lib/irs/include/irs/netdb.h.in | 7 +-- lib/irs/include/irs/platform.h.in | 6 +- lib/irs/include/irs/resconf.h | 23 ++++---- lib/irs/include/irs/types.h | 6 +- lib/irs/include/irs/version.h | 6 +- lib/irs/resconf.c | 37 ++++++------ lib/irs/version.c | 6 +- lib/isc/app_api.c | 12 ++-- lib/isc/assertions.c | 4 +- lib/isc/backtrace.c | 4 +- lib/isc/include/isc/app.h | 4 +- lib/isc/include/isc/lib.h | 4 +- lib/isc/include/isc/namespace.h | 6 +- lib/isc/include/isc/result.h | 4 +- lib/isc/include/isc/resultclass.h | 4 +- lib/isc/include/isc/timer.h | 4 +- lib/isc/lib.c | 4 +- lib/isc/mem_api.c | 10 ++-- lib/isc/nls/Makefile.in | 4 +- lib/isc/nothreads/Makefile.in | 4 +- lib/isc/pthreads/Makefile.in | 4 +- lib/isc/socket_api.c | 8 +-- lib/isc/task.c | 8 +-- lib/isc/task_api.c | 6 +- lib/isc/task_p.h | 4 +- lib/isc/timer_api.c | 6 +- lib/isc/timer_p.h | 4 +- lib/isc/unix/Makefile.in | 4 +- lib/isc/unix/app.c | 8 +-- lib/isc/unix/socket_p.h | 4 +- lib/isc/win32/Makefile.in | 4 +- lib/isc/win32/app.c | 6 +- lib/isccc/Makefile.in | 4 +- lib/isccfg/Makefile.in | 4 +- lib/isccfg/dnsconf.c | 7 +-- lib/isccfg/include/isccfg/dnsconf.h | 7 +-- lib/lwres/context.c | 6 +- lib/tests/Makefile.in | 4 +- util/mksymtbl.pl | 18 +++++- 120 files changed, 494 insertions(+), 508 deletions(-) diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in index 39af25cbe8..b586b5badc 100644 --- a/bin/check/Makefile.in +++ b/bin/check/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.34 2009/09/01 18:40:25 jinmei Exp $ +# $Id: Makefile.in,v 1.35 2009/09/02 23:48:01 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in index ee57ce2dcb..3cb1bd1fb4 100644 --- a/bin/dig/Makefile.in +++ b/bin/dig/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.43 2009/09/01 18:40:25 jinmei Exp $ +# $Id: Makefile.in,v 1.44 2009/09/02 23:48:01 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index cb1b5cd08c..d71226720e 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.91 2009/09/02 06:29:00 each Exp $ */ +/* $Id: dnssec-keygen.c,v 1.92 2009/09/02 23:48:01 tbox Exp $ */ /*! \file */ @@ -311,63 +311,63 @@ main(int argc, char **argv) { /* already the default */ break; case 'P': - if (setpub || unsetpub) - fatal("-P specified more than once"); + if (setpub || unsetpub) + fatal("-P specified more than once"); if (strcasecmp(isc_commandline_argument, "none")) { setpub = ISC_TRUE; publish = strtotime(isc_commandline_argument, now, now); } else { - unsetpub = ISC_TRUE; - } + unsetpub = ISC_TRUE; + } break; case 'A': - if (setact || unsetact) - fatal("-A specified more than once"); + if (setact || unsetact) + fatal("-A specified more than once"); if (strcasecmp(isc_commandline_argument, "none")) { setact = ISC_TRUE; activate = strtotime(isc_commandline_argument, now, now); } else { - unsetact = ISC_TRUE; + unsetact = ISC_TRUE; } break; case 'R': - if (setrev || unsetrev) - fatal("-R specified more than once"); + if (setrev || unsetrev) + fatal("-R specified more than once"); if (strcasecmp(isc_commandline_argument, "none")) { setrev = ISC_TRUE; revoke = strtotime(isc_commandline_argument, now, now); } else { - unsetrev = ISC_TRUE; + unsetrev = ISC_TRUE; } break; case 'U': - if (setunpub || unsetunpub) - fatal("-U specified more than once"); + if (setunpub || unsetunpub) + fatal("-U specified more than once"); if (strcasecmp(isc_commandline_argument, "none")) { setunpub = ISC_TRUE; unpublish = strtotime(isc_commandline_argument, now, now); } else { - unsetunpub = ISC_TRUE; + unsetunpub = ISC_TRUE; } break; case 'D': - if (setdel || unsetdel) - fatal("-D specified more than once"); + if (setdel || unsetdel) + fatal("-D specified more than once"); if (strcasecmp(isc_commandline_argument, "none")) { setdel = ISC_TRUE; delete = strtotime(isc_commandline_argument, now, now); } else { - unsetdel = ISC_TRUE; + unsetdel = ISC_TRUE; } break; case 'F': @@ -691,7 +691,7 @@ main(int argc, char **argv) { fatal("cannot use -C together with " "-P, -A, -R, -U, or -D options"); /* - * Compatibility mode: Private-key-format + * Compatibility mode: Private-key-format * should be set to 1.2. */ dst_key_setprivateformat(key, 1, 2); diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c index d58db629ca..634fc71128 100644 --- a/bin/dnssec/dnssec-revoke.c +++ b/bin/dnssec/dnssec-revoke.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-revoke.c,v 1.9 2009/09/02 06:29:00 each Exp $ */ +/* $Id: dnssec-revoke.c,v 1.10 2009/09/02 23:48:01 tbox Exp $ */ /*! \file */ @@ -161,9 +161,9 @@ main(int argc, char **argv) { flags = dst_key_flags(key); if ((flags & DNS_KEYFLAG_REVOKE) == 0) { - isc_stdtime_t now; + isc_stdtime_t now; - isc_stdtime_get(&now); + isc_stdtime_get(&now); dst_key_settime(key, DST_TIME_REVOKE, now); dst_key_setflags(key, flags | DNS_KEYFLAG_REVOKE); diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c index 77fa98242d..90e374769a 100644 --- a/bin/dnssec/dnssec-settime.c +++ b/bin/dnssec/dnssec-settime.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-settime.c,v 1.9 2009/09/02 06:29:00 each Exp $ */ +/* $Id: dnssec-settime.c,v 1.10 2009/09/02 23:48:01 tbox Exp $ */ /*! \file */ @@ -72,7 +72,7 @@ usage(void) { "deletion date\n"); fprintf(stderr, "Printing options:\n"); fprintf(stderr, " -p C/P/A/R/U/D/all: print a particular time " - "value or values " + "value or values " "[default: all]\n"); fprintf(stderr, " -u: print times in unix epoch " "format\n"); @@ -213,8 +213,8 @@ main(int argc, char **argv) { fatal("-v must be followed by a number"); break; case 'P': - if (setpub || unsetpub) - fatal("-P specified more than once"); + if (setpub || unsetpub) + fatal("-P specified more than once"); changed = ISC_TRUE; if (!strcasecmp(isc_commandline_argument, "none")) { @@ -226,8 +226,8 @@ main(int argc, char **argv) { } break; case 'A': - if (setact || unsetact) - fatal("-A specified more than once"); + if (setact || unsetact) + fatal("-A specified more than once"); changed = ISC_TRUE; if (!strcasecmp(isc_commandline_argument, "none")) { @@ -239,8 +239,8 @@ main(int argc, char **argv) { } break; case 'R': - if (setrev || unsetrev) - fatal("-R specified more than once"); + if (setrev || unsetrev) + fatal("-R specified more than once"); changed = ISC_TRUE; if (!strcasecmp(isc_commandline_argument, "none")) { @@ -252,8 +252,8 @@ main(int argc, char **argv) { } break; case 'U': - if (setunpub || unsetunpub) - fatal("-U specified more than once"); + if (setunpub || unsetunpub) + fatal("-U specified more than once"); changed = ISC_TRUE; if (!strcasecmp(isc_commandline_argument, "none")) { @@ -265,8 +265,8 @@ main(int argc, char **argv) { } break; case 'D': - if (setdel || unsetdel) - fatal("-D specified more than once"); + if (setdel || unsetdel) + fatal("-D specified more than once"); changed = ISC_TRUE; if (!strcasecmp(isc_commandline_argument, "none")) { @@ -360,20 +360,20 @@ main(int argc, char **argv) { dst_key_unsettime(key, DST_TIME_ACTIVATE); if (setrev) { - if ((dst_key_flags(key) & DNS_KEYFLAG_REVOKE) != 0 && rev > now) - fprintf(stderr, "%s: warning: Key %s is already " + if ((dst_key_flags(key) & DNS_KEYFLAG_REVOKE) != 0 && rev > now) + fprintf(stderr, "%s: warning: Key %s is already " "revoked; changing the revocation date " "will not affect this.\n", program, keystr); dst_key_settime(key, DST_TIME_REVOKE, rev); } else if (unsetrev) { - if ((dst_key_flags(key) & DNS_KEYFLAG_REVOKE) != 0) - fprintf(stderr, "%s: warning: Key %s is already " + if ((dst_key_flags(key) & DNS_KEYFLAG_REVOKE) != 0) + fprintf(stderr, "%s: warning: Key %s is already " "revoked; removing the revocation date " "will not affect this.\n", program, keystr); dst_key_unsettime(key, DST_TIME_REVOKE); - } + } if (setunpub) dst_key_settime(key, DST_TIME_UNPUBLISH, unpub); diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c index 225e48ca90..5e62640090 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssectool.c,v 1.51 2009/09/02 06:29:01 each Exp $ */ +/* $Id: dnssectool.c,v 1.52 2009/09/02 23:48:01 tbox Exp $ */ /*! \file */ @@ -304,8 +304,8 @@ strtottl(const char *str) { char *endp; ttl = strtol(str, &endp, 0); - if (ttl == 0 && endp == str) - fatal("TTL must be numeric"); + if (ttl == 0 && endp == str) + fatal("TTL must be numeric"); ttl = time_units(ttl, endp, orig); return (ttl); } diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h index 3506184d98..a77a5b4bd1 100644 --- a/bin/dnssec/dnssectool.h +++ b/bin/dnssec/dnssectool.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007-2009 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: dnssectool.h,v 1.23 2009/09/02 06:29:01 each Exp $ */ +/* $Id: dnssectool.h,v 1.24 2009/09/02 23:48:01 tbox Exp $ */ #ifndef DNSSECTOOL_H #define DNSSECTOOL_H 1 diff --git a/bin/named/lwdgabn.c b/bin/named/lwdgabn.c index 761b741500..c4b598beb1 100644 --- a/bin/named/lwdgabn.c +++ b/bin/named/lwdgabn.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 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: lwdgabn.c,v 1.23 2009/09/01 00:22:25 jinmei Exp $ */ +/* $Id: lwdgabn.c,v 1.24 2009/09/02 23:48:01 tbox Exp $ */ /*! \file */ diff --git a/bin/named/lwdgrbn.c b/bin/named/lwdgrbn.c index c3bbe58b5d..5c858cbeda 100644 --- a/bin/named/lwdgrbn.c +++ b/bin/named/lwdgrbn.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009 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: lwdgrbn.c,v 1.21 2009/09/01 00:22:25 jinmei Exp $ */ +/* $Id: lwdgrbn.c,v 1.22 2009/09/02 23:48:01 tbox Exp $ */ /*! \file */ diff --git a/bin/named/lwresd.c b/bin/named/lwresd.c index f32c8cb37e..11198a4324 100644 --- a/bin/named/lwresd.c +++ b/bin/named/lwresd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 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: lwresd.c,v 1.59 2009/09/01 00:22:25 jinmei Exp $ */ +/* $Id: lwresd.c,v 1.60 2009/09/02 23:48:01 tbox Exp $ */ /*! \file * \brief diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c index 52f5f105c1..e11aaa22d3 100644 --- a/bin/named/tkeyconf.c +++ b/bin/named/tkeyconf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-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: tkeyconf.c,v 1.30 2009/09/01 00:22:25 jinmei Exp $ */ +/* $Id: tkeyconf.c,v 1.31 2009/09/02 23:48:01 tbox Exp $ */ /*! \file */ diff --git a/bin/named/unix/Makefile.in b/bin/named/unix/Makefile.in index 00bf2e0696..dc1bf2b9c1 100644 --- a/bin/named/unix/Makefile.in +++ b/bin/named/unix/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1999-2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.11 2009/09/01 00:22:25 jinmei Exp $ +# $Id: Makefile.in,v 1.12 2009/09/02 23:48:01 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/adb_test.c b/bin/tests/adb_test.c index a63a2537e2..bf44b45d3f 100644 --- a/bin/tests/adb_test.c +++ b/bin/tests/adb_test.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) 1999-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: adb_test.c,v 1.69 2009/09/01 00:22:25 jinmei Exp $ */ +/* $Id: adb_test.c,v 1.70 2009/09/02 23:48:01 tbox Exp $ */ /*! \file */ diff --git a/bin/tests/backtrace_test.c b/bin/tests/backtrace_test.c index 3af46239e9..9253ca7714 100644 --- a/bin/tests/backtrace_test.c +++ b/bin/tests/backtrace_test.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: backtrace_test.c,v 1.3 2009/09/01 20:13:43 each Exp $ */ +/* $Id: backtrace_test.c,v 1.4 2009/09/02 23:48:01 tbox Exp $ */ #include @@ -46,10 +46,10 @@ func3() { isc_result_totext(result)); return (1); } - + if (nframes < 4) error++; - + for (i = 0; i < 4 && i < nframes; i++) { fname = NULL; result = isc_backtrace_getsymbol(tracebuf[i], &fname, &offset); diff --git a/bin/tests/byname_test.c b/bin/tests/byname_test.c index 1c3ea711a3..ae372e8571 100644 --- a/bin/tests/byname_test.c +++ b/bin/tests/byname_test.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) 2000, 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: byname_test.c,v 1.32 2009/09/01 00:22:25 jinmei Exp $ */ +/* $Id: byname_test.c,v 1.33 2009/09/02 23:48:01 tbox Exp $ */ /*! \file * \author diff --git a/bin/tests/db/Makefile.in b/bin/tests/db/Makefile.in index fe9e28398e..9120510edd 100644 --- a/bin/tests/db/Makefile.in +++ b/bin/tests/db/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1999-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.30 2009/09/01 00:22:25 jinmei Exp $ +# $Id: Makefile.in,v 1.31 2009/09/02 23:48:01 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/db_test.c b/bin/tests/db_test.c index 1cd8f0dfc7..e800531f22 100644 --- a/bin/tests/db_test.c +++ b/bin/tests/db_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-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: db_test.c,v 1.67 2009/09/01 00:22:25 jinmei Exp $ */ +/* $Id: db_test.c,v 1.68 2009/09/02 23:48:01 tbox Exp $ */ /*! \file * \author diff --git a/bin/tests/dst/gsstest.c b/bin/tests/dst/gsstest.c index 355fde3a9e..6c314d227c 100755 --- a/bin/tests/dst/gsstest.c +++ b/bin/tests/dst/gsstest.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2006, 2007, 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 @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: gsstest.c,v 1.7 2009/09/01 00:22:25 jinmei Exp $ */ +/* $Id: gsstest.c,v 1.8 2009/09/02 23:48:01 tbox Exp $ */ #include @@ -175,7 +175,7 @@ recvresponse(isc_task_t *task, isc_event_t *event) { end: if (query) dns_message_destroy(&query); - + if (reqev->request) dns_request_destroy(&reqev->request); @@ -184,7 +184,7 @@ end: event = isc_event_allocate(mctx, (void *)1, 1, console, NULL, sizeof(*event)); isc_task_send(task, &event); - return; + return; } @@ -202,7 +202,7 @@ sendquery(isc_task_t *task, isc_event_t *event) char output[10 * 1024]; static char host[256]; - + isc_event_free(&event); printf("Query => "); @@ -335,7 +335,7 @@ end: dns_request_destroy(&reqev->request); isc_event_free(&event); - + event = isc_event_allocate(mctx, (void *)1, 1, console, NULL, sizeof(*event)); isc_task_send(task, &event); @@ -357,14 +357,14 @@ initctx1(isc_task_t *task, isc_event_t *event) { sprintf(contextname, "gsstest.context.%d.", (int)time(NULL)); printf("Initctx - context name we're using: %s\n", contextname); - + printf("Negotiating GSSAPI context: "); printf(gssid); printf("\n"); /* * Setup a GSSAPI context with the server - */ + */ dns_fixedname_init(&servername); isc_buffer_init(&buf, contextname, strlen(contextname)); isc_buffer_add(&buf, strlen(contextname)); @@ -372,7 +372,7 @@ initctx1(isc_task_t *task, isc_event_t *event) { dns_rootname, 0, NULL); CHECK("dns_name_fromtext", result); - /* Make name happen */ + /* Make name happen */ dns_fixedname_init(&gssname); isc_buffer_init(&buf, gssid, strlen(gssid)); isc_buffer_add(&buf, strlen(gssid)); @@ -423,7 +423,7 @@ setup(void) isc_sockaddr_fromin(&address, &inaddr, PORT); return; } - + }; } @@ -446,7 +446,7 @@ main(int argc, char *argv[]) { UNUSED(argv); UNUSED(argc); - + RUNCHECK(isc_app_start()); dns_result_register(); @@ -519,7 +519,7 @@ main(int argc, char *argv[]) { &sock)); setup(); - + RUNCHECK(isc_app_onrun(mctx, task, console, NULL)); (void)isc_app_run(); @@ -529,10 +529,10 @@ main(int argc, char *argv[]) { dns_requestmgr_shutdown(requestmgr); dns_requestmgr_detach(&requestmgr); - + dns_dispatch_detach(&dispatchv4); dns_dispatchmgr_destroy(&dispatchmgr); - + isc_timermgr_destroy(&timermgr); isc_task_detach(&task); diff --git a/bin/tests/master/Makefile.in b/bin/tests/master/Makefile.in index 61b6761db5..8fbe3aa0b2 100644 --- a/bin/tests/master/Makefile.in +++ b/bin/tests/master/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1999-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.29 2009/09/01 00:22:25 jinmei Exp $ +# $Id: Makefile.in,v 1.30 2009/09/02 23:48:01 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/master_test.c b/bin/tests/master_test.c index f0160f436c..afc6c8c10d 100644 --- a/bin/tests/master_test.c +++ b/bin/tests/master_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-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: master_test.c,v 1.31 2009/09/01 00:22:25 jinmei Exp $ */ +/* $Id: master_test.c,v 1.32 2009/09/02 23:48:01 tbox Exp $ */ #include @@ -85,7 +85,7 @@ main(int argc, char *argv[]) { dns_rdatacallbacks_init_stdio(&callbacks); callbacks.add = print_dataset; - result = dns_master_loadfile(argv[1], &origin, &origin, + result = dns_master_loadfile(argv[1], &origin, &origin, dns_rdataclass_in, 0, &callbacks, mctx); fprintf(stdout, "dns_master_loadfile: %s\n", diff --git a/bin/tests/mem/Makefile.in b/bin/tests/mem/Makefile.in index 550ebe5611..71b9f9b0ec 100644 --- a/bin/tests/mem/Makefile.in +++ b/bin/tests/mem/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.35 2009/09/01 00:22:25 jinmei Exp $ +# $Id: Makefile.in,v 1.36 2009/09/02 23:48:01 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/name_test.c b/bin/tests/name_test.c index c54260fa8f..9c98685a5d 100644 --- a/bin/tests/name_test.c +++ b/bin/tests/name_test.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) 1998-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: name_test.c,v 1.42 2009/09/01 00:22:25 jinmei Exp $ */ +/* $Id: name_test.c,v 1.43 2009/09/02 23:48:01 tbox Exp $ */ #include diff --git a/bin/tests/names/Makefile.in b/bin/tests/names/Makefile.in index 17711f1ae0..c901d8d93b 100644 --- a/bin/tests/names/Makefile.in +++ b/bin/tests/names/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1999-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.29 2009/09/01 00:22:25 jinmei Exp $ +# $Id: Makefile.in,v 1.30 2009/09/02 23:48:01 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/net/Makefile.in b/bin/tests/net/Makefile.in index 1c223bf03b..59660f05a7 100644 --- a/bin/tests/net/Makefile.in +++ b/bin/tests/net/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.17 2009/09/01 00:22:25 jinmei Exp $ +# $Id: Makefile.in,v 1.18 2009/09/02 23:48:01 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/nsecify.c b/bin/tests/nsecify.c index d7f841c299..d21b9fdd98 100644 --- a/bin/tests/nsecify.c +++ b/bin/tests/nsecify.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007-2009 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: nsecify.c,v 1.9 2009/09/01 00:22:25 jinmei Exp $ */ +/* $Id: nsecify.c,v 1.10 2009/09/02 23:48:01 tbox Exp $ */ #include diff --git a/bin/tests/rbt/Makefile.in b/bin/tests/rbt/Makefile.in index be3cd5a50d..fbf3c1d6a5 100644 --- a/bin/tests/rbt/Makefile.in +++ b/bin/tests/rbt/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1999-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.29 2009/09/01 00:22:25 jinmei Exp $ +# $Id: Makefile.in,v 1.30 2009/09/02 23:48:01 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/rbt_test.c b/bin/tests/rbt_test.c index 93e4705447..39039b3b73 100644 --- a/bin/tests/rbt_test.c +++ b/bin/tests/rbt_test.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) 1999-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: rbt_test.c,v 1.49 2009/09/01 00:22:25 jinmei Exp $ */ +/* $Id: rbt_test.c,v 1.50 2009/09/02 23:48:01 tbox Exp $ */ #include diff --git a/bin/tests/sig0_test.c b/bin/tests/sig0_test.c index 07654ed9cc..296356af76 100644 --- a/bin/tests/sig0_test.c +++ b/bin/tests/sig0_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 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: sig0_test.c,v 1.18 2009/09/01 00:22:25 jinmei Exp $ */ +/* $Id: sig0_test.c,v 1.19 2009/09/02 23:48:01 tbox Exp $ */ #include diff --git a/bin/tests/system/lwresd/Makefile.in b/bin/tests/system/lwresd/Makefile.in index 85ec286574..d81598c8e5 100644 --- a/bin/tests/system/lwresd/Makefile.in +++ b/bin/tests/system/lwresd/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.20 2009/09/01 00:22:25 jinmei Exp $ +# $Id: Makefile.in,v 1.21 2009/09/02 23:48:01 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in index 1157c8d464..84996c0a28 100644 --- a/bin/tests/system/tkey/Makefile.in +++ b/bin/tests/system/tkey/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001, 2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.12 2009/09/01 00:22:25 jinmei Exp $ +# $Id: Makefile.in,v 1.13 2009/09/02 23:48:01 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/zone_test.c b/bin/tests/zone_test.c index 9274e41dc2..8ce005d042 100644 --- a/bin/tests/zone_test.c +++ b/bin/tests/zone_test.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) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone_test.c,v 1.34 2009/09/01 00:22:25 jinmei Exp $ */ +/* $Id: zone_test.c,v 1.35 2009/09/02 23:48:01 tbox Exp $ */ #include @@ -104,7 +104,7 @@ setup(const char *zonename, const char *filename, const char *classname) { isc_buffer_add(&buffer, strlen(zonename)); dns_fixedname_init(&fixorigin); result = dns_name_fromtext(dns_fixedname_name(&fixorigin), - &buffer, dns_rootname, 0, NULL); + &buffer, dns_rootname, 0, NULL); ERRRET(result, "dns_name_fromtext"); origin = dns_fixedname_name(&fixorigin); @@ -137,19 +137,19 @@ setup(const char *zonename, const char *filename, const char *classname) { static void print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset) { - isc_buffer_t text; - char t[1000]; - isc_result_t result; - isc_region_t r; + isc_buffer_t text; + char t[1000]; + isc_result_t result; + isc_region_t r; - isc_buffer_init(&text, t, sizeof(t)); - result = dns_rdataset_totext(rdataset, name, ISC_FALSE, ISC_FALSE, + isc_buffer_init(&text, t, sizeof(t)); + result = dns_rdataset_totext(rdataset, name, ISC_FALSE, ISC_FALSE, &text); - isc_buffer_usedregion(&text, &r); - if (result == ISC_R_SUCCESS) - printf("%.*s", (int)r.length, (char *)r.base); - else - printf("%s\n", dns_result_totext(result)); + isc_buffer_usedregion(&text, &r); + if (result == ISC_R_SUCCESS) + printf("%.*s", (int)r.length, (char *)r.base); + else + printf("%s\n", dns_result_totext(result)); } static void diff --git a/contrib/sdb/pgsql/zonetodb.c b/contrib/sdb/pgsql/zonetodb.c index f141aaee65..a26d72d4b3 100644 --- a/contrib/sdb/pgsql/zonetodb.c +++ b/contrib/sdb/pgsql/zonetodb.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zonetodb.c,v 1.22 2009/09/01 00:22:26 jinmei Exp $ */ +/* $Id: zonetodb.c,v 1.23 2009/09/02 23:48:01 tbox Exp $ */ #include #include diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in index f03a8652e7..91e2083632 100644 --- a/lib/bind9/Makefile.in +++ b/lib/bind9/Makefile.in @@ -1,4 +1,4 @@ -# 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 @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.12 2009/09/01 00:22:26 jinmei Exp $ +# $Id: Makefile.in,v 1.13 2009/09/02 23:48:01 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c index 068c9985ea..6a3a603618 100644 --- a/lib/dns/byaddr.c +++ b/lib/dns/byaddr.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) 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: byaddr.c,v 1.40 2009/09/01 00:22:26 jinmei Exp $ */ +/* $Id: byaddr.c,v 1.41 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ diff --git a/lib/dns/client.c b/lib/dns/client.c index f094188c83..0990e219ba 100644 --- a/lib/dns/client.c +++ b/lib/dns/client.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */ +/* $Id: client.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */ #include @@ -526,7 +526,7 @@ destroyclient(dns_client_t **clientp) { DESTROYLOCK(&client->lock); client->magic = 0; - + isc_mem_putanddetach(&client->mctx, client, sizeof(*client)); *clientp = NULL; @@ -558,7 +558,7 @@ dns_client_destroy(dns_client_t **clientp) { isc_result_t dns_client_setservers(dns_client_t *client, dns_rdataclass_t rdclass, - dns_name_t *namespace, isc_sockaddrlist_t *addrs) + dns_name_t *namespace, isc_sockaddrlist_t *addrs) { isc_result_t result; dns_view_t *view = NULL; @@ -1112,7 +1112,7 @@ dns_client_resolve(dns_client_t *client, dns_name_t *name, /* * If the client is run under application's control, we need * to create a new running (sub)environment for this - * particular resolution. + * particular resolution. */ return (ISC_R_NOTIMPLEMENTED); /* XXXTBD */ } else @@ -1156,7 +1156,7 @@ dns_client_resolve(dns_client_t *client, dns_name_t *name, /* * If this lookup failed due to some error in DNSSEC * validation, return the validation error code. - * XXX: or should we pass the validation result separately? + * XXX: or should we pass the validation result separately? */ result = resarg->vresult; } @@ -1210,7 +1210,7 @@ dns_client_startresolve(dns_client_t *client, dns_name_t *name, mctx = client->mctx; rdataset = NULL; sigrdataset = NULL; - want_dnssec = ISC_TF((options & DNS_CLIENTRESOPT_NODNSSEC) == 0); + want_dnssec = ISC_TF((options & DNS_CLIENTRESOPT_NODNSSEC) == 0); /* * Prepare some intermediate resources @@ -1276,7 +1276,7 @@ dns_client_startresolve(dns_client_t *client, dns_name_t *name, UNLOCK(&client->lock); client_resfind(rctx, NULL); - + *transp = (dns_clientrestrans_t *)rctx; return (ISC_R_SUCCESS); @@ -1318,7 +1318,7 @@ dns_client_cancelresolve(dns_clientrestrans_t *trans) { } void -dns_client_freeresanswer(dns_client_t *client, dns_namelist_t *namelist) { +dns_client_freeresanswer(dns_client_t *client, dns_namelist_t *namelist) { dns_name_t *name; dns_rdataset_t *rdataset; @@ -1453,7 +1453,7 @@ request_done(isc_task_t *task, isc_event_t *event) { static void localrequest_done(isc_task_t *task, isc_event_t *event) { reqarg_t *reqarg = event->ev_arg; - dns_clientreqevent_t *rev =(dns_clientreqevent_t *)event; + dns_clientreqevent_t *rev =(dns_clientreqevent_t *)event; UNUSED(task); @@ -1501,7 +1501,7 @@ dns_client_request(dns_client_t *client, dns_message_t *qmessage, /* * If the client is run under application's control, we need * to create a new running (sub)environment for this - * particular resolution. + * particular resolution. */ return (ISC_R_NOTIMPLEMENTED); /* XXXTBD */ } else @@ -2503,13 +2503,13 @@ dns_client_update(dns_client_t *client, dns_rdataclass_t rdclass, updatearg_t *uarg; REQUIRE(DNS_CLIENT_VALID(client)); - + if ((client->attributes & DNS_CLIENTATTR_OWNCTX) == 0 && (options & DNS_CLIENTRESOPT_ALLOWRUN) == 0) { /* * If the client is run under application's control, we need * to create a new running (sub)environment for this - * particular resolution. + * particular resolution. */ return (ISC_R_NOTIMPLEMENTED); /* XXXTBD */ } else @@ -2875,7 +2875,7 @@ dns_client_updaterec(dns_client_updateop_t op, dns_name_t *owner, REQUIRE(owner != NULL); REQUIRE((rdataset != NULL && rdatalist != NULL && rdata != NULL) || (rdataset == NULL && rdatalist == NULL && rdata == NULL && - mctx != NULL)); + mctx != NULL)); if (op == updateop_add) REQUIRE(source != NULL); if (source != NULL) { @@ -2899,7 +2899,7 @@ dns_client_updaterec(dns_client_updateop_t op, dns_name_t *owner, dns_rdatalist_init(&updaterec->rdatalist); dns_rdata_init(&updaterec->rdata); isc_buffer_init(b, b + 1, - size - sizeof(dns_client_updaterec_t)); + size - sizeof(dns_client_updaterec_t)); dns_name_copy(owner, target, b); if (source != NULL) { isc_region_t r; @@ -2907,7 +2907,7 @@ dns_client_updaterec(dns_client_updateop_t op, dns_name_t *owner, dns_rdata_toregion(rdata, &r); rdata->data = isc_buffer_used(b); isc_buffer_copyregion(b, &r); - + } updaterec->mctx = NULL; isc_mem_attach(mctx, &updaterec->mctx); diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c index 906af63866..664e4989ee 100644 --- a/lib/dns/dnssec.c +++ b/lib/dns/dnssec.c @@ -16,7 +16,7 @@ */ /* - * $Id: dnssec.c,v 1.99 2009/09/02 06:29:01 each Exp $ + * $Id: dnssec.c,v 1.100 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ @@ -973,7 +973,7 @@ dns_dnsseckey_create(isc_mem_t *mctx, dst_key_t **dstkey, dk->hint_publish = ISC_FALSE; dk->hint_sign = ISC_FALSE; dk->hint_remove = ISC_FALSE; - dk->prepublish = 0; + dk->prepublish = 0; dk->source = dns_keysource_unknown; dk->index = 0; @@ -1057,12 +1057,12 @@ get_hints(dns_dnsseckey_t *key) { if (actset && !pubset) key->hint_publish = ISC_TRUE; - /* - * If activation date is in the future, make note of how far off - */ - if (key->hint_publish && actset && active > now) { - key->prepublish = active - now; - } + /* + * If activation date is in the future, make note of how far off + */ + if (key->hint_publish && actset && active > now) { + key->prepublish = active - now; + } /* * Metadata says revoke. If the key is published, diff --git a/lib/dns/ecdb.c b/lib/dns/ecdb.c index c8cee3af6d..cb36edb7c3 100644 --- a/lib/dns/ecdb.c +++ b/lib/dns/ecdb.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ecdb.c,v 1.2 2009/09/01 00:22:26 jinmei Exp $ */ +/* $Id: ecdb.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ #include "config.h" diff --git a/lib/dns/forward.c b/lib/dns/forward.c index bc1a94bd33..7ec4e5c9de 100644 --- a/lib/dns/forward.c +++ b/lib/dns/forward.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) 2000, 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: forward.c,v 1.13 2009/09/01 00:22:26 jinmei Exp $ */ +/* $Id: forward.c,v 1.14 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ @@ -153,7 +153,7 @@ dns_fwdtable_find(dns_fwdtable_t *fwdtable, dns_name_t *name, dns_forwarders_t **forwardersp) { return (dns_fwdtable_find2(fwdtable, name, NULL, forwardersp)); -} +} isc_result_t dns_fwdtable_find2(dns_fwdtable_t *fwdtable, dns_name_t *name, diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c index 6f2e3b0783..6724590b4f 100644 --- a/lib/dns/gssapictx.c +++ b/lib/dns/gssapictx.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 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: gssapictx.c,v 1.13 2009/09/01 00:22:26 jinmei Exp $ */ +/* $Id: gssapictx.c,v 1.14 2009/09/02 23:48:02 tbox Exp $ */ #include diff --git a/lib/dns/include/dns/client.h b/lib/dns/include/dns/client.h index 4017528dc1..d21dff788d 100644 --- a/lib/dns/include/dns/client.h +++ b/lib/dns/include/dns/client.h @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.h,v 1.2 2009/09/01 00:22:26 jinmei Exp $ */ +/* $Id: client.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ #ifndef DNS_CLIENT_H #define DNS_CLIENT_H 1 @@ -346,7 +346,7 @@ dns_client_destroyrestrans(dns_clientrestrans_t **transp); */ void -dns_client_freeresanswer(dns_client_t *client, dns_namelist_t *namelist); +dns_client_freeresanswer(dns_client_t *client, dns_namelist_t *namelist); /*%< * Free resources allocated for the content of 'namelist'. * diff --git a/lib/dns/include/dns/ecdb.h b/lib/dns/include/dns/ecdb.h index 8d638d6f63..5c735b53cc 100644 --- a/lib/dns/include/dns/ecdb.h +++ b/lib/dns/include/dns/ecdb.h @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ecdb.h,v 1.2 2009/09/01 00:22:26 jinmei Exp $ */ +/* $Id: ecdb.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ #ifndef DNS_ECDB_H #define DNS_ECDB_H 1 diff --git a/lib/dns/include/dns/forward.h b/lib/dns/include/dns/forward.h index fa5a10c31d..23e94be789 100644 --- a/lib/dns/include/dns/forward.h +++ b/lib/dns/include/dns/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 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: forward.h,v 1.12 2009/09/01 00:22:26 jinmei Exp $ */ +/* $Id: forward.h,v 1.13 2009/09/02 23:48:02 tbox Exp $ */ #ifndef DNS_FORWARD_H #define DNS_FORWARD_H 1 diff --git a/lib/dns/include/dns/lib.h b/lib/dns/include/dns/lib.h index 49c12c7c78..a78562f910 100644 --- a/lib/dns/include/dns/lib.h +++ b/lib/dns/include/dns/lib.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-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: lib.h,v 1.17 2009/09/01 00:22:26 jinmei Exp $ */ +/* $Id: lib.h,v 1.18 2009/09/02 23:48:02 tbox Exp $ */ #ifndef DNS_LIB_H #define DNS_LIB_H 1 diff --git a/lib/dns/include/dns/tsec.h b/lib/dns/include/dns/tsec.h index 2d85e4b0a0..c6b376a19d 100644 --- a/lib/dns/include/dns/tsec.h +++ b/lib/dns/include/dns/tsec.h @@ -1,7 +1,7 @@ /* - * Copyright (C) 2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tsec.h,v 1.2 2009/09/01 00:22:27 jinmei Exp $ */ +/* $Id: tsec.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ #ifndef DNS_TSEC_H #define DNS_TSEC_H 1 @@ -68,7 +68,7 @@ isc_result_t dns_tsec_create(isc_mem_t *mctx, dns_tsectype_t type, dst_key_t *key, dns_tsec_t **tsecp); /*%< - * Create a TSEC structure and stores a type-dependent key structure in it. + * Create a TSEC structure and stores a type-dependent key structure in it. * For a TSIG key (type is dns_tsectype_tsig), dns_tsec_create() creates a * TSIG key structure from '*key' and keeps it in the structure. For other * types, this function simply retains '*key' in the structure. In either diff --git a/lib/dns/lib.c b/lib/dns/lib.c index becc19d1b5..eb69e992d2 100644 --- a/lib/dns/lib.c +++ b/lib/dns/lib.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) 1999-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: lib.c,v 1.17 2009/09/01 00:22:26 jinmei Exp $ */ +/* $Id: lib.c,v 1.18 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ diff --git a/lib/dns/peer.c b/lib/dns/peer.c index d83b253c6f..c55d73dddf 100644 --- a/lib/dns/peer.c +++ b/lib/dns/peer.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 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: peer.c,v 1.32 2009/09/01 00:22:26 jinmei Exp $ */ +/* $Id: peer.c,v 1.33 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index 5f8f0d6198..5e4e471a39 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 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: rdata.c,v 1.201 2009/09/01 00:22:26 jinmei Exp $ */ +/* $Id: rdata.c,v 1.202 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c index 5d6d5484cf..02f93debd6 100644 --- a/lib/dns/tkey.c +++ b/lib/dns/tkey.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 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 @@ -16,7 +16,7 @@ */ /* - * $Id: tkey.c,v 1.91 2009/09/01 00:22:26 jinmei Exp $ + * $Id: tkey.c,v 1.92 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ #include diff --git a/lib/dns/tsec.c b/lib/dns/tsec.c index 44bde128db..c90d4ee256 100644 --- a/lib/dns/tsec.c +++ b/lib/dns/tsec.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tsec.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */ +/* $Id: tsec.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */ #include @@ -82,7 +82,7 @@ dns_tsec_create(isc_mem_t *mctx, dns_tsectype_t type, dst_key_t *key, break; case DST_ALG_HMACSHA512: algname = dns_tsig_hmacsha512_name; - break; + break; default: isc_mem_put(mctx, tsec, sizeof(*tsec)); return (DNS_R_BADALG); diff --git a/lib/export/Makefile.in b/lib/export/Makefile.in index 5bbc93f400..fc9d4ad4c6 100644 --- a/lib/export/Makefile.in +++ b/lib/export/Makefile.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ srcdir = @srcdir@ top_srcdir = @top_srcdir@ diff --git a/lib/export/dns/Makefile.in b/lib/export/dns/Makefile.in index 3942ef156d..9d0cce2ec4 100644 --- a/lib/export/dns/Makefile.in +++ b/lib/export/dns/Makefile.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ top_srcdir = @top_srcdir@ srcdir = @top_srcdir@/lib/dns diff --git a/lib/export/dns/include/Makefile.in b/lib/export/dns/include/Makefile.in index d28e14a1cc..9fc0b66b8f 100644 --- a/lib/export/dns/include/Makefile.in +++ b/lib/export/dns/include/Makefile.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ srcdir = @srcdir@ top_srcdir = @top_srcdir@ diff --git a/lib/export/dns/include/dns/Makefile.in b/lib/export/dns/include/dns/Makefile.in index 13486159a1..5e04d88538 100644 --- a/lib/export/dns/include/dns/Makefile.in +++ b/lib/export/dns/include/dns/Makefile.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ srcdir = @srcdir@ top_srcdir = @top_srcdir@ diff --git a/lib/export/dns/include/dst/Makefile.in b/lib/export/dns/include/dst/Makefile.in index c1d1340c6c..259e62eda2 100644 --- a/lib/export/dns/include/dst/Makefile.in +++ b/lib/export/dns/include/dst/Makefile.in @@ -1,6 +1,6 @@ # Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ srcdir = @srcdir@ top_srcdir = @top_srcdir@ diff --git a/lib/export/irs/Makefile.in b/lib/export/irs/Makefile.in index 91925c9ba3..2cdc5818b0 100644 --- a/lib/export/irs/Makefile.in +++ b/lib/export/irs/Makefile.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ top_srcdir = @top_srcdir@ srcdir = @top_srcdir@/lib/irs diff --git a/lib/export/irs/include/irs/Makefile.in b/lib/export/irs/include/irs/Makefile.in index 334b355de8..c8507571c5 100644 --- a/lib/export/irs/include/irs/Makefile.in +++ b/lib/export/irs/include/irs/Makefile.in @@ -1,6 +1,6 @@ # Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ srcdir = @srcdir@ top_srcdir = @top_srcdir@ diff --git a/lib/export/isc/Makefile.in b/lib/export/isc/Makefile.in index 30531b4f9c..9939515c33 100644 --- a/lib/export/isc/Makefile.in +++ b/lib/export/isc/Makefile.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ top_srcdir = @top_srcdir@ srcdir = @top_srcdir@/lib/isc diff --git a/lib/export/isc/nls/Makefile.in b/lib/export/isc/nls/Makefile.in index e272f369e7..a9e779f928 100644 --- a/lib/export/isc/nls/Makefile.in +++ b/lib/export/isc/nls/Makefile.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ top_srcdir = @top_srcdir@ srcdir = @top_srcdir@/lib/isc/nls diff --git a/lib/export/isc/nothreads/Makefile.in b/lib/export/isc/nothreads/Makefile.in index 571f429269..e1bd566346 100644 --- a/lib/export/isc/nothreads/Makefile.in +++ b/lib/export/isc/nothreads/Makefile.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ top_srcdir = @top_srcdir@ srcdir = @top_srcdir@/lib/isc/nothreads diff --git a/lib/export/isc/pthreads/Makefile.in b/lib/export/isc/pthreads/Makefile.in index 624d44f3ef..92788ec104 100644 --- a/lib/export/isc/pthreads/Makefile.in +++ b/lib/export/isc/pthreads/Makefile.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ top_srcdir = @top_srcdir@ srcdir = @top_srcdir@/lib/isc/pthreads diff --git a/lib/export/isc/unix/Makefile.in b/lib/export/isc/unix/Makefile.in index ccd60ce3b8..5a8eed8824 100644 --- a/lib/export/isc/unix/Makefile.in +++ b/lib/export/isc/unix/Makefile.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ top_srcdir = @top_srcdir@ srcdir = @top_srcdir@/lib/isc/unix diff --git a/lib/export/isccfg/Makefile.in b/lib/export/isccfg/Makefile.in index d4e255dab8..d15b6433b0 100644 --- a/lib/export/isccfg/Makefile.in +++ b/lib/export/isccfg/Makefile.in @@ -1,7 +1,6 @@ -# Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") -# Copyright (C) 2001-2003 Internet Software Consortium. +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -13,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ top_srcdir = @top_srcdir@ srcdir = @top_srcdir@/lib/isccfg diff --git a/lib/export/isccfg/include/isccfg/Makefile.in b/lib/export/isccfg/include/isccfg/Makefile.in index 49a6530c1a..5e9ea78d80 100644 --- a/lib/export/isccfg/include/isccfg/Makefile.in +++ b/lib/export/isccfg/include/isccfg/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 20097 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 @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ srcdir = @srcdir@ top_srcdir = @top_srcdir@ diff --git a/lib/export/samples/Makefile-postinstall.in b/lib/export/samples/Makefile-postinstall.in index 6908147641..174aed60ad 100644 --- a/lib/export/samples/Makefile-postinstall.in +++ b/lib/export/samples/Makefile-postinstall.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile-postinstall.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile-postinstall.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ srcdir = @srcdir@ #prefix = @prefix@ diff --git a/lib/export/samples/Makefile.in b/lib/export/samples/Makefile.in index 97e1a7c3a6..4ab0286cd5 100644 --- a/lib/export/samples/Makefile.in +++ b/lib/export/samples/Makefile.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ srcdir = @srcdir@ top_srcdir = @top_srcdir@ diff --git a/lib/export/samples/nsprobe.c b/lib/export/samples/nsprobe.c index b8fdcefb9e..e706e29023 100644 --- a/lib/export/samples/nsprobe.c +++ b/lib/export/samples/nsprobe.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nsprobe.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */ +/* $Id: nsprobe.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */ #include @@ -113,7 +113,7 @@ struct stat { unsigned long nxdomain; unsigned long othererr; unsigned long multiplesoa; - unsigned long multiplecname; + unsigned long multiplecname; unsigned long brokenanswer; unsigned long lame; unsigned long unknown; @@ -122,8 +122,8 @@ struct stat { static unsigned long number_of_domains = 0; static unsigned long number_of_servers = 0; static unsigned long multiple_error_domains = 0; -static isc_boolean_t debug_mode = ISC_FALSE; -static int verbose_level = 0; +static isc_boolean_t debug_mode = ISC_FALSE; +static int verbose_level = 0; static const char *qlabels[] = {"www.", "ftp.", NULL}; static struct probe_trans probes[MAX_PROBES]; diff --git a/lib/export/samples/sample-async.c b/lib/export/samples/sample-async.c index 49e1c7a187..014b6a65d0 100644 --- a/lib/export/samples/sample-async.c +++ b/lib/export/samples/sample-async.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sample-async.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */ +/* $Id: sample-async.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */ #include diff --git a/lib/export/samples/sample-gai.c b/lib/export/samples/sample-gai.c index 364b5ad152..6dc4014ed5 100644 --- a/lib/export/samples/sample-gai.c +++ b/lib/export/samples/sample-gai.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sample-gai.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */ +/* $Id: sample-gai.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */ #include diff --git a/lib/export/samples/sample-request.c b/lib/export/samples/sample-request.c index b45e952d43..4d7d2fc9ef 100644 --- a/lib/export/samples/sample-request.c +++ b/lib/export/samples/sample-request.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sample-request.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */ +/* $Id: sample-request.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */ #include diff --git a/lib/export/samples/sample-update.c b/lib/export/samples/sample-update.c index 5ada36461d..c614e77c6e 100644 --- a/lib/export/samples/sample-update.c +++ b/lib/export/samples/sample-update.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sample-update.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */ +/* $Id: sample-update.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */ #include @@ -718,7 +718,7 @@ evaluate_prereq(isc_mem_t *mctx, char *cmdline, dns_name_t *name) { fprintf(stderr, "incorrect operation code: %s\n", word); exit(1); } - + make_prereq(mctx, cmdline, ispositive, isrrset, name); } diff --git a/lib/export/samples/sample.c b/lib/export/samples/sample.c index 765a759af9..f547e893e9 100644 --- a/lib/export/samples/sample.c +++ b/lib/export/samples/sample.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sample.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */ +/* $Id: sample.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */ #include @@ -80,7 +80,7 @@ printdata(dns_rdataset_t *rdataset, dns_name_t *owner) { static void usage() { - fprintf(stderr, "sample [-t RRtype] " + fprintf(stderr, "sample [-t RRtype] " "[[-a algorithm] [-e] -k keyname -K keystring] " "[-s domain:serveraddr_for_domain ] " "server_address hostname\n"); @@ -127,7 +127,7 @@ set_key(dns_client_t *client, char *keynamestr, char *keystr, keystruct.common.rdtype = dns_rdatatype_dnskey; keystruct.flags = DNS_KEYOWNER_ZONE; /* fixed */ if (is_sep) - keystruct.flags |= DNS_KEYFLAG_KSK; + keystruct.flags |= DNS_KEYFLAG_KSK; keystruct.protocol = DNS_KEYPROTO_DNSSEC; /* fixed */ keystruct.algorithm = alg; diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in index 9504794db1..ed869679cf 100644 --- a/lib/irs/Makefile.in +++ b/lib/irs/Makefile.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:27 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/lib/irs/context.c b/lib/irs/context.c index 59ecd0e63b..be69622b5b 100644 --- a/lib/irs/context.c +++ b/lib/irs/context.c @@ -1,23 +1,20 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * This code is derived from software contributed to ISC by - * Berkeley Software Design, Inc. - * - * Permission to use, copy, modify, and distribute this software for any + * 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 AND BERKELEY SOFTWARE DESIGN, INC. - * 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, 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. + * 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, + * 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: context.c,v 1.2 2009/09/01 00:22:27 jinmei Exp $ */ +/* $Id: context.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ #include diff --git a/lib/irs/dnsconf.c b/lib/irs/dnsconf.c index 1aa339e103..4a7d58bfbc 100644 --- a/lib/irs/dnsconf.c +++ b/lib/irs/dnsconf.c @@ -1,23 +1,20 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * This code is derived from software contributed to ISC by - * Berkeley Software Design, Inc. - * - * Permission to use, copy, modify, and distribute this software for any + * 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 AND BERKELEY SOFTWARE DESIGN, INC. - * 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, 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. + * 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, + * 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: dnsconf.c,v 1.2 2009/09/01 00:22:27 jinmei Exp $ */ +/* $Id: dnsconf.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ @@ -185,7 +182,7 @@ configure_dnsseckeys(irs_dnsconf_t *conf, cfg_obj_t *cfgobj, isc_buffer_free(&keydatabuf); if (keyname != NULL) isc_mem_put(mctx, keyname, sizeof(*keyname)); - + return (result); } diff --git a/lib/irs/gai_strerror.c b/lib/irs/gai_strerror.c index df8bf024d4..2fe3941619 100644 --- a/lib/irs/gai_strerror.c +++ b/lib/irs/gai_strerror.c @@ -1,8 +1,7 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 2000, 2001 Internet Software Consortium. + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -15,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: gai_strerror.c,v 1.4 2009/09/01 17:54:16 jinmei Exp $ */ +/* $Id: gai_strerror.c,v 1.5 2009/09/02 23:48:02 tbox Exp $ */ /*! \file gai_strerror.c * gai_strerror() returns an error message corresponding to an diff --git a/lib/irs/getaddrinfo.c b/lib/irs/getaddrinfo.c index a86b82905a..4b1f4a9221 100644 --- a/lib/irs/getaddrinfo.c +++ b/lib/irs/getaddrinfo.c @@ -1,24 +1,20 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 1999-2001 Internet Software Consortium. + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * This code is derived from software contributed to ISC by - * Berkeley Software Design, Inc. - * - * Permission to use, copy, modify, and distribute this software for any + * 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 AND BERKELEY SOFTWARE DESIGN, INC. - * 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, 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. + * 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, + * 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: getaddrinfo.c,v 1.2 2009/09/01 00:22:27 jinmei Exp $ */ +/* $Id: getaddrinfo.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ @@ -30,10 +26,10 @@ * string: a dotted decimal IPv4 address or an IPv6 address. servname is * either a decimal port number or a service name as listed in * /etc/services. - * + * * If the operating system does not provide a struct addrinfo, the * following structure is used: - * + * * \code * struct addrinfo { * int ai_flags; // AI_PASSIVE, AI_CANONNAME @@ -46,29 +42,29 @@ * struct addrinfo *ai_next; // next structure in linked list * }; * \endcode - * - * + * + * * hints is an optional pointer to a struct addrinfo. This structure can * be used to provide hints concerning the type of socket that the caller * supports or wishes to use. The caller can supply the following * structure elements in *hints: - * + * *
    *
  • ai_family: * The protocol family that should be used. When ai_family is set * to PF_UNSPEC, it means the caller will accept any protocol * family supported by the operating system.
    • - * + * *
  • ai_socktype: * denotes the type of socket -- SOCK_STREAM, SOCK_DGRAM or * SOCK_RAW -- that is wanted. When ai_socktype is zero the caller * will accept any socket type.
    • - * + * *
  • ai_protocol: * indicates which transport protocol is wanted: IPPROTO_UDP or * IPPROTO_TCP. If ai_protocol is zero the caller will accept any * protocol.
    • - * + * *
  • ai_flags: * Flag bits. If the AI_CANONNAME bit is set, a successful call to * getaddrinfo() will return a null-terminated string @@ -80,7 +76,7 @@ * address portion of the socket address structure will be set to * INADDR_ANY for an IPv4 address or IN6ADDR_ANY_INIT for an IPv6 * address.

    - * + * * When ai_flags does not set the AI_PASSIVE bit, the returned * socket address structure will be ready for use in a call to * connect(2) for a connection-oriented protocol or connect(2), @@ -88,18 +84,18 @@ * chosen. The IP address portion of the socket address structure * will be set to the loopback address if hostname is a NULL * pointer and AI_PASSIVE is not set in ai_flags.

    - * + * * If ai_flags is set to AI_NUMERICHOST it indicates that hostname * should be treated as a numeric string defining an IPv4 or IPv6 * address and no name resolution should be attempted. *
- * + * * All other elements of the struct addrinfo passed via hints must be * zero. - * + * * A hints of NULL is treated as if the caller provided a struct addrinfo * initialized to zero with ai_familyset to PF_UNSPEC. - * + * * After a successful call to getaddrinfo(), *res is a pointer to a * linked list of one or more addrinfo structures. Each struct addrinfo * in this list cn be processed by following the ai_next pointer, until a @@ -108,22 +104,22 @@ * corresponding arguments for a call to socket(2). For each addrinfo * structure in the list, the ai_addr member points to a filled-in socket * address structure of length ai_addrlen. - * + * * All of the information returned by getaddrinfo() is dynamically * allocated: the addrinfo structures, and the socket address structures * and canonical host name strings pointed to by the addrinfostructures. * Memory allocated for the dynamically allocated structures created by a * successful call to getaddrinfo() is released by freeaddrinfo(). * ai is a pointer to a struct addrinfo created by a call to getaddrinfo(). - * + * * \section irsreturn RETURN VALUES - * + * * getaddrinfo() returns zero on success or one of the error codes * listed in gai_strerror() if an error occurs. If both hostname and * servname are NULL getaddrinfo() returns #EAI_NONAME. - * + * * \section irssee SEE ALSO - * + * * getaddrinfo(), freeaddrinfo(), * gai_strerror(), RFC3493, getservbyname(3), connect(2), * sendto(2), sendmsg(2), socket(2). @@ -854,7 +850,7 @@ process_answer(isc_task_t *task, isc_event_t *event) { * There are outstanding states, but if we are at the head * of the state list (i.e., at the highest search priority) * and have any answer, we can stop now by canceling the - * others. + * others. */ if (resstate == ISC_LIST_HEAD(resstate->head->resstates)) { if ((resstate->trans4 != NULL && diff --git a/lib/irs/getnameinfo.c b/lib/irs/getnameinfo.c index 9c708f3ac5..0b674dbd81 100644 --- a/lib/irs/getnameinfo.c +++ b/lib/irs/getnameinfo.c @@ -1,8 +1,7 @@ /* - * Portions Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") - * Portions Copyright (C) 1999-2001, 2003 Internet Software Consortium. + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -15,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: getnameinfo.c,v 1.3 2009/09/01 02:54:26 marka Exp $ */ +/* $Id: getnameinfo.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ @@ -52,47 +51,47 @@ * getnameinfo() returns the hostname for the struct sockaddr sa which is * salen bytes long. The hostname is of length hostlen and is returned via * *host. The maximum length of the hostname is 1025 bytes: #NI_MAXHOST. - * + * * The name of the service associated with the port number in sa is * returned in *serv. It is servlen bytes long. The maximum length of the * service name is #NI_MAXSERV - 32 bytes. - * + * * The flags argument sets the following bits: - * + * * \li #NI_NOFQDN: * A fully qualified domain name is not required for local hosts. * The local part of the fully qualified domain name is returned * instead. - * + * * \li #NI_NUMERICHOST * Return the address in numeric form, as if calling inet_ntop(), * instead of a host name. - * + * * \li #NI_NAMEREQD * A name is required. If the hostname cannot be found in the DNS * and this flag is set, a non-zero error code is returned. If the * hostname is not found and the flag is not set, the address is * returned in numeric form. - * + * * \li #NI_NUMERICSERV * The service name is returned as a digit string representing the * port number. - * + * * \li #NI_DGRAM * Specifies that the service being looked up is a datagram * service, and causes getservbyport() to be called with a second * argument of "udp" instead of its default of "tcp". This is * required for the few ports (512-514) that have different * services for UDP and TCP. - * + * * \section getnameinfo_return Return Values - * + * * getnameinfo() returns 0 on success or a non-zero error code if * an error occurs. - * + * * \section getname_see See Also - * - * RFC3493, getservbyport(), + * + * RFC3493, getservbyport(), * getnamebyaddr(). inet_ntop(). */ @@ -376,7 +375,7 @@ getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, &b, &hostregion); goto ptrfound; } - + } } } diff --git a/lib/irs/include/Makefile.in b/lib/irs/include/Makefile.in index 3fba6e9dde..eca1945292 100644 --- a/lib/irs/include/Makefile.in +++ b/lib/irs/include/Makefile.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:28 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/lib/irs/include/irs/Makefile.in b/lib/irs/include/irs/Makefile.in index e85a90de0c..3c3b612757 100644 --- a/lib/irs/include/irs/Makefile.in +++ b/lib/irs/include/irs/Makefile.in @@ -1,6 +1,6 @@ -# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # -# Permission to use, copy, modify, and distribute this software for any +# 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. # @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.2 2009/09/01 00:22:28 jinmei Exp $ +# $Id: Makefile.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/lib/irs/include/irs/context.h b/lib/irs/include/irs/context.h index a72d0e3b88..f2ef3f4790 100644 --- a/lib/irs/include/irs/context.h +++ b/lib/irs/include/irs/context.h @@ -1,23 +1,20 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * This code is derived from software contributed to ISC by - * Berkeley Software Design, Inc. - * - * Permission to use, copy, modify, and distribute this software for any + * 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 AND BERKELEY SOFTWARE DESIGN, INC. - * 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, 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. + * 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, + * 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: context.h,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: context.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ #ifndef IRS_CONTEXT_H #define IRS_CONTEXT_H 1 diff --git a/lib/irs/include/irs/dnsconf.h b/lib/irs/include/irs/dnsconf.h index 7adb2cf723..4f673ff2df 100644 --- a/lib/irs/include/irs/dnsconf.h +++ b/lib/irs/include/irs/dnsconf.h @@ -1,23 +1,20 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * This code is derived from software contributed to ISC by - * Berkeley Software Design, Inc. - * - * Permission to use, copy, modify, and distribute this software for any + * 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 AND BERKELEY SOFTWARE DESIGN, INC. - * 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, 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. + * 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, + * 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: dnsconf.h,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: dnsconf.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ #ifndef IRS_DNSCONF_H #define IRS_DNSCONF_H 1 diff --git a/lib/irs/include/irs/netdb.h.in b/lib/irs/include/irs/netdb.h.in index 4f834dbaa2..299928b972 100644 --- a/lib/irs/include/irs/netdb.h.in +++ b/lib/irs/include/irs/netdb.h.in @@ -1,8 +1,7 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 2000, 2001 Internet Software Consortium. + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -15,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: netdb.h.in,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: netdb.h.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ diff --git a/lib/irs/include/irs/platform.h.in b/lib/irs/include/irs/platform.h.in index c498613911..0e9be3ce23 100644 --- a/lib/irs/include/irs/platform.h.in +++ b/lib/irs/include/irs/platform.h.in @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: platform.h.in,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: platform.h.in,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ diff --git a/lib/irs/include/irs/resconf.h b/lib/irs/include/irs/resconf.h index da31f0eab6..78c87d5166 100644 --- a/lib/irs/include/irs/resconf.h +++ b/lib/irs/include/irs/resconf.h @@ -1,23 +1,20 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * This code is derived from software contributed to ISC by - * Berkeley Software Design, Inc. - * - * Permission to use, copy, modify, and distribute this software for any + * 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 AND BERKELEY SOFTWARE DESIGN, INC. - * 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, 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. + * 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, + * 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: resconf.h,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: resconf.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ #ifndef IRS_RESCONF_H #define IRS_RESCONF_H 1 diff --git a/lib/irs/include/irs/types.h b/lib/irs/include/irs/types.h index 14b548d7b9..0a539decd8 100644 --- a/lib/irs/include/irs/types.h +++ b/lib/irs/include/irs/types.h @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: types.h,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: types.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ #ifndef IRS_TYPES_H #define IRS_TYPES_H 1 diff --git a/lib/irs/include/irs/version.h b/lib/irs/include/irs/version.h index d9020b8289..bd7e5cf8e0 100644 --- a/lib/irs/include/irs/version.h +++ b/lib/irs/include/irs/version.h @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: version.h,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: version.h,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ diff --git a/lib/irs/resconf.c b/lib/irs/resconf.c index e51108e92f..f3181a30d2 100644 --- a/lib/irs/resconf.c +++ b/lib/irs/resconf.c @@ -1,23 +1,20 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * This code is derived from software contributed to ISC by - * Berkeley Software Design, Inc. - * - * Permission to use, copy, modify, and distribute this software for any + * 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 AND BERKELEY SOFTWARE DESIGN, INC. - * 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, 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. + * 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, + * 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: resconf.c,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: resconf.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ /*! \file resconf.c */ @@ -26,19 +23,19 @@ * * irs_resconf_load() opens the file filename and parses it to initialize * the configuration structure. - * + * * \section lwconfig_return Return Values - * + * * irs_resconf_load() returns #IRS_R_SUCCESS if it successfully read and * parsed filename. It returns a non-0 error code if filename could not be * opened or contained incorrect resolver statements. - * + * * \section lwconfig_see See Also - * + * * stdio(3), \link resolver resolver \endlink - * + * * \section files Files - * + * * /etc/resolv.conf */ @@ -324,7 +321,7 @@ resconf_parsedomain(irs_resconf_t *conf, FILE *fp) { */ for (i = 0; i < RESCONFMAXSEARCH; i++) { if (conf->search[i] != NULL) { - isc_mem_free(conf->mctx, conf->search[i]); + isc_mem_free(conf->mctx, conf->search[i]); conf->search[i] = NULL; } } diff --git a/lib/irs/version.c b/lib/irs/version.c index 1142a8496b..f50a385556 100644 --- a/lib/irs/version.c +++ b/lib/irs/version.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: version.c,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: version.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ diff --git a/lib/isc/app_api.c b/lib/isc/app_api.c index 82940c3ef6..ce767d1750 100644 --- a/lib/isc/app_api.c +++ b/lib/isc/app_api.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: app_api.c,v 1.4 2009/09/01 08:12:33 jinmei Exp $ */ +/* $Id: app_api.c,v 1.5 2009/09/02 23:48:02 tbox Exp $ */ #include @@ -79,21 +79,21 @@ isc_appctx_destroy(isc_appctx_t **ctxp) { isc_result_t isc_app_ctxstart(isc_appctx_t *ctx) { REQUIRE(ISCAPI_APPCTX_VALID(ctx)); - + return (ctx->methods->ctxstart(ctx)); } isc_result_t isc_app_ctxrun(isc_appctx_t *ctx) { REQUIRE(ISCAPI_APPCTX_VALID(ctx)); - + return (ctx->methods->ctxrun(ctx)); } isc_result_t isc_app_ctxsuspend(isc_appctx_t *ctx) { REQUIRE(ISCAPI_APPCTX_VALID(ctx)); - + return (ctx->methods->ctxsuspend(ctx)); } diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c index 0d5cc5c211..368e90052c 100644 --- a/lib/isc/assertions.c +++ b/lib/isc/assertions.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1997-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: assertions.c,v 1.24 2009/09/01 18:40:25 jinmei Exp $ */ +/* $Id: assertions.c,v 1.25 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ diff --git a/lib/isc/backtrace.c b/lib/isc/backtrace.c index 26355ad55b..d2f044cb8c 100644 --- a/lib/isc/backtrace.c +++ b/lib/isc/backtrace.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: backtrace.c,v 1.2 2009/09/01 18:40:25 jinmei Exp $ */ +/* $Id: backtrace.c,v 1.3 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ @@ -37,7 +37,7 @@ * 1. If the system library supports the "backtrace()" function, use it. * 2. Otherwise, if the compiler is gcc and the architecture is x86_64 or IA64, * then use gcc's (hidden) Unwind_Backtrace() function. Note that this - * function doesn't work for C programs on many other architectures. + * function doesn't work for C programs on many other architectures. * 3. Otherwise, if the architecture x86 or x86_64, try to unwind the stack * frame following frame pointers. This assumes the executable binary * compiled with frame pointers; this is not always true for x86_64 (rather, diff --git a/lib/isc/include/isc/app.h b/lib/isc/include/isc/app.h index f93f9fcdb8..e0be790637 100644 --- a/lib/isc/include/isc/app.h +++ b/lib/isc/include/isc/app.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-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: app.h,v 1.10 2009/09/02 18:38:40 jinmei Exp $ */ +/* $Id: app.h,v 1.11 2009/09/02 23:48:03 tbox Exp $ */ #ifndef ISC_APP_H #define ISC_APP_H 1 diff --git a/lib/isc/include/isc/lib.h b/lib/isc/include/isc/lib.h index af8b07b009..f24fef8501 100644 --- a/lib/isc/include/isc/lib.h +++ b/lib/isc/include/isc/lib.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-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: lib.h,v 1.15 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: lib.h,v 1.16 2009/09/02 23:48:03 tbox Exp $ */ #ifndef ISC_LIB_H #define ISC_LIB_H 1 diff --git a/lib/isc/include/isc/namespace.h b/lib/isc/include/isc/namespace.h index 24fdcecc89..33ec63a38f 100644 --- a/lib/isc/include/isc/namespace.h +++ b/lib/isc/include/isc/namespace.h @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: namespace.h,v 1.3 2009/09/02 23:43:54 each Exp $ */ +/* $Id: namespace.h,v 1.4 2009/09/02 23:48:03 tbox Exp $ */ #ifndef ISCAPI_NAMESPACE_H #define ISCAPI_NAMESPACE_H 1 diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h index b01b181fcf..2347d5f80c 100644 --- a/lib/isc/include/isc/result.h +++ b/lib/isc/include/isc/result.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-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: result.h,v 1.72 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: result.h,v 1.73 2009/09/02 23:48:03 tbox Exp $ */ #ifndef ISC_RESULT_H #define ISC_RESULT_H 1 diff --git a/lib/isc/include/isc/resultclass.h b/lib/isc/include/isc/resultclass.h index e0f64393b1..d91e800e06 100644 --- a/lib/isc/include/isc/resultclass.h +++ b/lib/isc/include/isc/resultclass.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-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: resultclass.h,v 1.19 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: resultclass.h,v 1.20 2009/09/02 23:48:03 tbox Exp $ */ #ifndef ISC_RESULTCLASS_H #define ISC_RESULTCLASS_H 1 diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h index c50b82c78d..fa9abb16aa 100644 --- a/lib/isc/include/isc/timer.h +++ b/lib/isc/include/isc/timer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: timer.h,v 1.42 2009/09/02 18:38:40 jinmei Exp $ */ +/* $Id: timer.h,v 1.43 2009/09/02 23:48:03 tbox Exp $ */ #ifndef ISC_TIMER_H #define ISC_TIMER_H 1 diff --git a/lib/isc/lib.c b/lib/isc/lib.c index 8d431f13e0..a50542551d 100644 --- a/lib/isc/lib.c +++ b/lib/isc/lib.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) 1999-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: lib.c,v 1.15 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: lib.c,v 1.16 2009/09/02 23:48:02 tbox Exp $ */ /*! \file */ diff --git a/lib/isc/mem_api.c b/lib/isc/mem_api.c index a6f2c3aa35..470c820124 100644 --- a/lib/isc/mem_api.c +++ b/lib/isc/mem_api.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mem_api.c,v 1.4 2009/09/02 23:43:54 each Exp $ */ +/* $Id: mem_api.c,v 1.5 2009/09/02 23:48:02 tbox Exp $ */ #include @@ -99,7 +99,7 @@ isc_mem_attach(isc_mem_t *source, isc_mem_t **targetp) { void isc_mem_detach(isc_mem_t **mctxp) { - REQUIRE(mctxp != NULL && ISCAPI_MCTX_VALID(*mctxp)); + REQUIRE(mctxp != NULL && ISCAPI_MCTX_VALID(*mctxp)); (*mctxp)->methods->detach(mctxp); @@ -192,7 +192,7 @@ isc_mem_waterack(isc_mem_t *ctx, int flag) { ctx->methods->waterack(ctx, flag); } -size_t +size_t isc_mem_inuse(isc_mem_t *mctx) { REQUIRE(ISCAPI_MCTX_VALID(mctx)); diff --git a/lib/isc/nls/Makefile.in b/lib/isc/nls/Makefile.in index 29baa21fcc..8302a927bb 100644 --- a/lib/isc/nls/Makefile.in +++ b/lib/isc/nls/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1999-2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.15 2009/09/01 00:22:28 jinmei Exp $ +# $Id: Makefile.in,v 1.16 2009/09/02 23:48:03 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/lib/isc/nothreads/Makefile.in b/lib/isc/nothreads/Makefile.in index 2e6a41bebd..eef176522e 100644 --- a/lib/isc/nothreads/Makefile.in +++ b/lib/isc/nothreads/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000, 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.8 2009/09/01 00:22:28 jinmei Exp $ +# $Id: Makefile.in,v 1.9 2009/09/02 23:48:03 tbox Exp $ top_srcdir = @top_srcdir@ srcdir = @top_srcdir@/lib/isc/nothreads diff --git a/lib/isc/pthreads/Makefile.in b/lib/isc/pthreads/Makefile.in index c83eaa610a..2cbda99fc4 100644 --- a/lib/isc/pthreads/Makefile.in +++ b/lib/isc/pthreads/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.20 2009/09/01 00:22:28 jinmei Exp $ +# $Id: Makefile.in,v 1.21 2009/09/02 23:48:03 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/lib/isc/socket_api.c b/lib/isc/socket_api.c index a10efef41f..8ba206070c 100644 --- a/lib/isc/socket_api.c +++ b/lib/isc/socket_api.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: socket_api.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */ +/* $Id: socket_api.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */ #include @@ -122,7 +122,7 @@ isc_socket_detach(isc_socket_t **socketp) { isc_result_t isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr, - unsigned int options) + unsigned int options) { REQUIRE(ISCAPI_SOCKET_VALID(sock)); diff --git a/lib/isc/task.c b/lib/isc/task.c index 839900771a..ddd4a53478 100644 --- a/lib/isc/task.c +++ b/lib/isc/task.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 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: task.c,v 1.109 2009/09/02 04:25:19 jinmei Exp $ */ +/* $Id: task.c,v 1.110 2009/09/02 23:48:02 tbox Exp $ */ /*! \file * \author Principal Author: Bob Halley @@ -301,7 +301,7 @@ ISC_TASKFUNC_SCOPE isc_result_t isc__task_create(isc_taskmgr_t *manager0, unsigned int quantum, isc_task_t **taskp) { - isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0; + isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0; isc__task_t *task; isc_boolean_t exiting; isc_result_t result; @@ -1467,7 +1467,7 @@ isc__task_endexclusive(isc_task_t *task0) { #endif } -#ifdef USE_SOCKETIMPREGISTER +#ifdef USE_SOCKETIMPREGISTER isc_result_t isc__task_register() { return (isc_task_register(isc__taskmgr_create)); diff --git a/lib/isc/task_api.c b/lib/isc/task_api.c index 2bb2061062..89065355fa 100644 --- a/lib/isc/task_api.c +++ b/lib/isc/task_api.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: task_api.c,v 1.4 2009/09/01 23:05:33 jinmei Exp $ */ +/* $Id: task_api.c,v 1.5 2009/09/02 23:48:02 tbox Exp $ */ #include diff --git a/lib/isc/task_p.h b/lib/isc/task_p.h index 75cba60a0f..cab2a83978 100644 --- a/lib/isc/task_p.h +++ b/lib/isc/task_p.h @@ -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) 2000, 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: task_p.h,v 1.12 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: task_p.h,v 1.13 2009/09/02 23:48:02 tbox Exp $ */ #ifndef ISC_TASK_P_H #define ISC_TASK_P_H diff --git a/lib/isc/timer_api.c b/lib/isc/timer_api.c index 44a0b9f1ff..97e62b3f0e 100644 --- a/lib/isc/timer_api.c +++ b/lib/isc/timer_api.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: timer_api.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */ +/* $Id: timer_api.c,v 1.4 2009/09/02 23:48:02 tbox Exp $ */ #include diff --git a/lib/isc/timer_p.h b/lib/isc/timer_p.h index 5e66bbe4bb..d6f7c996c7 100644 --- a/lib/isc/timer_p.h +++ b/lib/isc/timer_p.h @@ -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) 2000, 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: timer_p.h,v 1.11 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: timer_p.h,v 1.12 2009/09/02 23:48:02 tbox Exp $ */ #ifndef ISC_TIMER_P_H #define ISC_TIMER_P_H diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in index 861048dd93..d47e5726a7 100644 --- a/lib/isc/unix/Makefile.in +++ b/lib/isc/unix/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.42 2009/09/01 00:22:28 jinmei Exp $ +# $Id: Makefile.in,v 1.43 2009/09/02 23:48:03 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c index ef4d48d0af..04dfa7e5f8 100644 --- a/lib/isc/unix/app.c +++ b/lib/isc/unix/app.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007-2009 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: app.c,v 1.62 2009/09/02 04:25:19 jinmei Exp $ */ +/* $Id: app.c,v 1.63 2009/09/02 23:48:03 tbox Exp $ */ /*! \file */ @@ -140,7 +140,7 @@ typedef struct isc__appctx { * We assume that 'want_reload' can be read and written atomically. */ isc_boolean_t want_reload; - + isc_boolean_t blocked; isc_taskmgr_t *taskmgr; @@ -952,7 +952,7 @@ isc__appctx_settimermgr(isc_appctx_t *ctx0, isc_timermgr_t *timermgr) { ctx->timermgr = timermgr; } -#ifdef USE_APPIMPREGISTER +#ifdef USE_APPIMPREGISTER isc_result_t isc__app_register() { return (isc_app_register(isc__appctx_create)); diff --git a/lib/isc/unix/socket_p.h b/lib/isc/unix/socket_p.h index e4a19baaaf..1316011739 100644 --- a/lib/isc/unix/socket_p.h +++ b/lib/isc/unix/socket_p.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 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: socket_p.h,v 1.14 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: socket_p.h,v 1.15 2009/09/02 23:48:03 tbox Exp $ */ #ifndef ISC_SOCKET_P_H #define ISC_SOCKET_P_H diff --git a/lib/isc/win32/Makefile.in b/lib/isc/win32/Makefile.in index 280b04e4f0..acfbf32bc9 100644 --- a/lib/isc/win32/Makefile.in +++ b/lib/isc/win32/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1999-2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.12 2009/09/01 00:22:28 jinmei Exp $ +# $Id: Makefile.in,v 1.13 2009/09/02 23:48:03 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/lib/isc/win32/app.c b/lib/isc/win32/app.c index 65eddb050a..04b1638783 100644 --- a/lib/isc/win32/app.c +++ b/lib/isc/win32/app.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-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: app.c,v 1.8 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: app.c,v 1.9 2009/09/02 23:48:03 tbox Exp $ */ #include @@ -170,7 +170,7 @@ isc__app_run(void) { FALSE, INFINITE); /* See why we returned */ - + if (WaitSucceeded(dwWaitResult, NUM_EVENTS)) { /* * The return was due to one of the events diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in index 1bae4b35cb..31713e1abc 100644 --- a/lib/isccc/Makefile.in +++ b/lib/isccc/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001, 2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.10 2009/09/01 00:22:28 jinmei Exp $ +# $Id: Makefile.in,v 1.11 2009/09/02 23:48:03 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in index c3d2ee4aff..d7dbb65a3e 100644 --- a/lib/isccfg/Makefile.in +++ b/lib/isccfg/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001-2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.19 2009/09/01 00:22:28 jinmei Exp $ +# $Id: Makefile.in,v 1.20 2009/09/02 23:48:03 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/lib/isccfg/dnsconf.c b/lib/isccfg/dnsconf.c index 8429f34ccf..704d383a77 100644 --- a/lib/isccfg/dnsconf.c +++ b/lib/isccfg/dnsconf.c @@ -1,8 +1,7 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 2002, 2003 Internet Software Consortium. + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -15,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnsconf.c,v 1.3 2009/09/01 03:43:27 jinmei Exp $ */ +/* $Id: dnsconf.c,v 1.4 2009/09/02 23:48:03 tbox Exp $ */ /*! \file */ diff --git a/lib/isccfg/include/isccfg/dnsconf.h b/lib/isccfg/include/isccfg/dnsconf.h index da34788704..edc5e5037b 100644 --- a/lib/isccfg/include/isccfg/dnsconf.h +++ b/lib/isccfg/include/isccfg/dnsconf.h @@ -1,8 +1,7 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 2002 Internet Software Consortium. + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * 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. * @@ -15,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnsconf.h,v 1.2 2009/09/01 00:22:28 jinmei Exp $ */ +/* $Id: dnsconf.h,v 1.3 2009/09/02 23:48:03 tbox Exp $ */ #ifndef ISCCFG_NAMEDCONF_H #define ISCCFG_NAMEDCONF_H 1 diff --git a/lib/lwres/context.c b/lib/lwres/context.c index 7e8188eaf6..64bdaa107d 100644 --- a/lib/lwres/context.c +++ b/lib/lwres/context.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007-2009 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: context.c,v 1.54 2009/09/01 22:52:27 jinmei Exp $ */ +/* $Id: context.c,v 1.55 2009/09/02 23:48:03 tbox Exp $ */ /*! \file context.c lwres_context_create() creates a #lwres_context_t structure for use in @@ -471,7 +471,7 @@ lwres_context_sendrecv(lwres_context_t *ctx, result = lwres_context_send(ctx, sendbase, sendlen); if (result != LWRES_R_SUCCESS) return (result); - + /* * If this is not checked, select() can overflow, * causing corruption elsewhere. diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in index b57a35cf95..b336c9f3e8 100644 --- a/lib/tests/Makefile.in +++ b/lib/tests/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2001, 2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.26 2009/09/01 00:22:28 jinmei Exp $ +# $Id: Makefile.in,v 1.27 2009/09/02 23:48:03 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/util/mksymtbl.pl b/util/mksymtbl.pl index b0fef5f42f..8ebc795c04 100755 --- a/util/mksymtbl.pl +++ b/util/mksymtbl.pl @@ -1,4 +1,18 @@ #!/usr/bin/env perl +# +# 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, +# 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. # Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") # @@ -14,13 +28,13 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: mksymtbl.pl,v 1.2 2009/09/01 18:50:52 jinmei Exp $ +# $Id: mksymtbl.pl,v 1.3 2009/09/02 23:48:03 tbox Exp $ use strict; use diagnostics; $^W = 1; -my $rev = '$Id: mksymtbl.pl,v 1.2 2009/09/01 18:50:52 jinmei Exp $'; +my $rev = '$Id: mksymtbl.pl,v 1.3 2009/09/02 23:48:03 tbox Exp $'; $rev =~ s/\$//g; $rev =~ s/,v//g; $rev =~ s/Id: //;