915. [func] The named-checkconf and named-checkzone programs

                        now have a '-v' option for printing their version.
                        [RT #1151]

CHANGES

 
+ 915.	[func]		The named-checkconf and named-checkzone programs
+			now have a '-v' option for printing their version.
+			[RT #1151]
+
  914.	[bug]		Global 'server' statements were rejected when
 			using views, even though they were accepted
 			in 9.1. [RT #1368]

bin/check/Makefile.in

@@ -13,12 +13,14 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.13 2001/06/01 00:44:55 bwelling Exp $
+# $Id: Makefile.in,v 1.14 2001/06/29 01:04:53 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 top_srcdir =	@top_srcdir@
 
+@BIND9_VERSION@
+
 @BIND9_INCLUDES@
 
 CINCLUDES =	${DNS_INCLUDES} ${ISCCFG_INCLUDES} ${ISC_INCLUDES}
@@ -52,6 +54,14 @@ MANOBJS =	${MANPAGES} ${HTMLPAGES}
 
 @BIND9_MAKE_RULES@
 
+named-checkconf.@O@: named-checkconf.c
+	${LIBTOOL} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
+		-c ${srcdir}/named-checkconf.c
+
+named-checkzone.@O@: named-checkzone.c
+	${LIBTOOL} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
+		-c ${srcdir}/named-checkzone.c
+
 named-checkconf: named-checkconf.@O@ check-tool.@O@ ${ISCDEPLIBS} ${ISCCFGDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ named-checkconf.@O@ \
 	check-tool.@O@ ${ISCCFGLIBS} ${ISCLIBS} ${LIBS}

bin/check/named-checkconf.8

@@ -19,7 +19,7 @@
 named-checkconf \- named configuration file syntax checking tool
 .SH SYNOPSIS
 .sp
-\fBnamed-checkconf\fR [ \fB-t \fIdirectory\fB\fR ]  \fBfilename\fR
+\fBnamed-checkconf\fR [ \fB-v\fR ]  [ \fB-t \fIdirectory\fB\fR ]  \fBfilename\fR
 .SH "DESCRIPTION"
 .PP
 \fBnamed-checkconf\fR checks the syntax, but not
@@ -31,6 +31,10 @@ chroot to \fIdirectory\fR so that include
 directives in the configuration file are processed as if
 run by a similarly chrooted named.
 .TP
+\fB-v\fR
+Print the version of the \fBnamed-checkconf\fR
+program and exit.
+.TP
 \fBfilename\fR
 The name of the configuration file to be checked. If not
 specified, it defaults to \fI/etc/named.conf\fR.

bin/check/named-checkconf.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named-checkconf.c,v 1.8 2001/05/18 23:50:04 gson Exp $ */
+/* $Id: named-checkconf.c,v 1.9 2001/06/29 01:04:55 gson Exp $ */
 
 #include <config.h>
 
@@ -40,7 +40,7 @@ isc_log_t *log = NULL;
 
 static void
 usage(void) {
-        fprintf(stderr, "usage: named-checkconf [-t directory] [named.conf]\n");
+        fprintf(stderr, "usage: named-checkconf [-v] [-t directory] [named.conf]\n");
         exit(1);
 }
 
@@ -78,7 +78,7 @@ main(int argc, char **argv) {
 	isc_mem_t *mctx = NULL;
 	isc_result_t result;
 
-	while ((c = isc_commandline_parse(argc, argv, "t:")) != EOF) {
+	while ((c = isc_commandline_parse(argc, argv, "t:v")) != EOF) {
 		switch (c) {
 		case 't':
 			result = isc_dir_chroot(isc_commandline_argument);
@@ -95,6 +95,10 @@ main(int argc, char **argv) {
 			}
 			break;
 
+		case 'v':
+			printf(VERSION "\n");
+			exit(0);
+
 		default:
 			usage();
 		}

bin/check/named-checkconf.docbook

@@ -16,7 +16,7 @@
  - WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named-checkconf.docbook,v 1.2 2001/04/10 21:50:19 bwelling Exp $ -->
+<!-- $Id: named-checkconf.docbook,v 1.3 2001/06/29 01:04:56 gson Exp $ -->
 
 <refentry>
   <refentryinfo>
@@ -37,6 +37,7 @@
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>named-checkconf</command>
+      <arg><option>-v</option></arg>
       <arg><option>-t <replaceable class="parameter">directory</replaceable></option></arg>
       <arg choice="req">filename</arg>
     </cmdsynopsis>
@@ -65,6 +66,16 @@
 	</listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term>-v</term>
+	<listitem>
+	  <para>
+	      Print the version of the <command>named-checkconf</command>
+	      program and exit.
+	  </para>
+	</listitem>
+      </varlistentry>
+
       <varlistentry>
         <term>filename</term>
 	<listitem>

bin/check/named-checkconf.html

@@ -61,6 +61,9 @@ CLASS="COMMAND"
 >named-checkconf</B
 >  [<TT
 CLASS="OPTION"
+>-v</TT
+>] [<TT
+CLASS="OPTION"
 >-t <TT
 CLASS="REPLACEABLE"
 ><I
@@ -72,7 +75,7 @@ CLASS="REPLACEABLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20"
+NAME="AEN22"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -87,7 +90,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN24"
+NAME="AEN26"
 ></A
 ><H2
 >OPTIONS</H2
@@ -114,6 +117,17 @@ CLASS="FILENAME"
 	  </P
 ></DD
 ><DT
+>-v</DT
+><DD
+><P
+>	      Print the version of the <B
+CLASS="COMMAND"
+>named-checkconf</B
+>
+	      program and exit.
+	  </P
+></DD
+><DT
 >filename</DT
 ><DD
 ><P
@@ -130,7 +144,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN38"
+NAME="AEN45"
 ></A
 ><H2
 >RETURN VALUES</H2
@@ -145,7 +159,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN42"
+NAME="AEN49"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -166,7 +180,7 @@ CLASS="CITETITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49"
+NAME="AEN56"
 ></A
 ><H2
 >AUTHOR</H2

bin/check/named-checkzone.8

@@ -19,7 +19,7 @@
 named-checkzone \- zone file validity checking tool
 .SH SYNOPSIS
 .sp
-\fBnamed-checkzone\fR [ \fB-d\fR ]  [ \fB-q\fR ]  [ \fB-c \fIclass\fB\fR ]  \fBzonename\fR \fBfilename\fR
+\fBnamed-checkzone\fR [ \fB-d\fR ]  [ \fB-q\fR ]  [ \fB-v\fR ]  [ \fB-c \fIclass\fB\fR ]  \fBzonename\fR \fBfilename\fR
 .SH "DESCRIPTION"
 .PP
 \fBnamed-checkzone\fR checks the syntax and integrity of
@@ -35,6 +35,10 @@ Enable debugging.
 \fB-q\fR
 Quiet mode - exit code only.
 .TP
+\fB-v\fR
+Print the version of the \fBnamed-checkzone\fR
+program and exit.
+.TP
 \fB-c \fIclass\fB\fR
 Specify the class of the zone. If not specified "IN" is assumed.
 .TP

bin/check/named-checkzone.c

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named-checkzone.c,v 1.12 2001/03/03 23:11:36 bwelling Exp $ */
+/* $Id: named-checkzone.c,v 1.13 2001/06/29 01:04:59 gson Exp $ */
 
 #include <config.h>
 
@@ -61,7 +61,7 @@ static const char *dbtype[] = { "rbt" };
 static void
 usage(void) {
 	fprintf(stderr,
-		"usage: named-checkzone [-dq] [-c class] zonename filename\n");
+		"usage: named-checkzone [-dqv] [-c class] zonename filename \n");
 	exit(1);
 }
 
@@ -128,7 +128,7 @@ main(int argc, char **argv) {
 	char classname_in[] = "IN";
 	char *classname = classname_in;
 
-	while ((c = isc_commandline_parse(argc, argv, "c:dqs")) != EOF) {
+	while ((c = isc_commandline_parse(argc, argv, "c:dqsv")) != EOF) {
 		switch (c) {
 		case 'c':
 			classname = isc_commandline_argument;
@@ -139,6 +139,9 @@ main(int argc, char **argv) {
 		case 'q':
 			quiet++;
 			break;
+		case 'v':
+			printf(VERSION "\n");
+			exit(0);
 		default:
 			usage();
 		}

bin/check/named-checkzone.docbook

@@ -16,7 +16,7 @@
  - WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named-checkzone.docbook,v 1.2 2001/04/10 21:50:22 bwelling Exp $ -->
+<!-- $Id: named-checkzone.docbook,v 1.3 2001/06/29 01:05:00 gson Exp $ -->
 
 <refentry>
   <refentryinfo>
@@ -39,6 +39,7 @@
       <command>named-checkzone</command>
       <arg><option>-d</option></arg>
       <arg><option>-q</option></arg>
+      <arg><option>-v</option></arg>
       <arg><option>-c <replaceable class="parameter">class</replaceable></option></arg>
       <arg choice="req">zonename</arg>
       <arg choice="req">filename</arg>
@@ -78,6 +79,16 @@
 	</listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term>-v</term>
+	<listitem>
+	  <para>
+	      Print the version of the <command>named-checkzone</command>
+	      program and exit.
+	  </para>
+	</listitem>
+      </varlistentry>
+
       <varlistentry>
         <term>-c <replaceable class="parameter">class</replaceable></term>
 	<listitem>

bin/check/named-checkzone.html

@@ -67,6 +67,9 @@ CLASS="OPTION"
 >-q</TT
 >] [<TT
 CLASS="OPTION"
+>-v</TT
+>] [<TT
+CLASS="OPTION"
 >-c <TT
 CLASS="REPLACEABLE"
 ><I
@@ -78,7 +81,7 @@ CLASS="REPLACEABLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN25"
+NAME="AEN27"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -102,7 +105,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN31"
+NAME="AEN33"
 ></A
 ><H2
 >OPTIONS</H2
@@ -126,6 +129,17 @@ CLASS="VARIABLELIST"
 	  </P
 ></DD
 ><DT
+>-v</DT
+><DD
+><P
+>	      Print the version of the <B
+CLASS="COMMAND"
+>named-checkzone</B
+>
+	      program and exit.
+	  </P
+></DD
+><DT
 >-c <TT
 CLASS="REPLACEABLE"
 ><I
@@ -157,7 +171,7 @@ CLASS="REPLACEABLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN55"
+NAME="AEN62"
 ></A
 ><H2
 >RETURN VALUES</H2
@@ -172,7 +186,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN59"
+NAME="AEN66"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -197,7 +211,7 @@ CLASS="CITETITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67"
+NAME="AEN74"
 ></A
 ><H2
 >AUTHOR</H2