renamed check-zone to named-checkzone and check-conf to named-checkzone

to reduce /usr/local/bin namespace pollution; added a CHANGES entry for them

diff --git a/CHANGES b/CHANGES
index e78d42652050a6bb68b2bf7be4327572c69b6a65..cad3ea5c013e15f7cf349a49b6689da5d6420fe2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+
+ 623.  [func]          Added "named-checkconf" and "named-checkzone" program
+                       for syntax checking named.conf files and zone files,
+                       respectively.
+
  622.  [bug]           A canceled request could be destroyed before
                        dns_request_destroy() was called. [RT #562]
 

diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index a559955097e50f9cdc2e8e7dcd4bb928faf63dae..22222cbd1bc98c14b19c59330ae1ae1eba9725ea 100644 (file)
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2000/12/14 21:33:33 marka Exp $
+# $Id: Makefile.in,v 1.3 2000/12/19 19:48:05 gson Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -37,17 +37,17 @@ LIBS =              @LIBS@
 SUBDIRS =
 
 # Alphabetically
-TARGETS =      check-conf check-zone
+TARGETS =      named-checkconf named-checkzone
 
 # Alphabetically
-SRCS =         check-conf.c check-zone.c check-tool.c
+SRCS =         named-checkconf.c named-checkzone.c check-tool.c
 
 @BIND9_MAKE_RULES@
 
-check-conf: check-conf.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL} ${CC} ${CFLAGS} -o $@ check-conf.@O@ check-tool.@O@ \
+named-checkconf: named-checkconf.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL} ${CC} ${CFLAGS} -o $@ named-checkconf.@O@ check-tool.@O@ \
                ${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-check-zone: check-zone.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL} ${CC} ${CFLAGS} -o $@ check-zone.@O@ check-tool.@O@ \
+named-checkzone: named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL} ${CC} ${CFLAGS} -o $@ named-checkzone.@O@ check-tool.@O@ \
                ${DNSLIBS} ${ISCLIBS} ${LIBS}

diff --git a/bin/check/named-checkconf.8 b/bin/check/named-checkconf.8
index 56be59a1f06f3deba9992c4839077226f499be39..145571c9609768295ac6dee7e30837fcd1623d12 100644 (file)
--- a/bin/check/named-checkconf.8
+++ b/bin/check/named-checkconf.8
@@ -13,26 +13,26 @@
 .\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 .\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-.\" $Id: named-checkconf.8,v 1.1 2000/12/14 21:41:50 marka Exp $
+.\" $Id: named-checkconf.8,v 1.2 2000/12/19 19:48:09 gson Exp $
 
 .Dd Jun 14, 2000
-.Dt CHECK-CONF 1
+.Dt NAMED-CHECKCONF 1
 .Os BIND9 9
 .ds vT BIND9 Programmer's Manual
 .Sh NAME
-.Nm check-conf
+.Nm named-checkconf
 .Nd Configuration file syntax checking tool.
 .Sh SYNOPSIS
-.Nm check-conf
+.Nm named-checkconf
 .Op filename
 .Sh DESCRIPTION
 .Pp
-.Nm check-conf
+.Nm named-checkconf
 is a tool to check the syntax, but not sematics, of the configuration file
 for named.
 .Pp
 The options to
-.Nm check-conf
+.Nm named-checkconf
 are as follows:
 .Bl -tag -width Ds
 .It Ar filename
@@ -40,9 +40,9 @@ the name of the configuration file to be checked.
 If not specified it defaults /etc/named.conf.
 .Sh RETURN VALUES
 .Pp
-.Nm check-conf
-return a zero exit value if no errors were detected,
-otherwise it returns 1.
+.Nm named-checkconf
+return a an exit status of 1 if errors were detected,
+0 otherwise.
 .Sh SEE ALSO
 .Xr named 8 ,
 .Xr RFC1035 .

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index f95a475359b860d3425c381bc27e2becb114f6af..872b0d4d146eff4804ed8a907e524449fcb474e2 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -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.70 2000/12/15 21:17:23 gson Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.71 2000/12/19 19:48:06 gson Exp $ -->
 
 <book>
 
@@ -619,29 +619,22 @@ behavior, we do not recommend the use of <command>nslookup</command>.
 Use <command>dig</command> instead.</para>
             </listitem>
           </varlistentry>
-        </variablelist>
-      </sect3>
-      <sect3 id="admin_tools">
-        <title>Administrative Tools</title>
-        <para>Administrative tools play an integral part in the management
-of a server.</para>
-        <variablelist>
-         <varlistentry id="check-conf" xreflabel="Named Configuration Checking application">
-            <term><command>check-conf</command></term>
+         <varlistentry id="named-checkconf" xreflabel="Named Configuration Checking application">
+            <term><command>named-checkconf</command></term>
             <listitem>
-             <para>Performs syntax consistancy checks on <filename>named.conf</filename>.</para>
+             <para>Checks the syntax of <filename>named.conf</filename>.</para>
               <cmdsynopsis label="Usage">
-                <command>check-conf</command>
+                <command>named-checkconf</command>
                 <arg><replaceable>filename</replaceable></arg>
               </cmdsynopsis>
             </listitem>
          </varlistentry>
-         <varlistentry id="check-zone" xreflabel="Zone Checking application">
-            <term><command>check-zone</command></term>
+         <varlistentry id="named-checkzone" xreflabel="Zone Checking application">
+            <term><command>named-checkzone</command></term>
             <listitem>
-             <para>Perform consistancy checks on a individual zone.</para>
+             <para>Performs syntax and consistency checks on a individual zone.</para>
               <cmdsynopsis label="Usage">
-                <command>check-zone</command>
+                <command>named-checkzone</command>
                 <arg>-dq</arg>
                 <arg>-c <replaceable>class</replaceable></arg>
                 <arg choice="plain"><replaceable>zone</replaceable></arg>
@@ -649,6 +642,13 @@ of a server.</para>
               </cmdsynopsis>
             </listitem>
          </varlistentry>
+        </variablelist>
+      </sect3>
+      <sect3 id="admin_tools">
+        <title>Administrative Tools</title>
+        <para>Administrative tools play an integral part in the management
+of a server.</para>
+        <variablelist>
           <varlistentry id="rndc" xreflabel="Remote Name Daemon Control application">
             <term><command>rndc</command></term>
             <listitem>

diff --git a/util/copyrights b/util/copyrights
index 57fee57d88a32723fbd6e9402fb3cc0a3aa40bfb..380852adc7283ad715815bb9d01c8c2999762c3d 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -9,8 +9,8 @@
 ./bin/.cvsignore                               X       1999,2000
 ./bin/Makefile.in                              MAKE    1998,1999,2000
 ./bin/check/Makefile.in                                MAKE    2000
-./bin/check/check-zone.c                       C       1999,2000
-./bin/check/check-conf.c                       C       1999,2000
+./bin/check/named-checkzone.c                  C       1999,2000
+./bin/check/named-checkconf.c                  C       1999,2000
 ./bin/check/check-tool.c                       C       2000
 ./bin/dig/.cvsignore                           X       2000
 ./bin/dig/Makefile.in                          MAKE    2000