pullup:

 401.   [bug]           Treat undefined acls as errors, rather than
                        warning and then later throwing an assertion.
                        [RT #252]

diff --git a/CHANGES b/CHANGES
index d5eb25c911a16977c09098950bca056d970e9398..7dad31768b98603a03da49b888811e5769ed6198 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+ 401.  [bug]           Treat undefined acls as errors, rather than
+                       warning and then later throwing an assertion.
+                       [RT #252]
+
  400.  [bug]           SIG(0) signing and verifying was done incorrectly.
                        [RT #249]
 

diff --git a/lib/dns/config/confparser.y b/lib/dns/config/confparser.y
index 25eaa572e39cd7390700d2331ba64550112dd474..8ffba577604620d81879426b8b233ac8cbe7b61e 100644 (file)
--- a/lib/dns/config/confparser.y
+++ b/lib/dns/config/confparser.y
@@ -16,7 +16,7 @@
  * SOFTWARE.
  */
 
-/* $Id: confparser.y,v 1.99.2.3 2000/07/26 22:32:23 gson Exp $ */
+/* $Id: confparser.y,v 1.99.2.4 2000/08/22 00:46:22 gson Exp $ */
 
 #include <config.h>
 
@@ -3154,10 +3154,10 @@ address_name: any_string
                        tmpres = dns_c_acltable_getacl(currcfg->acls,
                                                       $1, &acl);
                        if (tmpres == ISC_R_NOTFOUND) {
-                               parser_warning(ISC_FALSE,
-                                              "undefined acl '%s' "
-                                              "referenced", $1);
-                               elem = NULL;
+                               parser_error(ISC_FALSE,
+                                            "undefined acl '%s' "
+                                            "referenced", $1);
+                               YYABORT;
                        } else {
                                tmpres = dns_c_ipmatch_aclnew(currcfg->mem,
                                                              &elem, $1);