mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 08:05:21 +00:00
Code Issues Releases Wiki Activity

update copyright notice

Browse Source
This commit is contained in:
Automatic Updater
2008-06-23 23:47:11 +00:00
parent 681beefc66
commit 2cf81a3d8a
13 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/dns/dispatch.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dispatch.c,v 1.141 2008/06/23 19:41:19 jinmei Exp $ */ /* $Id: dispatch.c,v 1.142 2008/06/23 23:47:11 tbox Exp $ */
/*! \file */ /*! \file */
@@ -2909,8 +2909,8 @@ dns_dispatch_addresponse(dns_dispatch_t *disp, isc_sockaddr_t *dest,
isc_task_t *task, isc_taskaction_t action, void *arg, isc_task_t *task, isc_taskaction_t action, void *arg,
dns_messageid_t *idp, dns_dispentry_t **resp) dns_messageid_t *idp, dns_dispentry_t **resp)
{ {
REQUIRE(VALID_DISPATCH(disp)); REQUIRE(VALID_DISPATCH(disp));
REQUIRE((disp->attributes & DNS_DISPATCHATTR_EXCLUSIVE) == 0); REQUIRE((disp->attributes & DNS_DISPATCHATTR_EXCLUSIVE) == 0);
return (dns_dispatch_addresponse2(disp, dest, task, action, arg, return (dns_dispatch_addresponse2(disp, dest, task, action, arg,
idp, resp, NULL)); idp, resp, NULL));

6
lib/dns/include/dns/dispatch.h
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dispatch.h,v 1.59 2008/06/23 19:41:19 jinmei Exp $ */ /* $Id: dispatch.h,v 1.60 2008/06/23 23:47:11 tbox Exp $ */
#ifndef DNS_DISPATCH_H #ifndef DNS_DISPATCH_H
#define DNS_DISPATCH_H 1 #define DNS_DISPATCH_H 1
@@ -120,7 +120,7 @@ struct dns_dispatchevent {
* is obsoleted. * is obsoleted.
* *
* _EXCLUSIVE * _EXCLUSIVE
* A separate socket will be used on-demand for each transaction. * A separate socket will be used on-demand for each transaction.
*/ */
#define DNS_DISPATCHATTR_PRIVATE 0x00000001U #define DNS_DISPATCHATTR_PRIVATE 0x00000001U
#define DNS_DISPATCHATTR_TCP 0x00000002U #define DNS_DISPATCHATTR_TCP 0x00000002U
@@ -453,7 +453,7 @@ unsigned int
dns_dispatch_getattributes(dns_dispatch_t *disp); dns_dispatch_getattributes(dns_dispatch_t *disp);
/*%< /*%<
* Return the attributes (DNS_DISPATCHATTR_xxx) of this dispatch. Only the * Return the attributes (DNS_DISPATCHATTR_xxx) of this dispatch. Only the
* non-changeable attributes are expected to be referenced by the caller. * non-changeable attributes are expected to be referenced by the caller.
* *
* Requires: * Requires:
*\li disp is valid. *\li disp is valid.

14
lib/dns/request.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2002 Internet Software Consortium. * Copyright (C) 2000-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: request.c,v 1.80 2008/06/23 19:41:19 jinmei Exp $ */ /* $Id: request.c,v 1.81 2008/06/23 23:47:11 tbox Exp $ */
/*! \file */ /*! \file */
@@ -695,7 +695,7 @@ dns_request_createraw3(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf,
REQUIRE(action != NULL); REQUIRE(action != NULL);
REQUIRE(requestp != NULL && *requestp == NULL); REQUIRE(requestp != NULL && *requestp == NULL);
REQUIRE(timeout > 0); REQUIRE(timeout > 0);
if (srcaddr != NULL) if (srcaddr != NULL)
REQUIRE(isc_sockaddr_pf(srcaddr) == isc_sockaddr_pf(destaddr)); REQUIRE(isc_sockaddr_pf(srcaddr) == isc_sockaddr_pf(destaddr));
mctx = requestmgr->mctx; mctx = requestmgr->mctx;
@@ -743,7 +743,7 @@ dns_request_createraw3(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf,
result = DNS_R_FORMERR; result = DNS_R_FORMERR;
goto cleanup; goto cleanup;
} }
if ((options & DNS_REQUESTOPT_TCP) != 0 || r.length > 512) if ((options & DNS_REQUESTOPT_TCP) != 0 || r.length > 512)
tcp = ISC_TRUE; tcp = ISC_TRUE;
@@ -869,7 +869,7 @@ dns_request_createvia2(dns_requestmgr_t *requestmgr, dns_message_t *message,
udpretries, task, action, arg, udpretries, task, action, arg,
requestp)); requestp));
} }
isc_result_t isc_result_t
dns_request_createvia3(dns_requestmgr_t *requestmgr, dns_message_t *message, dns_request_createvia3(dns_requestmgr_t *requestmgr, dns_message_t *message,
isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr,
@@ -895,7 +895,7 @@ dns_request_createvia3(dns_requestmgr_t *requestmgr, dns_message_t *message,
REQUIRE(action != NULL); REQUIRE(action != NULL);
REQUIRE(requestp != NULL && *requestp == NULL); REQUIRE(requestp != NULL && *requestp == NULL);
REQUIRE(timeout > 0); REQUIRE(timeout > 0);
if (srcaddr != NULL) if (srcaddr != NULL)
REQUIRE(isc_sockaddr_pf(srcaddr) == isc_sockaddr_pf(destaddr)); REQUIRE(isc_sockaddr_pf(srcaddr) == isc_sockaddr_pf(destaddr));
mctx = requestmgr->mctx; mctx = requestmgr->mctx;
@@ -1150,7 +1150,7 @@ do_cancel(isc_task_t *task, isc_event_t *event) {
if (!DNS_REQUEST_CANCELED(request)) if (!DNS_REQUEST_CANCELED(request))
req_cancel(request); req_cancel(request);
send_if_done(request, ISC_R_CANCELED); send_if_done(request, ISC_R_CANCELED);
UNLOCK(&request->requestmgr->locks[request->hash]); UNLOCK(&request->requestmgr->locks[request->hash]);
} }
void void

4
lib/isc/Makefile.in
View File

@@ -1,4 +1,4 @@
# Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1998-2003 Internet Software Consortium. # Copyright (C) 1998-2003 Internet Software Consortium.
# #
# Permission to use, copy, modify, and/or distribute this software for any # 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 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.94 2008/06/23 19:41:19 jinmei Exp $ # $Id: Makefile.in,v 1.95 2008/06/23 23:47:11 tbox Exp $
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@

10
lib/isc/include/isc/portset.h
View File

@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: portset.h,v 1.2 2008/06/23 19:41:19 jinmei Exp $ */ /* $Id: portset.h,v 1.3 2008/06/23 23:47:11 tbox Exp $ */
/*! \file isc/portset.h /*! \file isc/portset.h
* \brief Transport Protocol Port Manipuration Module * \brief Transport Protocol Port Manipuration Module
@@ -47,7 +47,7 @@ isc_result_t
isc_portset_create(isc_mem_t *mctx, isc_portset_t **portsetp); isc_portset_create(isc_mem_t *mctx, isc_portset_t **portsetp);
/*%< /*%<
* Create a port set and initialize it as an empty set. * Create a port set and initialize it as an empty set.
* *
* Requires: * Requires:
*\li 'mctx' to be valid. *\li 'mctx' to be valid.
*\li 'portsetp' to be non NULL and '*portsetp' to be NULL; *\li 'portsetp' to be non NULL and '*portsetp' to be NULL;
@@ -61,7 +61,7 @@ void
isc_portset_destroy(isc_mem_t *mctx, isc_portset_t **portsetp); isc_portset_destroy(isc_mem_t *mctx, isc_portset_t **portsetp);
/*%< /*%<
* Destroy a port set. * Destroy a port set.
* *
* Requires: * Requires:
*\li 'mctx' to be valid and must be the same context given when the port set *\li 'mctx' to be valid and must be the same context given when the port set
* was created. * was created.
@@ -72,7 +72,7 @@ isc_boolean_t
isc_portset_isset(isc_portset_t *portset, in_port_t port); isc_portset_isset(isc_portset_t *portset, in_port_t port);
/*%< /*%<
* Test whether the given port is stored in the portset. * Test whether the given port is stored in the portset.
* *
* Requires: * Requires:
*\li 'portset' to be a valid set. *\li 'portset' to be a valid set.
* *
@@ -84,7 +84,7 @@ unsigned int
isc_portset_nports(isc_portset_t *portset); isc_portset_nports(isc_portset_t *portset);
/*%< /*%<
* Provides the number of ports stored in the given portset. * Provides the number of ports stored in the given portset.
* *
* Requires: * Requires:
*\li 'portset' to be a valid set. *\li 'portset' to be a valid set.
* *

4
lib/isc/include/isc/socket.h
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket.h,v 1.75 2008/06/23 19:41:19 jinmei Exp $ */ /* $Id: socket.h,v 1.76 2008/06/23 23:47:11 tbox Exp $ */
#ifndef ISC_SOCKET_H #ifndef ISC_SOCKET_H
#define ISC_SOCKET_H 1 #define ISC_SOCKET_H 1
@@ -396,7 +396,7 @@ isc_socket_close(isc_socket_t *sock);
* \li There must be no other reference to this socket. * \li There must be no other reference to this socket.
* *
* \li There must be no pending I/O requests. * \li There must be no pending I/O requests.
* *
*/ */
isc_result_t isc_result_t

4
lib/isc/include/isc/timer.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2002 Internet Software Consortium. * Copyright (C) 1998-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: timer.h,v 1.39 2008/06/23 19:41:19 jinmei Exp $ */ /* $Id: timer.h,v 1.40 2008/06/23 23:47:11 tbox Exp $ */
#ifndef ISC_TIMER_H #ifndef ISC_TIMER_H
#define ISC_TIMER_H 1 #define ISC_TIMER_H 1

6
lib/isc/timer.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2002 Internet Software Consortium. * Copyright (C) 1998-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: timer.c,v 1.82 2008/06/23 19:41:19 jinmei Exp $ */ /* $Id: timer.c,v 1.83 2008/06/23 23:47:11 tbox Exp $ */
/*! \file */ /*! \file */
@@ -225,7 +225,7 @@ schedule(isc_timer_t *timer, isc_time_t *now, isc_boolean_t signal_ok) {
"*** POKED TIMER ***"); "*** POKED TIMER ***");
} }
} }
if (timer->index == 1 && signal_ok) { if (timer->index == 1 && signal_ok) {
XTRACE(isc_msgcat_get(isc_msgcat, ISC_MSGSET_TIMER, XTRACE(isc_msgcat_get(isc_msgcat, ISC_MSGSET_TIMER,
ISC_MSG_SIGNALSCHED, ISC_MSG_SIGNALSCHED,

8
lib/isc/unix/include/isc/net.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium. * Copyright (C) 1999-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: net.h,v 1.47 2008/06/23 19:41:20 jinmei Exp $ */ /* $Id: net.h,v 1.48 2008/06/23 23:47:11 tbox Exp $ */
#ifndef ISC_NET_H #ifndef ISC_NET_H
#define ISC_NET_H 1 #define ISC_NET_H 1
@@ -104,7 +104,7 @@
/*% /*%
* Required for some pre RFC2133 implementations. * Required for some pre RFC2133 implementations.
* IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT were added in * IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT were added in
* draft-ietf-ipngwg-bsd-api-04.txt or draft-ietf-ipngwg-bsd-api-05.txt. * draft-ietf-ipngwg-bsd-api-04.txt or draft-ietf-ipngwg-bsd-api-05.txt.
* If 's6_addr' is defined then assume that there is a union and three * If 's6_addr' is defined then assume that there is a union and three
* levels otherwise assume two levels required. * levels otherwise assume two levels required.
*/ */
@@ -202,7 +202,7 @@ extern const struct in6_addr isc_net_in6addrloop;
#ifdef ISC_PLATFORM_FIXIN6ISADDR #ifdef ISC_PLATFORM_FIXIN6ISADDR
#undef IN6_IS_ADDR_GEOGRAPHIC #undef IN6_IS_ADDR_GEOGRAPHIC
/*! /*!
* \brief * \brief
* Fix UnixWare 7.1.1's broken IN6_IS_ADDR_* definitions. * Fix UnixWare 7.1.1's broken IN6_IS_ADDR_* definitions.
*/ */

4
lib/isc/unix/net.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium. * Copyright (C) 1999-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: net.c,v 1.37 2008/06/23 19:41:19 jinmei Exp $ */ /* $Id: net.c,v 1.38 2008/06/23 23:47:11 tbox Exp $ */
#include <config.h> #include <config.h>

8
lib/isc/unix/socket.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket.c,v 1.281 2008/06/23 19:41:19 jinmei Exp $ */ /* $Id: socket.c,v 1.282 2008/06/23 23:47:11 tbox Exp $ */
/*! \file */ /*! \file */
@@ -80,7 +80,7 @@
#endif #endif
/*% /*%
* Choose the most preferable multiplex method. * Choose the most preferable multiplex method.
*/ */
#ifdef ISC_PLATFORM_HAVEKQUEUE #ifdef ISC_PLATFORM_HAVEKQUEUE
#define USE_KQUEUE #define USE_KQUEUE
@@ -563,7 +563,7 @@ unwatch_fd(isc_socketmgr_t *manager, int fd, int msg) {
writelen += sizeof(pfds[1]); writelen += sizeof(pfds[1]);
} }
if (write(manager->devpoll_fd, pfds, writelen) == -1) if (write(manager->devpoll_fd, pfds, writelen) == -1)
result = isc__errno2result(errno); result = isc__errno2result(errno);
else { else {
if (msg == SELECT_POKE_READ) if (msg == SELECT_POKE_READ)
@@ -3192,7 +3192,7 @@ setup_watcher(isc_mem_t *mctx, isc_socketmgr_t *manager) {
sizeof(struct kevent) * manager->nevents); sizeof(struct kevent) * manager->nevents);
return (result); return (result);
} }
#ifdef ISC_PLATFORM_USETHREADS #ifdef ISC_PLATFORM_USETHREADS
result = watch_fd(manager, manager->pipe_fds[0], SELECT_POKE_READ); result = watch_fd(manager, manager->pipe_fds[0], SELECT_POKE_READ);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {

4
lib/isc/unix/socket_p.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001 Internet Software Consortium. * Copyright (C) 2000, 2001 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: socket_p.h,v 1.12 2008/06/23 19:41:20 jinmei Exp $ */ /* $Id: socket_p.h,v 1.13 2008/06/23 23:47:11 tbox Exp $ */
#ifndef ISC_SOCKET_P_H #ifndef ISC_SOCKET_P_H
#define ISC_SOCKET_P_H #define ISC_SOCKET_P_H

4
lib/isccfg/namedconf.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: namedconf.c,v 1.88 2008/06/23 19:41:20 jinmei Exp $ */ /* $Id: namedconf.c,v 1.89 2008/06/23 23:47:11 tbox Exp $ */
/*! \file */ /*! \file */
@@ -567,7 +567,7 @@ parse_port(cfg_parser_t *pctx, cfg_obj_t **ret) {
cfg_obj_destroy(pctx, ret); cfg_obj_destroy(pctx, ret);
result = ISC_R_RANGE; result = ISC_R_RANGE;
} }
cleanup: cleanup:
return (result); return (result);
} }