Commit 3d78993c authored by Mark Andrews's avatar Mark Andrews
Browse files

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

                        [RT #17307]
parent f16fa4a8
2281. [bug] Attempts to use undefined acls were not being logged.
[RT #17307]
2280. [func] Allow the experimental http server to be reached 2280. [func] Allow the experimental http server to be reached
over IPv6 as well as IPv4. [RT #17332] over IPv6 as well as IPv4. [RT #17332]
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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> #include <config.h>
...@@ -328,18 +328,16 @@ cfg_acl_fromconfig(const cfg_obj_t *caml, ...@@ -328,18 +328,16 @@ cfg_acl_fromconfig(const cfg_obj_t *caml,
de->type = dns_aclelementtype_localnets; de->type = dns_aclelementtype_localnets;
de->negative = neg; de->negative = neg;
} else { } else {
result = get_acl_def(cctx, name, NULL); int new_nest_level;
if (result == ISC_R_SUCCESS) { if (inneracl != NULL)
/* found it in acl definitions */ dns_acl_detach(&inneracl);
if (inneracl != NULL) if (nest_level != 0)
dns_acl_detach(&inneracl); new_nest_level = nest_level - 1;
result = convert_named_acl(ce, cctx, else
lctx, ctx, mctx, new_nest_level = 0;
(nest_level != 0) result = convert_named_acl(ce, cctx, lctx, ctx,
? (nest_level - 1) mctx, new_nest_level,
: 0, &inneracl);
&inneracl);
}
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup; goto cleanup;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment