From 4a979d35776321abc952346ba128d1a3cef730ce Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Fri, 17 Jul 2009 23:47:41 +0000 Subject: [PATCH] update copyright notice --- bin/dnssec/dnssec-revoke.c | 32 ++++++++++++++++---------------- config.h.win32 | 4 ++-- lib/dns/zone.c | 4 ++-- lib/isc/inet_ntop.c | 6 +++--- lib/isc/win32/libgen.h | 16 +++++++++++++++- lib/isc/win32/time.c | 4 ++-- lib/isc/win32/unistd.h | 4 ++-- win32utils/updateopenssl.pl | 4 ++-- win32utils/win32-build.txt | 4 ++-- 9 files changed, 46 insertions(+), 32 deletions(-) diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c index 9f922ec504..7da15b037c 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.3 2009/07/17 06:25:41 each Exp $ */ +/* $Id: dnssec-revoke.c,v 1.4 2009/07/17 23:47:40 tbox Exp $ */ /*! \file */ @@ -127,28 +127,28 @@ main(int argc, char **argv) { fatal("Extraneous arguments"); if (dir == NULL) { - char *slash; + char *slash; #ifdef _WIN32 - char *backslash; + char *backslash; #endif dir = strdup(argv[isc_commandline_index]); - /* Figure out the directory name from the key name */ - slash = strrchr(dir, '/'); + /* Figure out the directory name from the key name */ + slash = strrchr(dir, '/'); #ifdef _WIN32 - backslash = strrchr(dir, '\\'); - if ((slash != NULL && backslash != NULL && backslash > slash) || - (slash == NULL && backslash != NULL)) - slash = backslash; + backslash = strrchr(dir, '\\'); + if ((slash != NULL && backslash != NULL && backslash > slash) || + (slash == NULL && backslash != NULL)) + slash = backslash; #endif - if (slash != NULL) - *slash++ = '\0'; - else { - free(dir); - dir = strdup("."); - } - } + if (slash != NULL) + *slash++ = '\0'; + else { + free(dir); + dir = strdup("."); + } + } filename = argv[isc_commandline_index]; diff --git a/config.h.win32 b/config.h.win32 index 258b12e204..962ffe2be8 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2006-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006-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: config.h.win32,v 1.20 2009/07/17 06:25:40 each Exp $ */ +/* $Id: config.h.win32,v 1.21 2009/07/17 23:47:40 tbox Exp $ */ /* * win32 configuration file diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 6218694210..6ece61e8ca 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone.c,v 1.500 2009/07/17 06:25:42 each Exp $ */ +/* $Id: zone.c,v 1.501 2009/07/17 23:47:40 tbox Exp $ */ /*! \file */ @@ -3010,7 +3010,7 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db, isc_boolean_t addsoa) { if (dns_keynode_managed(keynode)) { dns_fixedname_t fname; dns_name_t *keyname; - dst_key_t *key; + dst_key_t *key; key = dns_keynode_key(keynode); dns_fixedname_init(&fname); diff --git a/lib/isc/inet_ntop.c b/lib/isc/inet_ntop.c index 60eaed7de6..94910f03ee 100644 --- a/lib/isc/inet_ntop.c +++ b/lib/isc/inet_ntop.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) 1996-2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -19,7 +19,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char rcsid[] = - "$Id: inet_ntop.c,v 1.20 2009/07/17 22:01:44 each Exp $"; + "$Id: inet_ntop.c,v 1.21 2009/07/17 23:47:41 tbox Exp $"; #endif /* LIBC_SCCS and not lint */ #include @@ -52,7 +52,7 @@ static const char *inet_ntop6(const unsigned char *src, char *dst, * convert a network format address to presentation format. * \return * pointer to presentation format address (`dst'), or NULL (see errno). - * \author + * \author * Paul Vixie, 1996. */ const char * diff --git a/lib/isc/win32/libgen.h b/lib/isc/win32/libgen.h index f897d103b7..1c58a9569a 100644 --- a/lib/isc/win32/libgen.h +++ b/lib/isc/win32/libgen.h @@ -1,7 +1,21 @@ /* - * Copyright + * 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. */ +/* $Id: libgen.h,v 1.3 2009/07/17 23:47:41 tbox Exp $ */ + #ifndef LIBGEN_H #define LIBGEN_H 1 diff --git a/lib/isc/win32/time.c b/lib/isc/win32/time.c index 0fb7f36ec6..0cf75cb07c 100644 --- a/lib/isc/win32/time.c +++ b/lib/isc/win32/time.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2006-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006-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: time.c,v 1.49 2009/07/17 06:25:45 each Exp $ */ +/* $Id: time.c,v 1.50 2009/07/17 23:47:41 tbox Exp $ */ #include diff --git a/lib/isc/win32/unistd.h b/lib/isc/win32/unistd.h index 536822d752..bcb3b256da 100644 --- a/lib/isc/win32/unistd.h +++ b/lib/isc/win32/unistd.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 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: unistd.h,v 1.9 2009/07/17 06:25:45 each Exp $ */ +/* $Id: unistd.h,v 1.10 2009/07/17 23:47:41 tbox Exp $ */ /* None of these are defined in NT, so define them for our use */ #define O_NONBLOCK 1 diff --git a/win32utils/updateopenssl.pl b/win32utils/updateopenssl.pl index 1b4a946f7f..1c3ed5391a 100644 --- a/win32utils/updateopenssl.pl +++ b/win32utils/updateopenssl.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# 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 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: updateopenssl.pl,v 1.9 2009/07/17 06:25:45 each Exp $ +# $Id: updateopenssl.pl,v 1.10 2009/07/17 23:47:41 tbox Exp $ # updateopenssl.pl # This script locates the latest version of OpenSSL in the grandparent diff --git a/win32utils/win32-build.txt b/win32utils/win32-build.txt index 0dc3cc8995..fcf4e20db8 100644 --- a/win32utils/win32-build.txt +++ b/win32utils/win32-build.txt @@ -1,8 +1,8 @@ -Copyright (C) 2004, 2005, 2008 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 2001, 2002 Internet Software Consortium. See COPYRIGHT in the source root or http://isc.org/copyright.html for terms. -$Id: win32-build.txt,v 1.14 2009/07/17 06:25:45 each Exp $ +$Id: win32-build.txt,v 1.15 2009/07/17 23:47:41 tbox Exp $ BIND 9.7 for Win32 Source Build Instructions. 02-Jul-2009