Commit bd8497df authored by JINMEI Tatuya's avatar JINMEI Tatuya

[master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

parents 57b40ee8 2156cc85
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
......
......@@ -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@isc.org)
AC_INIT(bind10, 20121219, bind10-dev@isc.org)
AC_CONFIG_SRCDIR(README)
AM_INIT_AUTOMAKE([foreign])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])dnl be backward compatible
......
......@@ -503,7 +503,7 @@ var/
</listitem>
<listitem>
<simpara>
<filename>etc/bind10-devel/</filename> &mdash;
<filename>etc/bind10/</filename> &mdash;
configuration files.
</simpara>
</listitem>
......@@ -515,7 +515,7 @@ var/
</listitem>
<listitem>
<simpara>
<filename>libexec/bind10-devel/</filename> &mdash;
<filename>libexec/bind10/</filename> &mdash;
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> &mdash;
<filename>share/bind10/</filename> &mdash;
configuration specifications.
</simpara>
</listitem>
<listitem>
<simpara>
<filename>share/doc/bind10-devel/</filename> &mdash;
<filename>share/doc/bind10/</filename> &mdash;
this guide and other supplementary documentation.
</simpara>
</listitem>
......@@ -548,7 +548,7 @@ var/
</listitem>
<listitem>
<simpara>
<filename>var/bind10-devel/</filename> &mdash;
<filename>var/bind10/</filename> &mdash;
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 &mdash; 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>&lt;path-to-bind10&gt;</replaceable>/share/bind10-devel/dhcpdb_create.mysql</userinput></screen>
mysql> <userinput>SOURCE <replaceable>&lt;path-to-bind10&gt;</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:
......
......@@ -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 -->
......@@ -164,6 +165,15 @@
The configuration commands are:
</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:
......@@ -180,13 +190,6 @@
</simpara></note>
</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
......@@ -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>
&mdash; Location for the SQLite3 zone database
when <emphasis>database_file</emphasis> configuration is not
defined.
......@@ -243,6 +268,9 @@
<citerefentry>
<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>,
......
......@@ -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>
......
......@@ -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>
&mdash; Configuration storage file.
</para>
</refsect1>
......
......@@ -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
......
......@@ -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>
&mdash; 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>
&mdash; 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>
&mdash; contains the Certificate.
</para>
</refsect1>
......
......@@ -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
......
......@@ -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.
......
......@@ -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>
......
......@@ -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>
......
......@@ -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-->
&mdash; 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-->
&mdash; 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-->
&mdash; 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-->
&mdash; the template file of XSL document.
</para>
......
......@@ -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-->
&mdash; This is a spec file for <command>b10-stats</command>. It
contains commands for <command>b10-stats</command>. They can be
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment