pullup:

1120.   [bug]           Errors in options were not fatal. [RT #2002]

diff --git a/CHANGES b/CHANGES
index b35af61d0ac5a691b388b0ef628e374b561b9bcf..badd9cd350e5cdbfe8b31e061c0d2e824ddbfdc6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1120.  [bug]           Errors in options were not fatal. [RT #2002]
+
 1118.  [bug]           On multithreaded servers, a race condition
                        could cause an assertion failure in resolver.c
                        during resolver shutdown. [RT #2029]

diff --git a/lib/isccfg/check.c b/lib/isccfg/check.c
index 061b4179a4857ae4a914671072040cd5c8baf149..5dd87d03fbcaa970758095527e87b07724c13f82 100644 (file)
--- a/lib/isccfg/check.c
+++ b/lib/isccfg/check.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.14.2.5 2001/10/29 20:18:48 gson Exp $ */
+/* $Id: check.c,v 1.14.2.6 2001/11/13 18:36:04 gson Exp $ */
 
 #include <config.h>
 
@@ -447,8 +447,9 @@ cfg_check_namedconf(cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
 
        (void)cfg_map_get(config, "options", &options);
 
-       if (options != NULL)
-               check_options(options, logctx);
+       if (options != NULL &&
+           check_options(options, logctx) != ISC_R_SUCCESS)
+               result = ISC_R_FAILURE;
 
        (void)cfg_map_get(config, "view", &views);