update copyright notice
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: server.c,v 1.520.12.14 2010/05/14 03:31:06 marka Exp $ */
|
||||
/* $Id: server.c,v 1.520.12.15 2010/05/14 23:47:48 tbox Exp $ */
|
||||
|
||||
/*! \file */
|
||||
|
||||
@@ -228,7 +228,7 @@ static const struct {
|
||||
{ "8.B.D.0.1.0.0.2.IP6.ARPA", ISC_FALSE },
|
||||
|
||||
/* ORCHID Prefix, RFC 4843. */
|
||||
{ "0.1.1.0.0.2.IP6.ARPA", ISC_FALSE },
|
||||
{ "0.1.1.0.0.2.IP6.ARPA", ISC_FALSE },
|
||||
|
||||
{ NULL, ISC_FALSE }
|
||||
};
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
|
||||
* Copyright (C) 2004-2010 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: ncache.h,v 1.25.48.3 2010/05/14 00:33:23 marka Exp $ */
|
||||
/* $Id: ncache.h,v 1.25.48.4 2010/05/14 23:47:50 tbox Exp $ */
|
||||
|
||||
#ifndef DNS_NCACHE_H
|
||||
#define DNS_NCACHE_H 1
|
||||
@@ -163,7 +163,7 @@ dns_ncache_getrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name,
|
||||
|
||||
isc_result_t
|
||||
dns_ncache_getsigrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name,
|
||||
dns_rdatatype_t covers, dns_rdataset_t *rdataset);
|
||||
dns_rdatatype_t covers, dns_rdataset_t *rdataset);
|
||||
/*%<
|
||||
* Similar to dns_ncache_getrdataset() but get the rrsig that matches.
|
||||
*/
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
|
||||
* Copyright (C) 2004-2010 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: types.h,v 1.130.50.6 2010/05/14 00:33:23 marka Exp $ */
|
||||
/* $Id: types.h,v 1.130.50.7 2010/05/14 23:47:50 tbox Exp $ */
|
||||
|
||||
#ifndef DNS_TYPES_H
|
||||
#define DNS_TYPES_H 1
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: ncache.c,v 1.43.48.3 2010/05/14 00:33:23 marka Exp $ */
|
||||
/* $Id: ncache.c,v 1.43.48.4 2010/05/14 23:47:50 tbox Exp $ */
|
||||
|
||||
/*! \file */
|
||||
|
||||
@@ -610,7 +610,7 @@ dns_ncache_getrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name,
|
||||
|
||||
isc_result_t
|
||||
dns_ncache_getsigrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name,
|
||||
dns_rdatatype_t covers, dns_rdataset_t *rdataset)
|
||||
dns_rdatatype_t covers, dns_rdataset_t *rdataset)
|
||||
{
|
||||
dns_name_t tname;
|
||||
dns_rdata_rrsig_t rrsig;
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: validator.c,v 1.164.12.19 2010/05/14 00:33:23 marka Exp $ */
|
||||
/* $Id: validator.c,v 1.164.12.20 2010/05/14 23:47:50 tbox Exp $ */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
@@ -716,7 +716,7 @@ dsvalidated(isc_task_t *task, isc_event_t *event) {
|
||||
} else if (val->view->dlv == NULL || DLVTRIED(val)) {
|
||||
markanswer(val, "dsvalidated");
|
||||
result = ISC_R_SUCCESS;;
|
||||
} else
|
||||
} else
|
||||
result = startfinddlvsep(val, name);
|
||||
} else if ((val->attributes & VALATTR_INSECURITY) != 0) {
|
||||
result = proveunsecure(val, have_dsset, ISC_TRUE);
|
||||
@@ -1647,7 +1647,7 @@ get_key(dns_validator_t *val, dns_rdata_rrsig_t *siginfo) {
|
||||
*/
|
||||
val->keyset = &val->frdataset;
|
||||
if ((DNS_TRUST_PENDING(val->frdataset.trust) ||
|
||||
DNS_TRUST_ANSWER(val->frdataset.trust)) &&
|
||||
DNS_TRUST_ANSWER(val->frdataset.trust)) &&
|
||||
dns_rdataset_isassociated(&val->fsigrdataset))
|
||||
{
|
||||
/*
|
||||
@@ -2547,7 +2547,7 @@ start_positive_validation(dns_validator_t *val) {
|
||||
|
||||
/*%
|
||||
* val_rdataset_first and val_rdataset_next provide iteration methods
|
||||
* that hide whether we are iterating across a message or a negative
|
||||
* that hide whether we are iterating across a message or a negative
|
||||
* cache rdataset.
|
||||
*/
|
||||
static isc_result_t
|
||||
@@ -2585,7 +2585,7 @@ val_rdataset_first(dns_validator_t *val, dns_name_t **namep,
|
||||
|
||||
static isc_result_t
|
||||
val_rdataset_next(dns_validator_t *val, dns_name_t **namep,
|
||||
dns_rdataset_t **rdatasetp)
|
||||
dns_rdataset_t **rdatasetp)
|
||||
{
|
||||
dns_message_t *message = val->event->message;
|
||||
isc_result_t result = ISC_R_SUCCESS;
|
||||
@@ -2612,7 +2612,7 @@ val_rdataset_next(dns_validator_t *val, dns_name_t **namep,
|
||||
} else {
|
||||
dns_rdataset_disassociate(*rdatasetp);
|
||||
result = dns_rdataset_next(val->event->rdataset);
|
||||
if (result == ISC_R_SUCCESS)
|
||||
if (result == ISC_R_SUCCESS)
|
||||
dns_ncache_current(val->event->rdataset, *namep,
|
||||
*rdatasetp);
|
||||
}
|
||||
@@ -2968,7 +2968,7 @@ validate_ncache(dns_validator_t *val, isc_boolean_t resume) {
|
||||
|
||||
if (val->frdataset.type == dns_rdatatype_rrsig)
|
||||
continue;
|
||||
|
||||
|
||||
result = dns_ncache_getsigrdataset(val->event->rdataset, name,
|
||||
rdataset->type,
|
||||
&val->fsigrdataset);
|
||||
@@ -3034,8 +3034,8 @@ nsecvalidate(dns_validator_t *val, isc_boolean_t resume) {
|
||||
|
||||
if (resume)
|
||||
validator_log(val, ISC_LOG_DEBUG(3), "resuming nsecvalidate");
|
||||
|
||||
if (val->event->message == NULL)
|
||||
|
||||
if (val->event->message == NULL)
|
||||
result = validate_ncache(val, resume);
|
||||
else
|
||||
result = validate_authority(val, resume);
|
||||
@@ -3589,17 +3589,17 @@ proveunsecure(dns_validator_t *val, isc_boolean_t have_ds, isc_boolean_t resume)
|
||||
* There is no DS. If this is a delegation,
|
||||
* we maybe done.
|
||||
*/
|
||||
/*
|
||||
* If we have "trust == answer" then this namespace
|
||||
* has switched from insecure to should be secure.
|
||||
*/
|
||||
if (DNS_TRUST_PENDING(val->frdataset.trust) ||
|
||||
DNS_TRUST_ANSWER(val->frdataset.trust)) {
|
||||
result = create_validator(val, tname,
|
||||
dns_rdatatype_ds,
|
||||
&val->frdataset,
|
||||
NULL, dsvalidated,
|
||||
"proveunsecure");
|
||||
/*
|
||||
* If we have "trust == answer" then this namespace
|
||||
* has switched from insecure to should be secure.
|
||||
*/
|
||||
if (DNS_TRUST_PENDING(val->frdataset.trust) ||
|
||||
DNS_TRUST_ANSWER(val->frdataset.trust)) {
|
||||
result = create_validator(val, tname,
|
||||
dns_rdatatype_ds,
|
||||
&val->frdataset,
|
||||
NULL, dsvalidated,
|
||||
"proveunsecure");
|
||||
if (result != ISC_R_SUCCESS)
|
||||
goto out;
|
||||
return (DNS_R_WAIT);
|
||||
|
||||
Reference in New Issue
Block a user