upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-08 20:22:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

update copyright notice

Browse source
This commit is contained in:
Automatic Updater 2008-04-03 06:09:05 +00:00
parent ca904804e4
commit ddad355529
21 changed files with 137 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/dig/include/dig/dig.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) 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: dig.h,v 1.106 2008/04/03 02:01:08 marka Exp $ */
/* $Id: dig.h,v 1.107 2008/04/03 06:09:04 tbox Exp $ */
#ifndef DIG_H
#define DIG_H

4
bin/named/client.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: client.c,v 1.256 2008/04/03 05:55:51 marka Exp $ */
/* $Id: client.c,v 1.257 2008/04/03 06:09:04 tbox Exp $ */
#include <config.h>
@ -1776,7 +1776,7 @@ client_request(isc_task_t *task, isc_event_t *event) {
dns_generalstats_increment(ns_g_server->nsstats,
dns_nsstatscounter_sig0in);
}
}
if (result == ISC_R_SUCCESS) {
ns_client_log(client, DNS_LOGCATEGORY_SECURITY,

6
bin/named/server.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.505 2008/04/03 05:55:51 marka Exp $ */
/* $Id: server.c,v 1.506 2008/04/03 06:09:04 tbox Exp $ */
/*! \file */
@ -1376,7 +1376,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
if (resquerystats == NULL)
CHECK(dns_rdatatypestats_create(mctx, &resquerystats));
dns_view_setresquerystats(view, resquerystats);
/*
* Set the ADB cache size to 1/8th of the max-cache-size.
*/
@ -3877,7 +3877,7 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) {
dns_nsstatscounter_max),
"dns_stats_create (server)");
CHECKFATAL(dns_rdatatypestats_create(ns_g_mctx,
CHECKFATAL(dns_rdatatypestats_create(ns_g_mctx,
&server->rcvquerystats),
"dns_stats_create (rcvquery)");

10
bin/named/statschannel.c
View file

@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: statschannel.c,v 1.7 2008/04/03 05:55:51 marka Exp $ */
/* $Id: statschannel.c,v 1.8 2008/04/03 06:09:04 tbox Exp $ */
/*! \file */
@ -80,7 +80,7 @@ generalstat_dump(dns_statscounter_t counter, isc_uint64_t val, void *arg) {
switch (dumparg->type) {
case statsformat_file:
fp = dumparg->arg;
fp = dumparg->arg;
fprintf(fp, "%20" ISC_PRINT_QUADFORMAT "u %s\n", val,
dumparg->desc[counter]);
break;
@ -888,9 +888,9 @@ static const char *resstats_desc[] = {
"truncated responses received", /* dns_resstatscounter_truncated */
"lame delegations received", /* dns_resstatscounter_lame */
"query retries", /* dns_resstatscounter_retry */
"IPv4 NS address fetches", /* dns_resstatscounter_gluefetchv4 */
"IPv6 NS address fetches", /* dns_resstatscounter_gluefetchv6 */
"IPv4 NS address fetch failed", /* dns_resstatscounter_gluefetchv4fail */
"IPv4 NS address fetches", /* dns_resstatscounter_gluefetchv4 */
"IPv6 NS address fetches", /* dns_resstatscounter_gluefetchv6 */
"IPv4 NS address fetch failed", /* dns_resstatscounter_gluefetchv4fail */
"IPv6 NS address fetch failed", /* dns_resstatscounter_gluefetchv6fail */
"DNSSEC validation attempted", /* dns_resstatscounter_val */
"DNSSEC validation failed", /* dns_resstatscounter_valfail */

58
bin/named/xfrout.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) 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: xfrout.c,v 1.127 2008/04/03 05:55:51 marka Exp $ */
/* $Id: xfrout.c,v 1.128 2008/04/03 06:09:04 tbox Exp $ */
#include <config.h>
@ -52,7 +52,7 @@
#include <named/server.h>
#include <named/xfrout.h>
/*! \file
/*! \file
* \brief
* Outgoing AXFR and IXFR.
*/
@ -87,7 +87,7 @@
ns_client_log(client, DNS_LOGCATEGORY_XFER_OUT, \
NS_LOGMODULE_XFER_OUT, ISC_LOG_INFO, \
"bad zone transfer request: %s (%s)", \
msg, isc_result_totext(code)); \
msg, isc_result_totext(code)); \
if (result != ISC_R_SUCCESS) goto failure; \
} while (0)
@ -101,12 +101,12 @@
ns_client_log(client, DNS_LOGCATEGORY_XFER_OUT, \
NS_LOGMODULE_XFER_OUT, ISC_LOG_INFO, \
"bad zone transfer request: '%s/%s': %s (%s)", \
_buf1, _buf2, msg, isc_result_totext(code)); \
_buf1, _buf2, msg, isc_result_totext(code)); \
if (result != ISC_R_SUCCESS) goto failure; \
} while (0)
#define CHECK(op) \
do { result = (op); \
do { result = (op); \
if (result != ISC_R_SUCCESS) goto failure; \
} while (0)
@ -122,12 +122,12 @@ typedef struct db_rr_iterator db_rr_iterator_t;
struct db_rr_iterator {
isc_result_t result;
dns_db_t *db;
dns_dbiterator_t *dbit;
dns_dbiterator_t *dbit;
dns_dbversion_t *ver;
isc_stdtime_t now;
dns_dbnode_t *node;
dns_fixedname_t fixedname;
dns_rdatasetiter_t *rdatasetit;
dns_rdatasetiter_t *rdatasetit;
dns_rdataset_t rdataset;
dns_rdata_t rdata;
};
@ -337,7 +337,7 @@ log_rr(dns_name_t *name, dns_rdata_t *rdata, isc_uint32_t ttl) {
INSIST(buf.used >= 1 &&
((char *) buf.base)[buf.used - 1] == '\n');
buf.used--;
isc_log_write(XFROUT_RR_LOGARGS, "%.*s",
(int)isc_buffer_usedlength(&buf),
(char *)isc_buffer_base(&buf));
@ -981,7 +981,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
/*
* Normal zone table does not have a match. Try the DLZ database
*/
if (client->view->dlzdatabase != NULL) {
if (client->view->dlzdatabase != NULL) {
result = dns_dlzallowzonexfr(client->view,
question_name, &client->peeraddr,
&db);
@ -1018,7 +1018,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
} else {
/*
* not DLZ and not in normal zone table, we are
* not DLZ and not in normal zone table, we are
* not authoritative
*/
FAILQ(DNS_R_NOTAUTH, "non-authoritative zone",
@ -1222,28 +1222,28 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
#ifdef DLZ
if (is_dlz)
CHECK(xfrout_ctx_create(mctx, client, request->id, question_name,
reqtype, question_class, zone, db, ver,
CHECK(xfrout_ctx_create(mctx, client, request->id, question_name,
reqtype, question_class, zone, db, ver,
quota, stream,
dns_message_gettsigkey(request),
tsigbuf,
3600,
3600,
(format == dns_many_answers) ?
ISC_TRUE : ISC_FALSE,
&xfr));
else
tsigbuf,
3600,
3600,
(format == dns_many_answers) ?
ISC_TRUE : ISC_FALSE,
&xfr));
else
#endif
CHECK(xfrout_ctx_create(mctx, client, request->id, question_name,
reqtype, question_class, zone, db, ver,
CHECK(xfrout_ctx_create(mctx, client, request->id, question_name,
reqtype, question_class, zone, db, ver,
quota, stream,
dns_message_gettsigkey(request),
tsigbuf,
dns_zone_getmaxxfrout(zone),
dns_zone_getidleout(zone),
(format == dns_many_answers) ?
ISC_TRUE : ISC_FALSE,
&xfr));
tsigbuf,
dns_zone_getmaxxfrout(zone),
dns_zone_getidleout(zone),
(format == dns_many_answers) ?
ISC_TRUE : ISC_FALSE,
&xfr));
xfr->mnemonic = mnemonic;
stream = NULL;
@ -1681,7 +1681,7 @@ sendstream(xfrout_ctx_t *xfr) {
* iterators before returning from the event handler.
*/
xfr->stream->methods->pause(xfr->stream);
if (result == ISC_R_SUCCESS)
return;

6
lib/dns/adb.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: adb.c,v 1.237 2008/04/03 05:55:51 marka Exp $ */
/* $Id: adb.c,v 1.238 2008/04/03 06:09:04 tbox Exp $ */
/*! \file
*
@ -3544,10 +3544,10 @@ fetch_name(dns_adbname_t *adbname,
if (result != ISC_R_SUCCESS)
goto cleanup;
if (type == dns_rdatatype_a) {
if (type == dns_rdatatype_a) {
adbname->fetch_a = fetch;
inc_stats(adb, dns_resstatscounter_gluefetchv4);
} else {
} else {
adbname->fetch_aaaa = fetch;
inc_stats(adb, dns_resstatscounter_gluefetchv6);
}

4
lib/dns/dispatch.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) 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.c,v 1.139 2008/04/03 05:55:52 marka Exp $ */
/* $Id: dispatch.c,v 1.140 2008/04/03 06:09:04 tbox Exp $ */
/*! \file */

4
lib/dns/gssapi_link.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.
*
* Permission to use, copy, modify, and/or distribute this software for any
@ -16,7 +16,7 @@
*/
/*
* $Id: gssapi_link.c,v 1.9 2008/04/03 02:09:18 marka Exp $
* $Id: gssapi_link.c,v 1.10 2008/04/03 06:09:04 tbox Exp $
*/
#include <config.h>

6
lib/dns/gssapictx.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: gssapictx.c,v 1.11 2008/04/03 00:45:23 marka Exp $ */
/* $Id: gssapictx.c,v 1.12 2008/04/03 06:09:04 tbox Exp $ */
#include <config.h>
@ -546,7 +546,7 @@ dst_gssapi_acceptctx(gss_cred_id_t cred,
isc_region_t r;
isc_buffer_t namebuf;
gss_buffer_desc gnamebuf = GSS_C_EMPTY_BUFFER, gintoken,
gouttoken = GSS_C_EMPTY_BUFFER;
gouttoken = GSS_C_EMPTY_BUFFER;
OM_uint32 gret, minor;
gss_ctx_id_t context = GSS_C_NO_CONTEXT;
gss_name_t gname = NULL;
@ -696,7 +696,7 @@ gss_error_tostring(isc_uint32_t major, isc_uint32_t minor,
char *buf, size_t buflen) {
#ifdef GSSAPI
gss_buffer_desc msg_minor = GSS_C_EMPTY_BUFFER,
msg_major = GSS_C_EMPTY_BUFFER;
msg_major = GSS_C_EMPTY_BUFFER;
OM_uint32 msg_ctx, minor_stat;
/* Handle major status */

12
lib/dns/include/dns/adb.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) 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: adb.h,v 1.84 2008/04/03 05:55:52 marka Exp $ */
/* $Id: adb.h,v 1.85 2008/04/03 06:09:04 tbox Exp $ */
#ifndef DNS_ADB_H
#define DNS_ADB_H 1
@ -99,7 +99,7 @@ ISC_LANG_BEGINDECLS
typedef struct dns_adbname dns_adbname_t;
/*!
/*!
*\brief
* Represents a lookup for a single name.
*
@ -220,7 +220,7 @@ struct dns_adbaddrinfo {
ISC_LINK(dns_adbaddrinfo_t) publink;
};
/*!<
/*!<
* The event sent to the caller task is just a plain old isc_event_t. It
* contains no data other than a simple status, passed in the "type" field
* to indicate that another address resolved, or all partially resolved
@ -520,7 +520,7 @@ void
dns_adb_adjustsrtt(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
unsigned int rtt, unsigned int factor);
/*%<
* Mix the round trip time into the existing smoothed rtt.
* Mix the round trip time into the existing smoothed rtt.
* The formula used
* (where srtt is the existing rtt value, and rtt and factor are arguments to
@ -623,7 +623,7 @@ void
dns_adb_flushname(dns_adb_t *adb, dns_name_t *name);
/*%<
* Flush 'name' from the adb cache.
*
*
* Requires:
*\li 'adb' is valid.
*\li 'name' is valid.

14
lib/dns/include/dns/dispatch.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) 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.57 2008/04/03 05:55:52 marka Exp $ */
/* $Id: dispatch.h,v 1.58 2008/04/03 06:09:04 tbox Exp $ */
#ifndef DNS_DISPATCH_H
#define DNS_DISPATCH_H 1
@ -187,7 +187,7 @@ dns_dispatchmgr_getblackhole(dns_dispatchmgr_t *mgr);
void
dns_dispatchmgr_setblackportlist(dns_dispatchmgr_t *mgr,
dns_portlist_t *portlist);
dns_portlist_t *portlist);
/*%<
* Sets a list of UDP ports that won't be used when creating a udp
* dispatch with a wildcard port.
@ -380,7 +380,7 @@ dns_dispatch_removeresponse(dns_dispentry_t **resp,
*\li "resp" != NULL and "*resp" contain a value previously allocated
* by dns_dispatch_addresponse();
*
*\li May only be called from within the task given as the 'task'
*\li May only be called from within the task given as the 'task'
* argument to dns_dispatch_addresponse() when allocating '*resp'.
*/
@ -397,7 +397,7 @@ dns_dispatch_getsocket(dns_dispatch_t *disp);
*\li The socket the dispatcher is using.
*/
isc_result_t
isc_result_t
dns_dispatch_getlocaladdress(dns_dispatch_t *disp, isc_sockaddr_t *addrp);
/*%<
* Return the local address for this dispatch.
@ -408,7 +408,7 @@ dns_dispatch_getlocaladdress(dns_dispatch_t *disp, isc_sockaddr_t *addrp);
*\li addrp to be non null.
*
* Returns:
*\li ISC_R_SUCCESS
*\li ISC_R_SUCCESS
*\li ISC_R_NOTIMPLEMENTED
*/
@ -434,7 +434,7 @@ dns_dispatch_changeattributes(dns_dispatch_t *disp,
* new = (old & ~mask) | (attributes & mask)
* \endcode
*
* This function has a side effect when #DNS_DISPATCHATTR_NOLISTEN changes.
* This function has a side effect when #DNS_DISPATCHATTR_NOLISTEN changes.
* When the flag becomes off, the dispatch will start receiving on the
* corresponding socket. When the flag becomes on, receive events on the
* corresponding socket will be canceled.

4
lib/dns/include/dns/message.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) 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: message.h,v 1.124 2008/04/03 02:01:08 marka Exp $ */
/* $Id: message.h,v 1.125 2008/04/03 06:09:04 tbox Exp $ */
#ifndef DNS_MESSAGE_H
#define DNS_MESSAGE_H 1

4
lib/dns/include/dns/peer.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) 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.h,v 1.32 2008/04/03 02:01:08 marka Exp $ */
/* $Id: peer.h,v 1.33 2008/04/03 06:09:05 tbox Exp $ */
#ifndef DNS_PEER_H
#define DNS_PEER_H 1

4
lib/dns/include/dns/rdatalist.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) 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: rdatalist.h,v 1.21 2008/04/03 02:01:08 marka Exp $ */
/* $Id: rdatalist.h,v 1.22 2008/04/03 06:09:05 tbox Exp $ */
#ifndef DNS_RDATALIST_H
#define DNS_RDATALIST_H 1

4
lib/dns/include/dns/resolver.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) 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: resolver.h,v 1.57 2008/04/03 02:01:08 marka Exp $ */
/* $Id: resolver.h,v 1.58 2008/04/03 06:09:05 tbox Exp $ */
#ifndef DNS_RESOLVER_H
#define DNS_RESOLVER_H 1

6
lib/dns/include/dns/stats.h
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: stats.h,v 1.16 2008/04/03 05:55:52 marka Exp $ */
/* $Id: stats.h,v 1.17 2008/04/03 06:09:05 tbox Exp $ */
#ifndef DNS_STATS_H
#define DNS_STATS_H 1
@ -75,7 +75,7 @@ enum {
dns_zonestatscounter_max = 13,
/*%
* Query statistics counters (obsolete).
* Query statistics counters (obsolete).
*/
dns_statscounter_success = 0, /*%< Successful lookup */
dns_statscounter_referral = 1, /*%< Referral result */
@ -222,7 +222,7 @@ dns_stats_detach(dns_stats_t **statsp);
void
dns_generalstats_increment(dns_stats_t *stats, dns_statscounter_t counter);
/*%<
* Increment the counter-th counter of stats.
* Increment the counter-th counter of stats.
*
* Requires:
*\li 'stats' is a valid dns_stats_t created by dns_generalstats_create().

8
lib/dns/include/dns/view.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) 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: view.h,v 1.109 2008/04/03 05:55:52 marka Exp $ */
/* $Id: view.h,v 1.110 2008/04/03 06:09:05 tbox Exp $ */
#ifndef DNS_VIEW_H
#define DNS_VIEW_H 1
@ -843,7 +843,7 @@ dns_view_getresstats(dns_view_t *view, dns_stats_t **statsp);
* Requires:
* \li 'view' is valid and is not frozen.
*
*\li 'statsp' != NULL && '*statsp' != NULL
*\li 'statsp' != NULL && '*statsp' != NULL
*/
void
@ -869,7 +869,7 @@ dns_view_getresquerystats(dns_view_t *view, dns_stats_t **statsp);
* Requires:
* \li 'view' is valid and is not frozen.
*
*\li 'statsp' != NULL && '*statsp' != NULL
*\li 'statsp' != NULL && '*statsp' != NULL
*/
#endif /* DNS_VIEW_H */

4
lib/dns/peer.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, 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.30 2008/04/03 02:01:08 marka Exp $ */
/* $Id: peer.c,v 1.31 2008/04/03 06:09:04 tbox Exp $ */
/*! \file */

4
lib/dns/rdatalist.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-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: rdatalist.c,v 1.34 2008/04/03 02:01:08 marka Exp $ */
/* $Id: rdatalist.c,v 1.35 2008/04/03 06:09:04 tbox Exp $ */
/*! \file */

100
lib/dns/spnego.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2006, 2007 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2006-2008 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: spnego.c,v 1.7 2008/04/03 02:09:18 marka Exp $ */
/* $Id: spnego.c,v 1.8 2008/04/03 06:09:04 tbox Exp $ */
/*! \file
* \brief
@ -59,21 +59,21 @@
* Copyright (c) 2004 Masarykova universita
* (Masaryk University, Brno, Czech Republic)
* All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
*
* 3. Neither the name of the University nor the names of its contributors may
* be used to endorse or promote products derived from this software
* without specific prior written permission.
*
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@ -89,35 +89,35 @@
* ----------------------------------------------------------------
*
* Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
@ -236,31 +236,31 @@ enum {
#define ASN1_INDEFINITE 0xdce0deed
static int
static int
der_get_length(const unsigned char *p, size_t len,
size_t * val, size_t * size);
static int
static int
der_get_octet_string(const unsigned char *p, size_t len,
octet_string * data, size_t * size);
static int
static int
der_get_oid(const unsigned char *p, size_t len,
oid * data, size_t * size);
static int
static int
der_get_tag(const unsigned char *p, size_t len,
Der_class * class, Der_type * type,
int *tag, size_t * size);
static int
static int
der_match_tag(const unsigned char *p, size_t len,
Der_class class, Der_type type,
int tag, size_t * size);
static int
static int
der_match_tag_and_length(const unsigned char *p, size_t len,
Der_class class, Der_type type, int tag,
size_t * length_ret, size_t * size);
static int
static int
decode_oid(const unsigned char *p, size_t len,
oid * k, size_t * size);
@ -277,27 +277,27 @@ der_put_int(unsigned char *p, size_t len, int val, size_t *);
static int
der_put_length(unsigned char *p, size_t len, size_t val, size_t *);
static int
static int
der_put_octet_string(unsigned char *p, size_t len,
const octet_string * data, size_t *);
static int
static int
der_put_oid(unsigned char *p, size_t len,
const oid * data, size_t * size);
static int
static int
der_put_tag(unsigned char *p, size_t len, Der_class class, Der_type type,
int tag, size_t *);
static int
static int
der_put_length_and_tag(unsigned char *, size_t, size_t,
Der_class, Der_type, int, size_t *);
static int
static int
encode_enumerated(unsigned char *p, size_t len,
const unsigned *data, size_t *);
static int
static int
encode_octet_string(unsigned char *p, size_t len,
const octet_string * k, size_t *);
static int
static int
encode_oid(unsigned char *p, size_t len,
const oid * k, size_t *);
@ -1471,7 +1471,7 @@ gssapi_krb5_get_mech(const u_char *ptr,
return (mech_len);
}
static OM_uint32
static OM_uint32
spnego_initial(OM_uint32 *minor_status,
const gss_cred_id_t initiator_cred_handle,
gss_ctx_id_t *context_handle,
@ -1585,7 +1585,7 @@ spnego_initial(OM_uint32 *minor_status,
end:
if (token_init.mechToken != NULL) {
free(token_init.mechToken);
free(token_init.mechToken);
token_init.mechToken = NULL;
}
free_NegTokenInit(&token_init);
@ -1632,7 +1632,7 @@ spnego_reply(OM_uint32 *minor_status,
* SPNEGO doesn't include gss wrapping on SubsequentContextToken
* like the Kerberos 5 mech does. But lets check for it anyway.
*/
mech_len = gssapi_krb5_get_mech(input_token->value,
input_token->length,
&p);
@ -1687,7 +1687,7 @@ spnego_reply(OM_uint32 *minor_status,
free_NegTokenResp(&resp);
return (GSS_S_BAD_MECH);
}
ret = der_put_oid(oidbuf + sizeof(oidbuf) - 1,
sizeof(oidbuf),
resp.supportedMech,
@ -1740,7 +1740,7 @@ spnego_reply(OM_uint32 *minor_status,
OM_uint32
OM_uint32
gss_init_sec_context_spnego(OM_uint32 *minor_status,
const gss_cred_id_t initiator_cred_handle,
gss_ctx_id_t *context_handle,

8
lib/dns/stats.c
View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: stats.c,v 1.15 2008/04/03 05:55:52 marka Exp $ */
/* $Id: stats.c,v 1.16 2008/04/03 06:09:04 tbox Exp $ */
/*! \file */
@ -112,7 +112,7 @@ struct dns_stats {
* XXX: this approach is weird for non-threaded build because the
* additional memory and the copy overhead could be avoided. We prefer
* simplicity here, however, under the assumption that this function
* should be only rarely called.
* should be only rarely called.
*/
isc_uint64_t *copiedcounters;
};
@ -129,7 +129,7 @@ create_stats(isc_mem_t *mctx, dns_statstype_t type, int ncounters,
stats = isc_mem_get(mctx, sizeof(*stats));
if (stats == NULL)
return (ISC_R_NOMEMORY);
result = isc_mutex_init(&stats->lock);
if (result != ISC_R_SUCCESS)
goto clean_stats;
@ -287,7 +287,7 @@ decrementcounter(dns_stats_t *stats, int counter) {
static void
copy_counters(dns_stats_t *stats) {
int i;
#ifdef ISC_RWLOCK_USEATOMIC
/*
* We use a "write" lock before "reading" the statistics counters as