From: Evan Hunt <each@isc.org>
Date: Fri, 7 Mar 2014 23:59:55 +0000 (-0800)
Subject: [master] clarify error
X-Git-Tag: v9.10.0b2~40
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9ba2cef72dacb1dc1105415956e1c311ac25d02c;p=thirdparty%2Fbind9.git

[master] clarify error

3779.	[cleanup]	Clarify the error message when using an option
			that was not enabled at compile time. [RT #35504]
---

diff --git a/CHANGES b/CHANGES
index f56478cc0c8..eabccd045e6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3779.	[cleanup]	Clarify the error message when using an option
+			that was not enabled at compile time. [RT #35504]
+
 3778.	[bug]		Log a warning when the wrong address family is
 			used in "listen-on" or "listen-on-v6". [RT #17848]
 
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 145205202ef..3c4444d57ea 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -1306,8 +1306,9 @@ cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret)
 				       "not implemented", clause->name);
 
 		if ((clause->flags & CFG_CLAUSEFLAG_NOTCONFIGURED) != 0) {
-			cfg_parser_warning(pctx, 0, "option '%s' is not "
-					   "configured", clause->name);
+			cfg_parser_warning(pctx, 0, "option '%s' was not "
+					   "enabled at compile time",
+					   clause->name);
 			result = ISC_R_FAILURE;
 			goto cleanup;
 		}