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

1705. [func] Allow the journal's name to be changed via named.conf.

Browse Source
This commit is contained in:
Mark Andrews 2004-10-07 02:15:14 +00:00
parent ed76ec2056
commit 207f0a15bb
6 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -92,7 +92,7 @@
1706. [bug] 'rndc stop' failed to cause zones to be flushed
sometimes. [RT #12328]
1705. [placeholder] rt12327
1705. [func] Allow the journal's name to be changed via named.conf.
1704. [port] lwres needed a snprintf() implementation for
platforms without snprintf(). Add missing

3
bin/named/named.conf.docbook
View File

@ -15,7 +15,7 @@
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: named.conf.docbook,v 1.1 2004/08/20 21:33:14 marka Exp $ -->
<!-- $Id: named.conf.docbook,v 1.2 2004/10/07 02:15:11 marka Exp $ -->
<refentry>
<refentryinfo>
@ -444,6 +444,7 @@ zone <replaceable>string</replaceable> <replaceable>optional_class</replaceable>
check-names ( fail | warn | ignore );
dialup <replaceable>dialuptype</replaceable>;
ixfr-from-differences <replaceable>boolean</replaceable>;
journal <replaceable>quoted_string</replaceable>;
allow-query { <replaceable>address_match_element</replaceable>; ... };
allow-transfer { <replaceable>address_match_element</replaceable>; ... };

7
bin/named/zoneconf.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zoneconf.c,v 1.112 2004/04/20 14:11:46 marka Exp $ */
/* $Id: zoneconf.c,v 1.113 2004/10/07 02:15:12 marka Exp $ */
#include <config.h>
@ -393,6 +393,11 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
filename = cfg_obj_asstring(obj);
RETERR(dns_zone_setfile(zone, filename));
obj = NULL;
result = cfg_map_get(zoptions, "journal", &obj);
if (result == ISC_R_SUCCESS)
RETERR(dns_zone_setjournal(zone, cfg_obj_asstring(obj)));
if (ztype == dns_zone_slave)
RETERR(configure_zone_acl(zconfig, vconfig, config,
"allow-notify", ac, zone,

22
doc/arm/Bv9ARM-book.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN"
"http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
<!-- File: $Id: Bv9ARM-book.xml,v 1.254 2004/10/06 05:56:29 marka Exp $ -->
<!-- File: $Id: Bv9ARM-book.xml,v 1.255 2004/10/07 02:15:12 marka Exp $ -->
<book>
<title>BIND 9 Administrator Reference Manual</title>
@ -1002,12 +1002,12 @@ protocol is specified in RFC 1996.
<sect2 id="journal">
<title>The journal file</title>
<para>All changes made to a zone using dynamic update are stored in the
zone's journal file. This file is automatically created by the
server when when the first dynamic update takes place. The name of
the journal file is formed by appending the
extension <filename>.jnl</filename> to the
name of the corresponding zone file. The journal file is in a
<para>All changes made to a zone using dynamic update are stored
in the zone's journal file. This file is automatically created
by the server when when the first dynamic update takes place.
The name of the journal file is formed by appending the extension
<filename>.jnl</filename> to the name of the corresponding zone
file unless specifically overridden. The journal file is in a
binary format and should not be edited manually.</para>
<para>The server will also occasionally write ("dump")
@ -4547,6 +4547,7 @@ Statement Grammar</title>
<optional> dialup <replaceable>dialup_option</replaceable> ; </optional>
<optional> delegation-only <replaceable>yes_or_no</replaceable> ; </optional>
<optional> file <replaceable>string</replaceable> ; </optional>
<optional> journal <replaceable>string</replaceable> ; </optional>
<optional> forward (<constant>only</constant>|<constant>first</constant>) ; </optional>
<optional> forwarders { <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; <optional> <replaceable>ip_addr</replaceable> <optional>port <replaceable>ip_port</replaceable></optional> ; ... </optional> }; </optional>
<optional> ixfr-base <replaceable>string</replaceable> ; </optional>
@ -4706,6 +4707,13 @@ in the mid-1970s. Zone data for it can be specified with the <literal>CHAOS</lit
<variablelist>
<varlistentry><term><command>journal</command></term>
<listitem><para>Allow the default journal's file name to be overridden.
The default is the zone's file with "<filename>.jnl</filename>" appended.
This is applicable to <command>master</command> and <command>slave</command> zones.
</para>
</listitem></varlistentry>
<varlistentry><term><command>allow-notify</command></term>
<listitem><para>See the description of
<command>allow-notify</command> in <xref linkend="access_control"/></para>

3
lib/bind9/check.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: check.c,v 1.48 2004/07/29 00:08:10 marka Exp $ */
/* $Id: check.c,v 1.49 2004/10/07 02:15:13 marka Exp $ */
#include <config.h>
@ -733,6 +733,7 @@ check_zoneconf(cfg_obj_t *zconfig, cfg_obj_t *config, isc_symtab_t *symtab,
{ "allow-update", MASTERZONE },
{ "allow-update-forwarding", SLAVEZONE },
{ "file", MASTERZONE | SLAVEZONE | STUBZONE | HINTZONE},
{ "journal", MASTERZONE | SLAVEZONE },
{ "ixfr-base", MASTERZONE | SLAVEZONE },
{ "ixfr-tmp-file", MASTERZONE | SLAVEZONE },
{ "masters", SLAVEZONE | STUBZONE },

3
lib/isccfg/namedconf.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: namedconf.c,v 1.36 2004/07/23 04:15:26 marka Exp $ */
/* $Id: namedconf.c,v 1.37 2004/10/07 02:15:14 marka Exp $ */
#include <config.h>
@ -793,6 +793,7 @@ zone_only_clauses[] = {
{ "type", &cfg_type_zonetype, 0 },
{ "allow-update", &cfg_type_bracketed_aml, 0 },
{ "file", &cfg_type_qstring, 0 },
{ "journal", &cfg_type_qstring, 0 },
{ "ixfr-base", &cfg_type_qstring, CFG_CLAUSEFLAG_OBSOLETE },
{ "ixfr-tmp-file", &cfg_type_qstring, CFG_CLAUSEFLAG_OBSOLETE },
{ "masters", &cfg_type_namesockaddrkeylist, 0 },