From cb8fd52bbeaf40c9166a0144541c4ff2bafc2dd6 Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Sat, 1 Sep 2001 01:13:41 +0000
Subject: [PATCH] call the new option for setting the maximum journal size
 'max-journal-size', not 'journal-size', in the tradition of the historical
 option 'max-ixfr-log-size'

---
 CHANGES              | 2 +-
 bin/named/zoneconf.c | 6 +++---
 lib/isccfg/parser.c  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 81e90c654f..e6694d02f4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@
 
  971.	[func]		'try-edns' can be use to disable edns on all queries.
 
- 970.	[func]		'journal-size' can now be used to set a target
+ 970.	[func]		'max-journal-size' can now be used to set a target
 			size for a journal.
 
  969.	[func]		dig now supports the undocumented dig 8 feature
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 83b798bc55..34778e7628 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.88 2001/08/30 05:22:58 marka Exp $ */
+/* $Id: zoneconf.c,v 1.89 2001/09/01 01:13:39 gson Exp $ */
 
 #include <config.h>
 
@@ -478,7 +478,7 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
 		dns_zone_setidleout(zone, cfg_obj_asuint32(obj) * 60);
 
 		obj = NULL;
-		result =  ns_config_get(maps, "journal-size", &obj);
+		result =  ns_config_get(maps, "max-journal-size", &obj);
 		if (result == ISC_R_SUCCESS) {
 			dns_zone_setjournalsize(zone, -1);
 			if (cfg_obj_isstring(obj)) {
@@ -493,7 +493,7 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
 				if (value > ISC_UINT32_MAX/2) {
 					cfg_obj_log(obj, ns_g_lctx,
 						    ISC_LOG_ERROR,
-						    "'journal-size "
+						    "'max-journal-size "
                                     "%" ISC_PRINT_QUADFORMAT "d' is too large",
                                     value);
 					RETERR(ISC_R_RANGE);
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 3952f08d4b..320c52e21b 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parser.c,v 1.72 2001/08/30 05:52:18 marka Exp $ */
+/* $Id: parser.c,v 1.73 2001/09/01 01:13:41 gson Exp $ */
 
 #include <config.h>
 
@@ -950,7 +950,7 @@ zone_only_clauses[] = {
 	{ "file", &cfg_type_qstring, 0 },
 	{ "ixfr-base", &cfg_type_qstring, CFG_CLAUSEFLAG_OBSOLETE },
 	{ "ixfr-tmp-file", &cfg_type_qstring, CFG_CLAUSEFLAG_OBSOLETE },
-	{ "journal-size", &cfg_type_size, 0},
+	{ "max-journal-size", &cfg_type_size, 0},
 	{ "masters", &cfg_type_sockaddrkeylist, 0 },
 	{ "pubkey", &cfg_type_pubkey,
 	  CFG_CLAUSEFLAG_MULTI | CFG_CLAUSEFLAG_OBSOLETE },