From 2f17ad4545ca552c92c88f7cb1e2525050c10c67 Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Thu, 28 Jul 2011 23:47:59 +0000 Subject: [PATCH] update copyright notice --- bin/named/client.c | 4 ++-- bin/named/include/named/interfacemgr.h | 6 +++--- bin/tests/system/filter-aaaa/Makefile.in | 4 ++-- bin/tests/system/filter-aaaa/filter-aaaa.c | 4 ++-- isc-config.sh.html | 4 ++-- lib/dns/dispatch.c | 6 +++--- lib/dns/include/dns/dispatch.h | 4 ++-- lib/isc/include/isc/namespace.h | 4 ++-- lib/isc/include/isc/socket.h | 4 ++-- lib/isc/socket_api.c | 4 ++-- lib/isc/tests/socket_test.c | 6 +++--- lib/isc/unix/socket.c | 6 +++--- lib/isc/win32/socket.c | 4 ++-- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/bin/named/client.c b/bin/named/client.c index 4202e26707..602b8bc9eb 100644 --- a/bin/named/client.c +++ b/bin/named/client.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.c,v 1.275 2011/07/28 04:27:26 marka Exp $ */ +/* $Id: client.c,v 1.276 2011/07/28 23:47:58 tbox Exp $ */ #include @@ -2568,7 +2568,7 @@ ns_clientmgr_createclients(ns_clientmgr_t *manager, unsigned int n, if (client != NULL) { MTRACE("recycle"); ISC_LIST_UNLINK(manager->inactive, client, - link); + link); client->list = NULL; } else { MTRACE("create new"); diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h index 2821984cc8..380dbedd76 100644 --- a/bin/named/include/named/interfacemgr.h +++ b/bin/named/include/named/interfacemgr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2011 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: interfacemgr.h,v 1.34 2011/07/28 04:04:36 each Exp $ */ +/* $Id: interfacemgr.h,v 1.35 2011/07/28 23:47:58 tbox Exp $ */ #ifndef NAMED_INTERFACEMGR_H #define NAMED_INTERFACEMGR_H 1 @@ -66,7 +66,7 @@ #define NS_INTERFACEFLAG_ANYADDR 0x01U /*%< bound to "any" address */ #define MAX_UDP_DISPATCH 128 /*%< Maximum number of UDP dispatchers - to start per interface */ + to start per interface */ /*% The nameserver interface structure */ struct ns_interface { unsigned int magic; /*%< Magic number. */ diff --git a/bin/tests/system/filter-aaaa/Makefile.in b/bin/tests/system/filter-aaaa/Makefile.in index 63524658e8..28fe8ca399 100644 --- a/bin/tests/system/filter-aaaa/Makefile.in +++ b/bin/tests/system/filter-aaaa/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2010, 2011 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.3 2011/07/28 03:20:45 marka Exp $ +# $Id: Makefile.in,v 1.4 2011/07/28 23:47:58 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/system/filter-aaaa/filter-aaaa.c b/bin/tests/system/filter-aaaa/filter-aaaa.c index 57f9bf87f0..64428d2c16 100644 --- a/bin/tests/system/filter-aaaa/filter-aaaa.c +++ b/bin/tests/system/filter-aaaa/filter-aaaa.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2010, 2011 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: filter-aaaa.c,v 1.3 2011/07/27 23:38:21 marka Exp $ */ +/* $Id: filter-aaaa.c,v 1.4 2011/07/28 23:47:58 tbox Exp $ */ #include #include diff --git a/isc-config.sh.html b/isc-config.sh.html index 131dcaaa93..761e0e43a3 100644 --- a/isc-config.sh.html +++ b/isc-config.sh.html @@ -1,5 +1,5 @@ - + diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c index ba3eefe013..ab049fa3c1 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dispatch.c,v 1.173 2011/07/28 04:04:36 each Exp $ */ +/* $Id: dispatch.c,v 1.174 2011/07/28 23:47:58 tbox Exp $ */ /*! \file */ @@ -906,7 +906,7 @@ get_dispsocket(dns_dispatch_t *disp, isc_sockaddr_t *dest, if (portentry != NULL) bindoptions |= ISC_SOCKET_REUSEADDRESS; result = open_socket(sockmgr, &localaddr, bindoptions, &sock, - NULL); + NULL); if (result == ISC_R_SUCCESS) { if (portentry == NULL) { portentry = new_portentry(disp, port); @@ -2707,7 +2707,7 @@ dns_dispatch_getudp_dup(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, disp->attributes |= DNS_DISPATCHATTR_NOLISTEN; if (disp->recv_pending != 0) isc_socket_cancel(disp->socket, - disp->task[0], + disp->task[0], ISC_SOCKCANCEL_RECV); } diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h index b0c59e54ba..643887c608 100644 --- a/lib/dns/include/dns/dispatch.h +++ b/lib/dns/include/dns/dispatch.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009, 2011 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: dispatch.h,v 1.63 2011/07/28 04:04:37 each Exp $ */ +/* $Id: dispatch.h,v 1.64 2011/07/28 23:47:58 tbox Exp $ */ #ifndef DNS_DISPATCH_H #define DNS_DISPATCH_H 1 diff --git a/lib/isc/include/isc/namespace.h b/lib/isc/include/isc/namespace.h index 427e332a18..0f93ddd60e 100644 --- a/lib/isc/include/isc/namespace.h +++ b/lib/isc/include/isc/namespace.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, 2010 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009-2011 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: namespace.h,v 1.10 2011/07/28 04:04:37 each Exp $ */ +/* $Id: namespace.h,v 1.11 2011/07/28 23:47:59 tbox Exp $ */ #ifndef ISCAPI_NAMESPACE_H #define ISCAPI_NAMESPACE_H 1 diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h index 8bf5e6b2b4..036025c0ee 100644 --- a/lib/isc/include/isc/socket.h +++ b/lib/isc/include/isc/socket.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009, 2011 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: socket.h,v 1.96 2011/07/28 11:42:41 marka Exp $ */ +/* $Id: socket.h,v 1.97 2011/07/28 23:47:59 tbox Exp $ */ #ifndef ISC_SOCKET_H #define ISC_SOCKET_H 1 diff --git a/lib/isc/socket_api.c b/lib/isc/socket_api.c index a8fa86d444..bbf371b1df 100644 --- a/lib/isc/socket_api.c +++ b/lib/isc/socket_api.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009, 2011 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: socket_api.c,v 1.6 2011/07/28 11:42:41 marka Exp $ */ +/* $Id: socket_api.c,v 1.7 2011/07/28 23:47:59 tbox Exp $ */ #include diff --git a/lib/isc/tests/socket_test.c b/lib/isc/tests/socket_test.c index 3aaaf043e5..b7bdcfbf2a 100644 --- a/lib/isc/tests/socket_test.c +++ b/lib/isc/tests/socket_test.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: socket_test.c,v 1.2 2011/07/28 04:04:37 each Exp $ */ +/* $Id: socket_test.c,v 1.3 2011/07/28 23:47:59 tbox Exp $ */ /*! \file */ @@ -128,7 +128,7 @@ ATF_TC_BODY(udp_sendto, tc) { ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); result = isc_socket_bind(s2, &addr2, ISC_SOCKET_REUSEADDRESS); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); - + result = isc_task_create(taskmgr, 0, &task); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); @@ -204,7 +204,7 @@ ATF_TC_BODY(udp_dup, tc) { ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); result = isc_socket_bind(s3, &addr2, ISC_SOCKET_REUSEADDRESS); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); - + result = isc_task_create(taskmgr, 0, &task); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index 06522e1e2d..458387fe14 100644 --- a/lib/isc/unix/socket.c +++ b/lib/isc/unix/socket.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: socket.c,v 1.343 2011/07/28 11:42:41 marka Exp $ */ +/* $Id: socket.c,v 1.344 2011/07/28 23:47:59 tbox Exp $ */ /*! \file */ @@ -2642,8 +2642,8 @@ isc__socket_dup(isc_socket_t *sock0, isc_socket_t **socketp) { REQUIRE(socketp != NULL && *socketp == NULL); return (socket_create((isc_socketmgr_t *) sock->manager, - sock->pf, sock->type, socketp, - sock0)); + sock->pf, sock->type, socketp, + sock0)); } #ifdef BIND9 diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c index 1c5935878c..9367b3ce16 100644 --- a/lib/isc/win32/socket.c +++ b/lib/isc/win32/socket.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2011 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: socket.c,v 1.89 2011/07/28 04:27:27 marka Exp $ */ +/* $Id: socket.c,v 1.90 2011/07/28 23:47:59 tbox Exp $ */ /* This code uses functions which are only available on Server 2003 and * higher, and Windows XP and higher.