2281. [bug] Attempts to use undefined acls were not being logged.

                        [RT #17307]

diff --git a/CHANGES b/CHANGES
index f0298d76e06a4af804573370ba86e3fafee17c77..75785d52e1ce74b729bf4f54683be79b9850f2ec 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2281.  [bug]           Attempts to use undefined acls were not being logged.
+                       [RT #17307]
+
 2280.  [func]          Allow the experimental http server to be reached
                        over IPv6 as well as IPv4. [RT #17332]
 

diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index 398055b74a5a6d0e0e3cd0ef6e8447513767e16f..e99d98aedc40302a6a4d5b728b680bd58b11352a 100644 (file)
--- a/lib/isccfg/aclconf.c
+++ b/lib/isccfg/aclconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: aclconf.c,v 1.15 2007/11/19 23:13:28 each Exp $ */
+/* $Id: aclconf.c,v 1.16 2007/12/18 01:53:26 marka Exp $ */
 
 #include <config.h>
 
@@ -328,18 +328,16 @@ cfg_acl_fromconfig(const cfg_obj_t *caml,
                                de->type = dns_aclelementtype_localnets;
                                de->negative = neg;
                        } else {
-                               result = get_acl_def(cctx, name, NULL);
-                               if (result == ISC_R_SUCCESS) {
-                                       /* found it in acl definitions */
-                                       if (inneracl != NULL)
-                                               dns_acl_detach(&inneracl);
-                                       result = convert_named_acl(ce, cctx,
-                                                       lctx, ctx, mctx,
-                                                       (nest_level != 0)
-                                                         ?  (nest_level - 1)
-                                                         : 0,
-                                                       &inneracl);
-                               }
+                               int new_nest_level;
+                               if (inneracl != NULL)
+                                       dns_acl_detach(&inneracl);
+                               if (nest_level != 0)
+                                       new_nest_level = nest_level - 1;
+                               else
+                                       new_nest_level = 0;
+                               result = convert_named_acl(ce, cctx, lctx, ctx,
+                                                          mctx, new_nest_level,
+                                                          &inneracl);
                                if (result != ISC_R_SUCCESS)
                                        goto cleanup;