2431. [bug] Acl processing could leak memory. [RT #18323]

diff --git a/CHANGES b/CHANGES
index eafe6370a5377e4a0033526ee9a394791b63fd91..91b5bc6422d8d9ccac6e5213865a1a6a4ea562e4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2431.  [bug]           Acl processing could leak memory. [RT #18323]
+
 2430.  [bug]           win32: isc_interval_set() could round down to
                        zero if the input was less than NS_INTERVAL
                        nanoseconds.  Round up instead. [RT #18549]

diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index 6fb2f2657587dd98dd665f2d8b31ad30b62703d9..ead4a70f9ac5f54adc23e1a8367274184188edcb 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.20 2008/07/19 00:09:44 each Exp $ */
+/* $Id: aclconf.c,v 1.21 2008/09/01 05:36:00 marka Exp $ */
 
 #include <config.h>
 
@@ -175,7 +175,6 @@ cfg_acl_fromconfig(const cfg_obj_t *caml,
        const cfg_listelt_t *elt;
        dns_iptable_t *iptab;
        int new_nest_level = 0;
-       int nelem;
 
        if (nest_level != 0)
                new_nest_level = nest_level - 1;
@@ -207,8 +206,6 @@ cfg_acl_fromconfig(const cfg_obj_t *caml,
                        return (result);
        }
 
-       nelem = cfg_list_length(caml, ISC_FALSE);
-
        de = dacl->elements;
        for (elt = cfg_list_first(caml);
             elt != NULL;
@@ -354,16 +351,6 @@ nested_acl:
                                if (result != ISC_R_SUCCESS)
                                        goto cleanup;
 
-                               /*
-                                * There was only one element and it was
-                                * a nested named ACL; attach it to the
-                                * target and let's go home.
-                                */
-                               if (nelem == 1) {
-                                       dns_acl_attach(inneracl, target);
-                                       goto cleanup;
-                               }
-
                                goto nested_acl;
                        }
                } else {