Commit e9359db5 authored by Mark Andrews's avatar Mark Andrews
Browse files

use -j rather than -m to read the journal if it exists.

parent ba06508f
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named-checkconf.c,v 1.24 2002/07/11 04:40:07 marka Exp $ */
/* $Id: named-checkconf.c,v 1.25 2002/07/11 04:49:24 marka Exp $ */
#include <config.h>
......@@ -198,13 +198,13 @@ main(int argc, char **argv) {
int exit_status = 0;
isc_boolean_t load_zones = ISC_FALSE;
while ((c = isc_commandline_parse(argc, argv, "dmt:vz")) != EOF) {
while ((c = isc_commandline_parse(argc, argv, "djt:vz")) != EOF) {
switch (c) {
case 'd':
debug++;
break;
case 'm':
case 'j':
nomerge = ISC_FALSE;
break;
......
......@@ -16,7 +16,7 @@
- WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: named-checkconf.docbook,v 1.5 2002/04/02 06:54:05 marka Exp $ -->
<!-- $Id: named-checkconf.docbook,v 1.6 2002/07/11 04:49:25 marka Exp $ -->
<refentry>
<refentryinfo>
......@@ -89,10 +89,10 @@
</varlistentry>
<varlistentry>
<term>-m</term>
<term>-j</term>
<listitem>
<para>
When loading a zonefile merge the journal if it exists.
When loading a zonefile read the journal if it exists.
</para>
</listitem>
</varlistentry>
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named-checkzone.c,v 1.21 2002/04/02 06:54:06 marka Exp $ */
/* $Id: named-checkzone.c,v 1.22 2002/07/11 04:49:26 marka Exp $ */
#include <config.h>
......@@ -81,7 +81,7 @@ main(int argc, char **argv) {
char *classname = classname_in;
const char *workdir = NULL;
while ((c = isc_commandline_parse(argc, argv, "c:dimqst:vw:")) != EOF) {
while ((c = isc_commandline_parse(argc, argv, "c:dijqst:vw:")) != EOF) {
switch (c) {
case 'c':
classname = isc_commandline_argument;
......@@ -91,7 +91,7 @@ main(int argc, char **argv) {
debug++;
break;
case 'm':
case 'j':
nomerge = ISC_FALSE;
break;
......
......@@ -16,7 +16,7 @@
- WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: named-checkzone.docbook,v 1.5 2002/04/02 06:54:07 marka Exp $ -->
<!-- $Id: named-checkzone.docbook,v 1.6 2002/07/11 04:49:27 marka Exp $ -->
<refentry>
<refentryinfo>
......@@ -93,10 +93,10 @@
</varlistentry>
<varlistentry>
<term>-m</term>
<term>-j</term>
<listitem>
<para>
When loading the zone file merge the journal if it exists.
When loading the zone file read the journal if it exists.
</para>
</listitem>
......
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