mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-23 10:39:16 +00:00
update copyright notice
This commit is contained in:
parent
133e6d43fa
commit
26d8ffe715
@ -14,7 +14,7 @@
|
|||||||
* PERFORMANCE OF THIS SOFTWARE.
|
* PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id: dnssec-dsfromkey.c,v 1.10 2009/07/19 05:06:48 each Exp $ */
|
/* $Id: dnssec-dsfromkey.c,v 1.11 2009/07/19 23:47:55 tbox Exp $ */
|
||||||
|
|
||||||
/*! \file */
|
/*! \file */
|
||||||
|
|
||||||
@ -67,12 +67,12 @@ initname(char *setname) {
|
|||||||
isc_result_t result;
|
isc_result_t result;
|
||||||
isc_buffer_t buf;
|
isc_buffer_t buf;
|
||||||
|
|
||||||
dns_fixedname_init(&fixed);
|
dns_fixedname_init(&fixed);
|
||||||
name = dns_fixedname_name(&fixed);
|
name = dns_fixedname_name(&fixed);
|
||||||
|
|
||||||
isc_buffer_init(&buf, setname, strlen(setname));
|
isc_buffer_init(&buf, setname, strlen(setname));
|
||||||
isc_buffer_add(&buf, strlen(setname));
|
isc_buffer_add(&buf, strlen(setname));
|
||||||
result = dns_name_fromtext(name, &buf, dns_rootname, ISC_FALSE, NULL);
|
result = dns_name_fromtext(name, &buf, dns_rootname, ISC_FALSE, NULL);
|
||||||
return (result);
|
return (result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -424,7 +424,7 @@ main(int argc, char **argv) {
|
|||||||
if (filename == NULL)
|
if (filename == NULL)
|
||||||
showall = ISC_TRUE;
|
showall = ISC_TRUE;
|
||||||
|
|
||||||
if (argc < isc_commandline_index + 1 && filename == NULL)
|
if (argc < isc_commandline_index + 1 && filename == NULL)
|
||||||
fatal("the key file name was not specified");
|
fatal("the key file name was not specified");
|
||||||
if (argc > isc_commandline_index + 1)
|
if (argc > isc_commandline_index + 1)
|
||||||
fatal("extraneous arguments");
|
fatal("extraneous arguments");
|
||||||
@ -475,9 +475,9 @@ main(int argc, char **argv) {
|
|||||||
|
|
||||||
if (both) {
|
if (both) {
|
||||||
emit(DNS_DSDIGEST_SHA1, showall, lookaside,
|
emit(DNS_DSDIGEST_SHA1, showall, lookaside,
|
||||||
&rdata);
|
&rdata);
|
||||||
emit(DNS_DSDIGEST_SHA256, showall, lookaside,
|
emit(DNS_DSDIGEST_SHA256, showall, lookaside,
|
||||||
&rdata);
|
&rdata);
|
||||||
} else
|
} else
|
||||||
emit(dtype, showall, lookaside, &rdata);
|
emit(dtype, showall, lookaside, &rdata);
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
|
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
|
||||||
[<!ENTITY mdash "—">]>
|
[<!ENTITY mdash "—">]>
|
||||||
<!--
|
<!--
|
||||||
- Copyright (C) 2008 Internet Systems Consortium, Inc. ("ISC")
|
- Copyright (C) 2008, 2009 Internet Systems Consortium, Inc. ("ISC")
|
||||||
-
|
-
|
||||||
- Permission to use, copy, modify, and/or distribute this software for any
|
- Permission to use, copy, modify, and/or distribute this software for any
|
||||||
- purpose with or without fee is hereby granted, provided that the above
|
- purpose with or without fee is hereby granted, provided that the above
|
||||||
@ -17,7 +17,7 @@
|
|||||||
- PERFORMANCE OF THIS SOFTWARE.
|
- PERFORMANCE OF THIS SOFTWARE.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<!-- $Id: dnssec-keyfromlabel.docbook,v 1.7 2009/07/19 04:18:04 each Exp $ -->
|
<!-- $Id: dnssec-keyfromlabel.docbook,v 1.8 2009/07/19 23:47:55 tbox Exp $ -->
|
||||||
<refentry id="man.dnssec-keyfromlabel">
|
<refentry id="man.dnssec-keyfromlabel">
|
||||||
<refentryinfo>
|
<refentryinfo>
|
||||||
<date>February 8, 2008</date>
|
<date>February 8, 2008</date>
|
||||||
@ -37,6 +37,7 @@
|
|||||||
<docinfo>
|
<docinfo>
|
||||||
<copyright>
|
<copyright>
|
||||||
<year>2008</year>
|
<year>2008</year>
|
||||||
|
<year>2009</year>
|
||||||
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
|
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
|
||||||
</copyright>
|
</copyright>
|
||||||
</docinfo>
|
</docinfo>
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id: dnssec-keygen.c,v 1.88 2009/07/19 04:18:04 each Exp $ */
|
/* $Id: dnssec-keygen.c,v 1.89 2009/07/19 23:47:55 tbox Exp $ */
|
||||||
|
|
||||||
/*! \file */
|
/*! \file */
|
||||||
|
|
||||||
@ -317,7 +317,7 @@ main(int argc, char **argv) {
|
|||||||
now, now);
|
now, now);
|
||||||
break;
|
break;
|
||||||
case 'U':
|
case 'U':
|
||||||
unpublish = strtotime(isc_commandline_argument,
|
unpublish = strtotime(isc_commandline_argument,
|
||||||
now, now);
|
now, now);
|
||||||
break;
|
break;
|
||||||
case 'D':
|
case 'D':
|
||||||
|
@ -1,18 +1,18 @@
|
|||||||
.\" Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
|
.\" Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
|
||||||
.\"
|
.\"
|
||||||
.\" Permission to use, copy, modify, and/or distribute this software for any
|
.\" Permission to use, copy, modify, and/or distribute this software for any
|
||||||
.\" purpose with or without fee is hereby granted, provided that the above
|
.\" purpose with or without fee is hereby granted, provided that the above
|
||||||
.\" copyright notice and this permission notice appear in all copies.
|
.\" copyright notice and this permission notice appear in all copies.
|
||||||
.\"
|
.\"
|
||||||
.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
|
.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
|
||||||
.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||||
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
|
.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||||
.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||||
.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
|
.\" 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
|
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||||
.\" PERFORMANCE OF THIS SOFTWARE.
|
.\" PERFORMANCE OF THIS SOFTWARE.
|
||||||
.\"
|
.\"
|
||||||
.\" $Id: dnssec-settime.8,v 1.3 2009/07/19 04:27:55 tbox Exp $
|
.\" $Id: dnssec-settime.8,v 1.4 2009/07/19 23:47:55 tbox Exp $
|
||||||
.\"
|
.\"
|
||||||
.hy 0
|
.hy 0
|
||||||
.ad l
|
.ad l
|
||||||
|
@ -1,19 +1,20 @@
|
|||||||
<!--
|
<!--
|
||||||
- Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
|
- Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
|
||||||
-
|
-
|
||||||
- Permission to use, copy, modify, and/or distribute this software for any
|
- Permission to use, copy, modify, and/or distribute this software for any
|
||||||
- purpose with or without fee is hereby granted, provided that the above
|
- purpose with or without fee is hereby granted, provided that the above
|
||||||
- copyright notice and this permission notice appear in all copies.
|
- copyright notice and this permission notice appear in all copies.
|
||||||
-
|
-
|
||||||
- THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
|
- THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
|
||||||
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||||
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
|
- AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||||
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||||
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
|
- 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
|
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||||
- PERFORMANCE OF THIS SOFTWARE.
|
- PERFORMANCE OF THIS SOFTWARE.
|
||||||
-->
|
-->
|
||||||
<!-- $Id: dnssec-settime.html,v 1.3 2009/07/19 04:27:55 tbox Exp $ -->
|
|
||||||
|
<!-- $Id: dnssec-settime.html,v 1.4 2009/07/19 23:47:55 tbox Exp $ -->
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
|
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
* PERFORMANCE OF THIS SOFTWARE.
|
* PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id: dnssectool.c,v 1.48 2009/07/19 04:18:04 each Exp $ */
|
/* $Id: dnssectool.c,v 1.49 2009/07/19 23:47:55 tbox Exp $ */
|
||||||
|
|
||||||
/*! \file */
|
/*! \file */
|
||||||
|
|
||||||
@ -265,7 +265,7 @@ cleanup_entropy(isc_entropy_t **ectx) {
|
|||||||
isc_entropy_detach(ectx);
|
isc_entropy_detach(ectx);
|
||||||
}
|
}
|
||||||
|
|
||||||
static isc_stdtime_t
|
static isc_stdtime_t
|
||||||
time_units(isc_stdtime_t offset, char suffix, const char *str) {
|
time_units(isc_stdtime_t offset, char suffix, const char *str) {
|
||||||
switch(suffix) {
|
switch(suffix) {
|
||||||
case 'Y': case 'y':
|
case 'Y': case 'y':
|
||||||
|
@ -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) 2001 Internet Software Consortium.
|
* Copyright (C) 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: keycreate.c,v 1.16 2009/07/19 04:18:04 each Exp $ */
|
/* $Id: keycreate.c,v 1.17 2009/07/19 23:47:55 tbox Exp $ */
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
@ -135,7 +135,7 @@ sendquery(isc_task_t *task, isc_event_t *event) {
|
|||||||
isc_region_t r;
|
isc_region_t r;
|
||||||
isc_result_t result;
|
isc_result_t result;
|
||||||
dns_fixedname_t keyname;
|
dns_fixedname_t keyname;
|
||||||
dns_fixedname_t ownername;
|
dns_fixedname_t ownername;
|
||||||
isc_buffer_t namestr, keybuf;
|
isc_buffer_t namestr, keybuf;
|
||||||
unsigned char keydata[9];
|
unsigned char keydata[9];
|
||||||
dns_message_t *query;
|
dns_message_t *query;
|
||||||
|
@ -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) 2001 Internet Software Consortium.
|
* Copyright (C) 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: keydelete.c,v 1.12 2009/07/19 04:18:04 each Exp $ */
|
/* $Id: keydelete.c,v 1.13 2009/07/19 23:47:55 tbox Exp $ */
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
|
# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
|
||||||
# Copyright (C) 2001 Internet Software Consortium.
|
# Copyright (C) 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 @@
|
|||||||
# 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: setup.sh,v 1.9 2009/07/19 04:18:04 each Exp $
|
# $Id: setup.sh,v 1.10 2009/07/19 23:47:55 tbox Exp $
|
||||||
|
|
||||||
RANDFILE=../random.data
|
RANDFILE=../random.data
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
|
# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
|
||||||
# Copyright (C) 2001 Internet Software Consortium.
|
# Copyright (C) 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 @@
|
|||||||
# 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: tests.sh,v 1.8 2009/07/19 04:18:04 each Exp $
|
# $Id: tests.sh,v 1.9 2009/07/19 23:47:55 tbox Exp $
|
||||||
|
|
||||||
SYSTEMTESTTOP=..
|
SYSTEMTESTTOP=..
|
||||||
. $SYSTEMTESTTOP/conf.sh
|
. $SYSTEMTESTTOP/conf.sh
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
* PERFORMANCE OF THIS SOFTWARE.
|
* PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id: db.c,v 1.92 2009/07/19 04:18:05 each Exp $ */
|
/* $Id: db.c,v 1.93 2009/07/19 23:47:55 tbox Exp $ */
|
||||||
|
|
||||||
/*! \file */
|
/*! \file */
|
||||||
|
|
||||||
@ -330,7 +330,7 @@ dns_db_load2(dns_db_t *db, const char *filename, dns_masterformat_t format) {
|
|||||||
|
|
||||||
isc_result_t
|
isc_result_t
|
||||||
dns_db_load3(dns_db_t *db, const char *filename, dns_masterformat_t format,
|
dns_db_load3(dns_db_t *db, const char *filename, dns_masterformat_t format,
|
||||||
unsigned int options) {
|
unsigned int options) {
|
||||||
isc_result_t result, eresult;
|
isc_result_t result, eresult;
|
||||||
dns_rdatacallbacks_t callbacks;
|
dns_rdatacallbacks_t callbacks;
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* $Id: dnssec.c,v 1.97 2009/07/19 04:50:15 each Exp $
|
* $Id: dnssec.c,v 1.98 2009/07/19 23:47:55 tbox Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*! \file */
|
/*! \file */
|
||||||
@ -1049,7 +1049,7 @@ get_hints(dns_dnsseckey_t *key) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Activation date is set (maybe in the future), but
|
* Activation date is set (maybe in the future), but
|
||||||
* publication date isn't. Most likely the user wants to
|
* publication date isn't. Most likely the user wants to
|
||||||
* publish now and activate later.
|
* publish now and activate later.
|
||||||
*/
|
*/
|
||||||
@ -1111,7 +1111,7 @@ dns_dnssec_findmatchingkeys(dns_name_t *origin, const char *directory,
|
|||||||
|
|
||||||
isc_dir_init(&dir);
|
isc_dir_init(&dir);
|
||||||
RETERR(isc_dir_open(&dir, directory));
|
RETERR(isc_dir_open(&dir, directory));
|
||||||
|
|
||||||
while (isc_dir_read(&dir) == ISC_R_SUCCESS) {
|
while (isc_dir_read(&dir) == ISC_R_SUCCESS) {
|
||||||
if (dir.entry.name[0] == 'K' &&
|
if (dir.entry.name[0] == 'K' &&
|
||||||
dir.entry.length > len + 1 &&
|
dir.entry.length > len + 1 &&
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Principal Author: Brian Wellington
|
* Principal Author: Brian Wellington
|
||||||
* $Id: dst_api.c,v 1.23 2009/07/19 04:18:05 each Exp $
|
* $Id: dst_api.c,v 1.24 2009/07/19 23:47:55 tbox Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*! \file */
|
/*! \file */
|
||||||
@ -1207,7 +1207,7 @@ write_public_key(const dst_key_t *key, int type, const char *directory) {
|
|||||||
|
|
||||||
/* Write key information in comments */
|
/* Write key information in comments */
|
||||||
if ((type & DST_TYPE_KEY) == 0) {
|
if ((type & DST_TYPE_KEY) == 0) {
|
||||||
fprintf(fp, "; This is a %s%s-signing key, keyid %d, for ",
|
fprintf(fp, "; This is a %s%s-signing key, keyid %d, for ",
|
||||||
(key->key_flags & DNS_KEYFLAG_REVOKE) != 0 ?
|
(key->key_flags & DNS_KEYFLAG_REVOKE) != 0 ?
|
||||||
"revoked " :
|
"revoked " :
|
||||||
"",
|
"",
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
/*%
|
/*%
|
||||||
* Principal Author: Brian Wellington
|
* Principal Author: Brian Wellington
|
||||||
* $Id: dst_parse.c,v 1.18 2009/07/19 04:18:05 each Exp $
|
* $Id: dst_parse.c,v 1.19 2009/07/19 23:47:55 tbox Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
@ -138,7 +138,7 @@ find_metadata(const char *s) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (-1);
|
return (-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *
|
static const char *
|
||||||
find_tag(const int value) {
|
find_tag(const int value) {
|
||||||
@ -419,7 +419,7 @@ dst__privstruct_parse(dst_key_t *key, unsigned int alg, isc_lex_t *lex,
|
|||||||
tag = find_metadata(DST_AS_STR(token));
|
tag = find_metadata(DST_AS_STR(token));
|
||||||
if (tag >= 0) {
|
if (tag >= 0) {
|
||||||
INSIST(tag < METADATA_NTAGS);
|
INSIST(tag < METADATA_NTAGS);
|
||||||
|
|
||||||
NEXTTOKEN(lex, opt, &token);
|
NEXTTOKEN(lex, opt, &token);
|
||||||
if (token.type != isc_tokentype_string) {
|
if (token.type != isc_tokentype_string) {
|
||||||
ret = DST_R_INVALIDPRIVATEKEY;
|
ret = DST_R_INVALIDPRIVATEKEY;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Portions Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
|
* Portions Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
|
||||||
* Portions Copyright (C) 2000-2002 Internet Software Consortium.
|
* Portions 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
|
||||||
@ -29,7 +29,7 @@
|
|||||||
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id: dst_parse.h,v 1.12 2009/07/19 04:18:05 each Exp $ */
|
/* $Id: dst_parse.h,v 1.13 2009/07/19 23:47:55 tbox Exp $ */
|
||||||
|
|
||||||
/*! \file */
|
/*! \file */
|
||||||
#ifndef DST_DST_PARSE_H
|
#ifndef DST_DST_PARSE_H
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
* PERFORMANCE OF THIS SOFTWARE.
|
* PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* $Id: db.h,v 1.99 2009/07/19 04:18:05 each Exp $ */
|
/* $Id: db.h,v 1.100 2009/07/19 23:47:55 tbox Exp $ */
|
||||||
|
|
||||||
#ifndef DNS_DB_H
|
#ifndef DNS_DB_H
|
||||||
#define DNS_DB_H 1
|
#define DNS_DB_H 1
|
||||||
@ -496,7 +496,7 @@ dns_db_load2(dns_db_t *db, const char *filename, dns_masterformat_t format);
|
|||||||
|
|
||||||
isc_result_t
|
isc_result_t
|
||||||
dns_db_load3(dns_db_t *db, const char *filename, dns_masterformat_t format,
|
dns_db_load3(dns_db_t *db, const char *filename, dns_masterformat_t format,
|
||||||
unsigned int options);
|
unsigned int options);
|
||||||
/*%<
|
/*%<
|
||||||
* Load master file 'filename' into 'db'.
|
* Load master file 'filename' into 'db'.
|
||||||
*
|
*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user