BIND 10 master, updated. 2156cc8503238162e22f418632837003593c8e3c [master]Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Dec 19 17:14:13 UTC 2012
The branch, master has been updated
via 2156cc8503238162e22f418632837003593c8e3c (commit)
via 44bd04d531d1881d7c9a8fea9bce4b6c10aea16d (commit)
via ef19026395320447f81738be3fd840e278ff8da2 (commit)
via 7299bfac202b013e968ff19c1c3109d78745ed22 (commit)
via bf53fbd4e92ae835280d49fbfdeeebd33e0ce3f2 (commit)
via a878a8107d48c5b1c476930cd4eb769f609fd609 (commit)
via 8474c4bf697ccf594ca3d08dd7b1f327a44e5e82 (commit)
via 71c5b61bcf71fb8ef3382569ea0eb059b0cca430 (commit)
from 61386c685763040bfcb779f0224bf6867a4dceb9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2156cc8503238162e22f418632837003593c8e3c
Merge: 44bd04d 61386c6
Author: Jeremy C. Reed <jreed at isc.org>
Date: Wed Dec 19 11:13:58 2012 -0600
[master]Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
commit 44bd04d531d1881d7c9a8fea9bce4b6c10aea16d
Author: Jeremy C. Reed <jreed at isc.org>
Date: Wed Dec 19 10:30:12 2012 -0600
[master] in docs, change hardcoded package name
from bind10-devel to bind10
commit ef19026395320447f81738be3fd840e278ff8da2
Merge: 7299bfa 8d844f0
Author: Jeremy C. Reed <jreed at isc.org>
Date: Wed Dec 19 10:17:37 2012 -0600
[master]Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
commit 7299bfac202b013e968ff19c1c3109d78745ed22
Author: Jeremy C. Reed <jreed at isc.org>
Date: Wed Dec 19 10:15:55 2012 -0600
[master] add release date for tomorrow
commit bf53fbd4e92ae835280d49fbfdeeebd33e0ce3f2
Author: Jeremy C. Reed <jreed at isc.org>
Date: Wed Dec 19 10:15:10 2012 -0600
[master] change package name to bind10
instead of bind10-devel
also increase the version to today's date stamp (not for "beta")
commit a878a8107d48c5b1c476930cd4eb769f609fd609
Author: Jeremy C. Reed <jreed at isc.org>
Date: Wed Dec 19 09:00:21 2012 -0600
[master] rebuild .mes files
using tools/reorder_message_file.py to reorder
commit 8474c4bf697ccf594ca3d08dd7b1f327a44e5e82
Author: Jeremy C. Reed <jreed at isc.org>
Date: Wed Dec 19 08:07:39 2012 -0600
[master] improve auth and resolver man pages
mention some defaults
Remove sendstats and document getstats.
Document internal start_ddns_forwarder and stop_ddns_forwarder.
Add extra SEE ALSO.
Okayed via jabber.
commit 71c5b61bcf71fb8ef3382569ea0eb059b0cca430
Author: Jeremy C. Reed <jreed at isc.org>
Date: Wed Dec 19 08:06:03 2012 -0600
[master] slight reword of changelog entry
both discussed on jabber (today and yesterday)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 23 ++++++++++--------
configure.ac | 2 +-
doc/guide/bind10-guide.xml | 36 ++++++++++++++--------------
src/bin/auth/b10-auth.xml | 48 +++++++++++++++++++++++++++++--------
src/bin/bind10/bind10.xml | 2 +-
src/bin/cfgmgr/b10-cfgmgr.xml | 2 +-
src/bin/cmdctl/b10-certgen.xml | 2 +-
src/bin/cmdctl/b10-cmdctl.xml | 12 +++++-----
src/bin/dhcp4/dhcp4_messages.mes | 24 +++++++++----------
src/bin/dhcp6/dhcp6_messages.mes | 14 +++++------
src/bin/msgq/msgq.xml | 2 +-
src/bin/resolver/b10-resolver.xml | 4 +++-
src/bin/stats/b10-stats-httpd.xml | 8 +++----
src/bin/stats/b10-stats.xml | 2 +-
14 files changed, 107 insertions(+), 74 deletions(-)
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 977b6ea..763fb6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+bind10-1.0.0-beta released on December 20, 2012
+
531. [func] tomek
b10-dhcp6: Added support for expired leases. Leases for IPv6
addresses that are past their valid lifetime may be recycled, i.e.
@@ -19,16 +21,17 @@
(Trac #2380, git 689b015753a9e219bc90af0a0b818ada26cc5968)
529. [func]* team
- The in-memory data source now uses a more complete master file
- parser to load textual zone files. As of this change it supports
- multi-line RR representation and more complete support for escaped
- and quoted strings. It also produces more helpful log when there
- is an error in the zone file. It will be enhanced as more
- specific tasks in the #2368 meta ticket are completed. The new
- parser is generally upper compatible to the previous one, but due
- to the tighter checks some input that has been accepted so far
- could now be rejected, so it's advisable to check if you use
- textual zone files directly loaded to memory.
+ The in-memory data source now uses a more complete master
+ file parser to load textual zone files. As of this change
+ it supports multi-line RR representation and more complete
+ support for escaped and quoted strings. It also produces
+ more helpful log messages when there is an error in the zone
+ file. It will be enhanced as more specific tasks in the
+ #2368 meta ticket are completed. The new parser is generally
+ backward compatible to the previous one, but due to the
+ tighter checks some input that has been accepted so far
+ could now be rejected, so it's advisable to check if you
+ use textual zone files directly loaded to memory.
(Trac #2470, git c4cf36691115c15440b65cac16f1c7fcccc69521)
528. [func] marcin
diff --git a/configure.ac b/configure.ac
index 24e9b03..6a88f4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
-AC_INIT(bind10-devel, 20120817, bind10-dev at isc.org)
+AC_INIT(bind10, 20121219, bind10-dev at isc.org)
AC_CONFIG_SRCDIR(README)
AM_INIT_AUTOMAKE([foreign])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])dnl be backward compatible
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index 336cc9b..81ef868 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -503,7 +503,7 @@ var/
</listitem>
<listitem>
<simpara>
- <filename>etc/bind10-devel/</filename> —
+ <filename>etc/bind10/</filename> —
configuration files.
</simpara>
</listitem>
@@ -515,7 +515,7 @@ var/
</listitem>
<listitem>
<simpara>
- <filename>libexec/bind10-devel/</filename> —
+ <filename>libexec/bind10/</filename> —
executables that a user wouldn't normally run directly and
are not run independently.
These are the BIND 10 modules which are daemons started by
@@ -530,13 +530,13 @@ var/
</listitem>
<listitem>
<simpara>
- <filename>share/bind10-devel/</filename> —
+ <filename>share/bind10/</filename> —
configuration specifications.
</simpara>
</listitem>
<listitem>
<simpara>
- <filename>share/doc/bind10-devel/</filename> —
+ <filename>share/doc/bind10/</filename> —
this guide and other supplementary documentation.
</simpara>
</listitem>
@@ -548,7 +548,7 @@ var/
</listitem>
<listitem>
<simpara>
- <filename>var/bind10-devel/</filename> —
+ <filename>var/bind10/</filename> —
data source and configuration databases.
</simpara>
</listitem>
@@ -910,7 +910,7 @@ as a dependency earlier -->
Administrators do not communicate directly with the
<command>b10-msgq</command> daemon.
By default, BIND 10 uses a UNIX domain socket file named
- <filename>/usr/local/var/bind10-devel/msg_socket</filename>
+ <filename>/usr/local/var/bind10/msg_socket</filename>
for this interprocess communication.
</para>
@@ -972,7 +972,7 @@ config changes are actually commands to cfgmgr
<!-- TODO: what about command line switch to change this? -->
<para>
The stored configuration file is at
- <filename>/usr/local/var/bind10-devel/b10-config.db</filename>.
+ <filename>/usr/local/var/bind10/b10-config.db</filename>.
(The directory is what was defined at build configure time for
<option>--localstatedir</option>.
The default is <filename>/usr/local/var/</filename>.)
@@ -1065,13 +1065,13 @@ but you might wanna check with likun
<para>The HTTPS server requires a private key,
such as a RSA PRIVATE KEY.
The default location is at
- <filename>/usr/local/etc/bind10-devel/cmdctl-keyfile.pem</filename>.
+ <filename>/usr/local/etc/bind10/cmdctl-keyfile.pem</filename>.
(A sample key is at
- <filename>/usr/local/share/bind10-devel/cmdctl-keyfile.pem</filename>.)
+ <filename>/usr/local/share/bind10/cmdctl-keyfile.pem</filename>.)
It also uses a certificate located at
- <filename>/usr/local/etc/bind10-devel/cmdctl-certfile.pem</filename>.
+ <filename>/usr/local/etc/bind10/cmdctl-certfile.pem</filename>.
(A sample certificate is at
- <filename>/usr/local/share/bind10-devel/cmdctl-certfile.pem</filename>.)
+ <filename>/usr/local/share/bind10/cmdctl-certfile.pem</filename>.)
This may be a self-signed certificate or purchased from a
certification authority.
</para>
@@ -1107,11 +1107,11 @@ but that is a single file, maybe this should go back to that format?
<para>
The <command>b10-cmdctl</command> daemon also requires
the user account file located at
- <filename>/usr/local/etc/bind10-devel/cmdctl-accounts.csv</filename>.
+ <filename>/usr/local/etc/bind10/cmdctl-accounts.csv</filename>.
This comma-delimited file lists the accounts with a user name,
hashed password, and salt.
(A sample file is at
- <filename>/usr/local/share/bind10-devel/cmdctl-accounts.csv</filename>.
+ <filename>/usr/local/share/bind10/cmdctl-accounts.csv</filename>.
It contains the user named <quote>root</quote> with the password
<quote>bind10</quote>.)
</para>
@@ -1141,14 +1141,14 @@ or accounts database -->
The configuration items for <command>b10-cmdctl</command> are:
<varname>accounts_file</varname> which defines the path to the
user accounts database (the default is
- <filename>/usr/local/etc/bind10-devel/cmdctl-accounts.csv</filename>);
+ <filename>/usr/local/etc/bind10/cmdctl-accounts.csv</filename>);
<varname>cert_file</varname> which defines the path to the
PEM certificate file (the default is
- <filename>/usr/local/etc/bind10-devel/cmdctl-certfile.pem</filename>);
+ <filename>/usr/local/etc/bind10/cmdctl-certfile.pem</filename>);
and
<varname>key_file</varname> which defines the path to the
PEM private key file (the default is
- <filename>/usr/local/etc/bind10-devel/cmdctl-keyfile.pem</filename>).
+ <filename>/usr/local/etc/bind10/cmdctl-keyfile.pem</filename>).
</para>
</section>
@@ -2459,7 +2459,7 @@ can use various data source backends.
data source — one that serves things like
<quote>AUTHORS.BIND.</quote>. The IN class contains single SQLite3
data source with database file located at
- <filename>/usr/local/var/bind10-devel/zone.sqlite3</filename>.
+ <filename>/usr/local/var/bind10/zone.sqlite3</filename>.
</para>
<para>
@@ -3673,7 +3673,7 @@ mysql></screen>
<para>
3. Create the database tables:
<screen>mysql> <userinput>CONNECT kea;</userinput>
-mysql> <userinput>SOURCE <replaceable><path-to-bind10></replaceable>/share/bind10-devel/dhcpdb_create.mysql</userinput></screen>
+mysql> <userinput>SOURCE <replaceable><path-to-bind10></replaceable>/share/bind10/dhcpdb_create.mysql</userinput></screen>
</para>
<para>
4. Create the user under which BIND 10 will access the database and grant it access to the database tables:
diff --git a/src/bin/auth/b10-auth.xml b/src/bin/auth/b10-auth.xml
index b34009d..88f80e2 100644
--- a/src/bin/auth/b10-auth.xml
+++ b/src/bin/auth/b10-auth.xml
@@ -20,7 +20,7 @@
<refentry>
<refentryinfo>
- <date>June 20, 2012</date>
+ <date>December 18, 2012</date>
</refentryinfo>
<refmeta>
@@ -100,7 +100,7 @@
<varname>database_file</varname> defines the path to the
SQLite3 zone file when using the sqlite datasource.
The default is
- <filename>/usr/local/var/bind10-devel/zone.sqlite3</filename>.
+ <filename>/usr/local/var/bind10/zone.sqlite3</filename>.
</para>
<para>
@@ -157,6 +157,7 @@
incoming TCP connections, in milliseconds. If the query
is not sent within this time, the connection is closed.
Setting this to 0 will disable TCP timeouts completely.
+ The default is 5000 (five seconds).
</para>
<!-- TODO: formating -->
@@ -165,6 +166,15 @@
</para>
<para>
+ <command>getstats</command> tells <command>b10-auth</command>
+ to report its defined statistics data in JSON format.
+ It will not report about unused counters.
+ This is used by the
+ <citerefentry><refentrytitle>b10-stats</refentrytitle><manvolnum>8</manvolnum></citerefentry> daemon.
+ (The <command>sendstats</command> command is deprecated.)
+ </para>
+
+ <para>
<command>loadzone</command> tells <command>b10-auth</command>
to load or reload a zone file. The arguments include:
<varname>class</varname> which optionally defines the class
@@ -181,13 +191,6 @@
</para>
<para>
- <command>sendstats</command> tells <command>b10-auth</command>
- to send its statistics data to
- <citerefentry><refentrytitle>b10-stats</refentrytitle><manvolnum>8</manvolnum></citerefentry>
- immediately.
- </para>
-
- <para>
<command>shutdown</command> exits <command>b10-auth</command>.
This has an optional <varname>pid</varname> argument to
select the process ID to stop.
@@ -195,6 +198,28 @@
if configured.)
</para>
+ <para>
+ <command>start_ddns_forwarder</command> starts (or restarts) the
+ internal forwarding of DDNS Update messages.
+ This is used by the
+ <citerefentry><refentrytitle>b10-ddns</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ daemon to tell <command>b10-auth</command> that DDNS Update
+ messages can be forwarded.
+ <note><simpara>This is not expected to be called by administrators;
+ it will be removed as a public command in the future.</simpara></note>
+ </para>
+
+ <para>
+ <command>stop_ddns_forwarder</command> stops the internal
+ forwarding of DDNS Update messages.
+ This is used by the
+ <citerefentry><refentrytitle>b10-ddns</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ daemon to tell <command>b10-auth</command> that DDNS Update
+ messages should not be forwarded.
+ <note><simpara>This is not expected to be called by administrators;
+ it will be removed as a public command in the future.</simpara></note>
+ </para>
+
</refsect1>
<refsect1>
@@ -230,7 +255,7 @@
<refsect1>
<title>FILES</title>
<para>
- <filename>/usr/local/var/bind10-devel/zone.sqlite3</filename>
+ <filename>/usr/local/var/bind10/zone.sqlite3</filename>
— Location for the SQLite3 zone database
when <emphasis>database_file</emphasis> configuration is not
defined.
@@ -244,6 +269,9 @@
<refentrytitle>b10-cfgmgr</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
+ <refentrytitle>b10-ddns</refentrytitle><manvolnum>8</manvolnum>
+ </citerefentry>,
+ <citerefentry>
<refentrytitle>b10-loadzone</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
diff --git a/src/bin/bind10/bind10.xml b/src/bin/bind10/bind10.xml
index 2ce86ab..e32544a 100644
--- a/src/bin/bind10/bind10.xml
+++ b/src/bin/bind10/bind10.xml
@@ -160,7 +160,7 @@
<citerefentry><refentrytitle>b10-msgq</refentrytitle><manvolnum>8</manvolnum></citerefentry>
daemon to use.
The default is
- <filename>/usr/local/var/bind10-devel/msg_socket</filename>.
+ <filename>/usr/local/var/bind10/msg_socket</filename>.
<!-- @localstatedir@/@PACKAGE_NAME@/msg_socket -->
</para>
</listitem>
diff --git a/src/bin/cfgmgr/b10-cfgmgr.xml b/src/bin/cfgmgr/b10-cfgmgr.xml
index ff5706c..d8688f9 100644
--- a/src/bin/cfgmgr/b10-cfgmgr.xml
+++ b/src/bin/cfgmgr/b10-cfgmgr.xml
@@ -136,7 +136,7 @@
<refsect1>
<title>FILES</title>
<!-- TODO: fix path -->
- <para><filename>/usr/local/var/bind10-devel/b10-config.db</filename>
+ <para><filename>/usr/local/var/bind10/b10-config.db</filename>
— Configuration storage file.
</para>
</refsect1>
diff --git a/src/bin/cmdctl/b10-certgen.xml b/src/bin/cmdctl/b10-certgen.xml
index 1e3c8e3..5ac8783 100644
--- a/src/bin/cmdctl/b10-certgen.xml
+++ b/src/bin/cmdctl/b10-certgen.xml
@@ -190,7 +190,7 @@
To update an expired certificate in BIND 10 that has been installed to
/usr/local:
<screen>
-$> cd /usr/local/etc/bind10-devel/
+$> cd /usr/local/etc/bind10/
$> b10-certgen
cmdctl-certfile.pem failed to verify: certificate has expired
diff --git a/src/bin/cmdctl/b10-cmdctl.xml b/src/bin/cmdctl/b10-cmdctl.xml
index e01d5a2..4b1b32f 100644
--- a/src/bin/cmdctl/b10-cmdctl.xml
+++ b/src/bin/cmdctl/b10-cmdctl.xml
@@ -147,21 +147,21 @@
<varname>accounts_file</varname> defines the path to the
user accounts database.
The default is
- <filename>/usr/local/etc/bind10-devel/cmdctl-accounts.csv</filename>.
+ <filename>/usr/local/etc/bind10/cmdctl-accounts.csv</filename>.
</para>
<para>
<varname>cert_file</varname> defines the path to the
PEM certificate file.
The default is
- <filename>/usr/local/etc/bind10-devel/cmdctl-certfile.pem</filename>.
+ <filename>/usr/local/etc/bind10/cmdctl-certfile.pem</filename>.
</para>
<para>
<varname>key_file</varname> defines the path to the PEM private key
file.
The default is
- <filename>/usr/local/etc/bind10-devel/cmdctl-keyfile.pem</filename>.
+ <filename>/usr/local/etc/bind10/cmdctl-keyfile.pem</filename>.
</para>
<!-- TODO: formating -->
@@ -187,17 +187,17 @@
<!-- TODO: permissions -->
<!-- TODO: what about multiple accounts? -->
<!-- TODO: shouldn't the password file name say cmdctl in it? -->
- <para><filename>/usr/local/etc/bind10-devel/cmdctl-accounts.csv</filename>
+ <para><filename>/usr/local/etc/bind10/cmdctl-accounts.csv</filename>
— account database containing the name, hashed password,
and the salt.
</para>
<!-- TODO: replace /usr/local -->
<!-- TODO: permissions -->
<!-- TODO: shouldn't have both in same file, will be configurable -->
- <para><filename>/usr/local/etc/bind10-devel/cmdctl-keyfile.pem</filename>
+ <para><filename>/usr/local/etc/bind10/cmdctl-keyfile.pem</filename>
— contains the Private key.
</para>
- <para><filename>/usr/local/etc/bind10-devel/cmdctl-certfile.pem</filename>
+ <para><filename>/usr/local/etc/bind10/cmdctl-certfile.pem</filename>
— contains the Certificate.
</para>
</refsect1>
diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index 994f004..b564590 100644
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -26,29 +26,29 @@ to establish a session with the BIND 10 control channel.
A debug message listing the command (and possible arguments) received
from the BIND 10 control system by the IPv4 DHCP server.
+% DHCP4_CONFIG_COMPLETE DHCPv4 server has completed configuration: %1
+This is an informational message announcing the successful processing of a
+new configuration. it is output during server startup, and when an updated
+configuration is committed by the administrator. Additional information
+may be provided.
+
% DHCP4_CONFIG_LOAD_FAIL failed to load configuration: %1
This critical error message indicates that the initial DHCPv4
configuration has failed. The server will start, but nothing will be
served until the configuration has been corrected.
-% DHCP4_CONFIG_UPDATE updated configuration received: %1
-A debug message indicating that the IPv4 DHCP server has received an
-updated configuration from the BIND 10 configuration system.
+% DHCP4_CONFIG_NEW_SUBNET A new subnet has been added to configuration: %1
+This is an informational message reporting that the configuration has
+been extended to include the specified IPv4 subnet.
% DHCP4_CONFIG_START DHCPv4 server is processing the following configuration: %1
This is a debug message that is issued every time the server receives a
configuration. That happens at start up and also when a server configuration
change is committed by the administrator.
-% DHCP4_CONFIG_NEW_SUBNET A new subnet has been added to configuration: %1
-This is an informational message reporting that the configuration has
-been extended to include the specified IPv4 subnet.
-
-% DHCP4_CONFIG_COMPLETE DHCPv4 server has completed configuration: %1
-This is an informational message announcing the successful processing of a
-new configuration. it is output during server startup, and when an updated
-configuration is committed by the administrator. Additional information
-may be provided.
+% DHCP4_CONFIG_UPDATE updated configuration received: %1
+A debug message indicating that the IPv4 DHCP server has received an
+updated configuration from the BIND 10 configuration system.
% DHCP4_NOT_RUNNING IPv4 DHCP server is not running
A warning message is issued when an attempt is made to shut down the
diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index 6ab42b3..74ab401 100644
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -86,13 +86,6 @@ This message indicates that the server failed to grant (in response to
received REQUEST) a lease for a given client. There may be many reasons for
such failure. Each specific failure is logged in a separate log entry.
-% DHCP6_REQUIRED_OPTIONS_CHECK_FAIL %1 message received from %2 failed the following check: %3
-This message indicates that received DHCPv6 packet is invalid. This may be due
-to a number of reasons, e.g. the mandatory client-id option is missing,
-the server-id forbidden in that particular type of message is present,
-there is more than one instance of client-id or server-id present,
-etc. The exact reason for rejecting the packet is included in the message.
-
% DHCP6_NOT_RUNNING IPv6 DHCP server is not running
A warning message is issued when an attempt is made to shut down the
IPv6 DHCP server but it is not running.
@@ -149,6 +142,13 @@ as a hint for possible requested address.
% DHCP6_QUERY_DATA received packet length %1, data length %2, data is %3
A debug message listing the data received from the client or relay.
+% DHCP6_REQUIRED_OPTIONS_CHECK_FAIL %1 message received from %2 failed the following check: %3
+This message indicates that received DHCPv6 packet is invalid. This may be due
+to a number of reasons, e.g. the mandatory client-id option is missing,
+the server-id forbidden in that particular type of message is present,
+there is more than one instance of client-id or server-id present,
+etc. The exact reason for rejecting the packet is included in the message.
+
% DHCP6_RESPONSE_DATA responding with packet type %1 data is %2
A debug message listing the data returned to the client.
diff --git a/src/bin/msgq/msgq.xml b/src/bin/msgq/msgq.xml
index fed4c27..43c72a4 100644
--- a/src/bin/msgq/msgq.xml
+++ b/src/bin/msgq/msgq.xml
@@ -111,7 +111,7 @@
<listitem><para>
The UNIX domain socket file this daemon will use.
The default is
- <filename>/usr/local/var/bind10-devel/msg_socket</filename>.
+ <filename>/usr/local/var/bind10/msg_socket</filename>.
<!-- @localstatedir@/@PACKAGE_NAME@/msg_socket -->
</para></listitem>
</varlistentry>
diff --git a/src/bin/resolver/b10-resolver.xml b/src/bin/resolver/b10-resolver.xml
index aca8fb2..485d022 100644
--- a/src/bin/resolver/b10-resolver.xml
+++ b/src/bin/resolver/b10-resolver.xml
@@ -20,7 +20,7 @@
<refentry>
<refentryinfo>
- <date>February 28, 2012</date>
+ <date>August 16, 2012</date>
</refentryinfo>
<refmeta>
@@ -148,6 +148,8 @@ once that is merged you can for instance do 'config add Resolver/forward_address
address or special keyword.
The <varname>key</varname> is a TSIG key name.
The default configuration accepts queries from 127.0.0.1 and ::1.
+ The default action is REJECT for newly added
+ <varname>query_acl</varname> items.
</para>
<para>
diff --git a/src/bin/stats/b10-stats-httpd.xml b/src/bin/stats/b10-stats-httpd.xml
index 17b7671..28d6ac9 100644
--- a/src/bin/stats/b10-stats-httpd.xml
+++ b/src/bin/stats/b10-stats-httpd.xml
@@ -103,7 +103,7 @@
<refsect1>
<title>FILES</title>
<para>
- <filename>/usr/local/share/bind10-devel/stats-httpd.spec</filename>
+ <filename>/usr/local/share/bind10/stats-httpd.spec</filename>
<!--TODO: The filename should be computed from prefix-->
— the spec file of <command>b10-stats-httpd</command>. This file
contains configurable settings
@@ -115,17 +115,17 @@
how to configure the settings.
</para>
<para>
- <filename>/usr/local/share/bind10-devel/stats-httpd-xml.tpl</filename>
+ <filename>/usr/local/share/bind10/stats-httpd-xml.tpl</filename>
<!--TODO: The filename should be computed from prefix-->
— the template file of XML document.
</para>
<para>
- <filename>/usr/local/share/bind10-devel/stats-httpd-xsd.tpl</filename>
+ <filename>/usr/local/share/bind10/stats-httpd-xsd.tpl</filename>
<!--TODO: The filename should be computed from prefix-->
— the template file of XSD document.
</para>
<para>
- <filename>/usr/local/share/bind10-devel/stats-httpd-xsl.tpl</filename>
+ <filename>/usr/local/share/bind10/stats-httpd-xsl.tpl</filename>
<!--TODO: The filename should be computed from prefix-->
— the template file of XSL document.
</para>
diff --git a/src/bin/stats/b10-stats.xml b/src/bin/stats/b10-stats.xml
index 88a01ed..ee89ad2 100644
--- a/src/bin/stats/b10-stats.xml
+++ b/src/bin/stats/b10-stats.xml
@@ -210,7 +210,7 @@
<refsect1>
<title>FILES</title>
- <para><filename>/usr/local/share/bind10-devel/stats.spec</filename>
+ <para><filename>/usr/local/share/bind10/stats.spec</filename>
<!--TODO: The filename should be computed from prefix-->
— This is a spec file for <command>b10-stats</command>. It
contains commands for <command>b10-stats</command>. They can be
More information about the bind10-changes
mailing list