Fix error in sortlist code -- was using the wrong nest level, which

caused the response-order ACL to be merged into a single iptable and
lose its ordering. [rt17216]

diff --git a/CHANGES b/CHANGES
index 760c5de8aa50d950001e061e6b8ff1f8a10e1a31..eef76e23ae69daff823a018cd65b2009dc8609f1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
        --- 9.5.0a7 released ---
 
-2252.   [bug]           Fixed memory leaks in sortlist code [RT #17216]
+2252.   [bug]           Fixed errors in sortlist code [RT #17216]
 
 2251.  [placeholder]
 

diff --git a/bin/named/server.c b/bin/named/server.c
index 0a934c7ee51d19cfe2e92cd419738bd47fdc15f3..9db20759482753ee582e1402ebf7c55b159d137f 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.491 2007/09/26 03:22:43 marka Exp $ */
+/* $Id: server.c,v 1.492 2007/10/18 01:37:49 each Exp $ */
 
 /*! \file */
 
@@ -345,13 +345,13 @@ configure_view_sortlist(const cfg_obj_t *vconfig, const cfg_obj_t *config,
                return (ISC_R_SUCCESS);
 
         /*
-         * Use a nest level of 2 for the "top level" of the sortlist;
-         * this means each entry in the top two levels will be stored as
-         * lists of separate, nested ACLs, rather than merged together
+         * Use a nest level of 3 for the "top level" of the sortlist;
+         * this means each entry in the top three levels will be stored
+         * as lists of separate, nested ACLs, rather than merged together
          * into IP tables as is usually done with ACLs.
          */
        result = cfg_acl_fromconfig(aclobj, config, ns_g_lctx,
-                                   actx, mctx, 2, aclp);
+                                   actx, mctx, 3, aclp);
 
        return (result);
 }