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
2009-06-10 23:47:47 +00:00
parent 18ad4708eb
commit b6306ef56e
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/named/server.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: server.c,v 1.533 2009/06/10 00:27:21 each Exp $ */ /* $Id: server.c,v 1.534 2009/06/10 23:47:47 tbox Exp $ */
/*! \file */ /*! \file */
@@ -3272,7 +3272,7 @@ generate_session_key(const char *filename, const char *keynamestr,
/* /*
* Dump the key to the buffer for later use. Should be done before * Dump the key to the buffer for later use. Should be done before
* we transfer the ownership of key to tsigkey. * we transfer the ownership of key to tsigkey.
*/ */
isc_buffer_init(&key_rawbuffer, &key_rawsecret, sizeof(key_rawsecret)); isc_buffer_init(&key_rawbuffer, &key_rawsecret, sizeof(key_rawsecret));
CHECK(dst_key_tobuffer(key, &key_rawbuffer)); CHECK(dst_key_tobuffer(key, &key_rawbuffer));
@@ -3306,8 +3306,8 @@ generate_session_key(const char *filename, const char *keynamestr,
cleanup: cleanup:
isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_SERVER, ISC_LOG_ERROR, NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
"failed to generate session key " "failed to generate session key "
"for dynamic DNS: %s", isc_result_totext(result)); "for dynamic DNS: %s", isc_result_totext(result));
if (tsigkey != NULL) if (tsigkey != NULL)
dns_tsigkey_detach(&tsigkey); dns_tsigkey_detach(&tsigkey);
@@ -3367,7 +3367,7 @@ configure_session_key(const cfg_obj_t **maps, ns_server_t *server,
cfg_obj_log(obj, ns_g_lctx, ISC_LOG_ERROR, "ddns-keyalg: " cfg_obj_log(obj, ns_g_lctx, ISC_LOG_ERROR, "ddns-keyalg: "
"unsupported or unknown algorithm '%s'%s", "unsupported or unknown algorithm '%s'%s",
algstr, algstr,
server->ddns_keyfile != NULL ? s : ""); server->ddns_keyfile != NULL ? s : "");
return (result); return (result);
} }
@@ -3404,7 +3404,7 @@ configure_session_key(const cfg_obj_t **maps, ns_server_t *server,
if (server->ddns_keyname == NULL) if (server->ddns_keyname == NULL)
goto cleanup; goto cleanup;
dns_name_init(server->ddns_keyname, NULL); dns_name_init(server->ddns_keyname, NULL);
CHECK(dns_name_dup(keyname, mctx, server->ddns_keyname)); CHECK(dns_name_dup(keyname, mctx, server->ddns_keyname));
server->ddns_keyfile = isc_mem_strdup(mctx, keyfile); server->ddns_keyfile = isc_mem_strdup(mctx, keyfile);
if (server->ddns_keyfile == NULL) if (server->ddns_keyfile == NULL)

6
bin/named/zoneconf.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: zoneconf.c,v 1.150 2009/06/10 00:27:21 each Exp $ */ /* $Id: zoneconf.c,v 1.151 2009/06/10 23:47:47 tbox Exp $ */
/*% */ /*% */
@@ -336,8 +336,8 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone,
} }
/* /*
* If this is a "ddns-autoconf" zone and a DDNS session key exists, * If this is a "ddns-autoconf" zone and a DDNS session key exists,
* then use the default policy, equivalent to: * then use the default policy, equivalent to:
* update-policy { grant <ddns-keyname> zonesub any; }; * update-policy { grant <ddns-keyname> zonesub any; };
*/ */
if (autoddns) { if (autoddns) {

4
lib/bind9/check.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: check.c,v 1.102 2009/06/10 00:27:22 each Exp $ */ /* $Id: check.c,v 1.103 2009/06/10 23:47:47 tbox Exp $ */
/*! \file */ /*! \file */
@@ -1077,7 +1077,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
{ "notify", MASTERZONE | SLAVEZONE }, { "notify", MASTERZONE | SLAVEZONE },
{ "also-notify", MASTERZONE | SLAVEZONE }, { "also-notify", MASTERZONE | SLAVEZONE },
{ "dialup", MASTERZONE | SLAVEZONE | STUBZONE }, { "dialup", MASTERZONE | SLAVEZONE | STUBZONE },
{ "ddns-autoconf", MASTERZONE }, { "ddns-autoconf", MASTERZONE },
{ "delegation-only", HINTZONE | STUBZONE | DELEGATIONZONE }, { "delegation-only", HINTZONE | STUBZONE | DELEGATIONZONE },
{ "forward", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE }, { "forward", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE },
{ "forwarders", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE }, { "forwarders", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE },

10
lib/isccfg/namedconf.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: namedconf.c,v 1.97 2009/06/10 00:27:22 each Exp $ */ /* $Id: namedconf.c,v 1.98 2009/06/10 23:47:47 tbox Exp $ */
/*! \file */ /*! \file */
@@ -249,7 +249,7 @@ static cfg_type_t cfg_type_pubkey = {
*/ */
static cfg_type_t cfg_type_rrtypelist = { static cfg_type_t cfg_type_rrtypelist = {
"rrtypelist", cfg_parse_spacelist, cfg_print_spacelist, "rrtypelist", cfg_parse_spacelist, cfg_print_spacelist,
cfg_doc_terminal, &cfg_rep_list, &cfg_type_astring cfg_doc_terminal, &cfg_rep_list, &cfg_type_astring
}; };
static const char *mode_enums[] = { "grant", "deny", NULL }; static const char *mode_enums[] = { "grant", "deny", NULL };
@@ -266,7 +266,7 @@ parse_matchtype(cfg_parser_t *pctx, const cfg_type_t *type,
CHECK(cfg_peektoken(pctx, 0)); CHECK(cfg_peektoken(pctx, 0));
if (pctx->token.type == isc_tokentype_string && if (pctx->token.type == isc_tokentype_string &&
strcasecmp(TOKEN_STRING(pctx), "zonesub") == 0) { strcasecmp(TOKEN_STRING(pctx), "zonesub") == 0) {
pctx->flags |= CFG_PCTX_SKIP; pctx->flags |= CFG_PCTX_SKIP;
} }
return (cfg_parse_enum(pctx, type, ret)); return (cfg_parse_enum(pctx, type, ret));
@@ -297,12 +297,12 @@ static const char *matchtype_enums[] = {
"tcp-self", "6to4-self", "zonesub", NULL }; "tcp-self", "6to4-self", "zonesub", NULL };
static cfg_type_t cfg_type_matchtype = { static cfg_type_t cfg_type_matchtype = {
"matchtype", parse_matchtype, cfg_print_ustring, "matchtype", parse_matchtype, cfg_print_ustring,
cfg_doc_enum, &cfg_rep_string, &matchtype_enums cfg_doc_enum, &cfg_rep_string, &matchtype_enums
}; };
static cfg_type_t cfg_type_matchname = { static cfg_type_t cfg_type_matchname = {
"optional_matchname", parse_matchname, cfg_print_ustring, "optional_matchname", parse_matchname, cfg_print_ustring,
cfg_doc_tuple, &cfg_rep_tuple, &cfg_type_ustring cfg_doc_tuple, &cfg_rep_tuple, &cfg_type_ustring
}; };
/*% /*%