Commit 2ca30c17 authored by Evan Hunt's avatar Evan Hunt
Browse files

Nested acls containing keys could trigger an assertion in acl.c. [rt18166]

parent 7ed4399c
2393. [bug] nested acls containing keys could trigger an
assertion in acl.c. [RT #18166]
2392. [bug] remove 'grep -q' from acl test script, some platforms
don't support it. [RT #18253]
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: aclconf.c,v 1.19 2008/05/21 23:47:01 tbox Exp $ */
/* $Id: aclconf.c,v 1.20 2008/07/19 00:09:44 each Exp $ */
#include <config.h>
......@@ -290,6 +290,7 @@ nested_acl:
} else {
dns_acl_merge(dacl, inneracl,
ISC_TF(!neg));
de += inneracl->length; /* elements added */
dns_acl_detach(&inneracl);
continue;
}
......
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