Make "rrset-order fixed" a compile-time option. settable by

"./configure --enable-fixed-rrset". Disabled by default. [rt17977]

diff --git a/CHANGES b/CHANGES
index d5f61475705681a7fcb44f75a132d2e367f45291..cd59c165c2beb913e30fad13cbf58022e1650586 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2362.   [cleanup]       Make "rrset-order fixed" a compile-time option.
+                        settable by "./configure --enable-fixed-rrset".
+                        Disabled by default. [rt17977]
+
 2361.  [bug]           "recursion" statistics counter could be counted
                        multiple times for a single query.  [RT #17990]
 

diff --git a/config.h.in b/config.h.in
index 0adc500433e24fbf2b4f8b77ea3c3a48ebab228a..fb320c27cfd6e0c523d384192742ce361c726877 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.in,v 1.90.60.5 2008/01/30 04:57:30 marka Exp $ */
+/* $Id: config.h.in,v 1.90.60.6 2008/04/23 21:43:57 each Exp $ */
 
 /*! \file */
 
@@ -326,3 +326,6 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define to empty if the keyword `volatile' does not work. Warning: valid
    code using `volatile' can become incorrect without. Disable with care. */
 #undef volatile
+
+/* Define to enable "rrset-order fixed" syntax. */
+#undef DNS_RDATASET_FIXED

diff --git a/configure b/configure
index ca2c5308691380868b027dd3820e6071d5776cd4..d6f3b3234eb113b329bf797dffffadb4b558d399 100755 (executable)
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: configure,v 1.418.60.5 2008/01/30 04:57:27 marka Exp $
+# $Id: configure,v 1.418.60.6 2008/04/23 21:44:52 each Exp $
 #
 # Portions Copyright (C) 1996-2001  Nominum, Inc.
 #
@@ -29,7 +29,7 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# From configure.in Revision: 1.432.60.6 .
+# From configure.in Revision: 1.432.60.7 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -1638,6 +1638,8 @@ Optional Features:
   --disable-linux-caps disable linux capabilities
   --enable-atomic      enable machine specific atomic operations
                        [default=autodetect]
+  --enable-fixed-rrset        enable fixed rrset ordering
+                       [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -9581,7 +9583,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 9584 "configure"' > conftest.$ac_ext
+  echo '#line 9586 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -11703,11 +11705,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11706: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11708: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11710: \$? = $ac_status" >&5
+   echo "$as_me:11712: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -11946,11 +11948,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11949: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11951: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11953: \$? = $ac_status" >&5
+   echo "$as_me:11955: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -12006,11 +12008,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12009: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12011: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12013: \$? = $ac_status" >&5
+   echo "$as_me:12015: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14154,7 +14156,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14157 "configure"
+#line 14159 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14252,7 +14254,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14255 "configure"
+#line 14257 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16445,11 +16447,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16448: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16450: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16452: \$? = $ac_status" >&5
+   echo "$as_me:16454: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -16505,11 +16507,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16508: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16510: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16512: \$? = $ac_status" >&5
+   echo "$as_me:16514: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17833,7 +17835,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17836 "configure"
+#line 17838 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17931,7 +17933,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17934 "configure"
+#line 17936 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18768,11 +18770,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18771: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18773: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18775: \$? = $ac_status" >&5
+   echo "$as_me:18777: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -18828,11 +18830,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18831: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18833: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18835: \$? = $ac_status" >&5
+   echo "$as_me:18837: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20862,11 +20864,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20865: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20867: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:20869: \$? = $ac_status" >&5
+   echo "$as_me:20871: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -21105,11 +21107,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21108: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:21110: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:21112: \$? = $ac_status" >&5
+   echo "$as_me:21114: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -21165,11 +21167,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21168: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:21170: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:21172: \$? = $ac_status" >&5
+   echo "$as_me:21174: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -23313,7 +23315,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 23316 "configure"
+#line 23318 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -23411,7 +23413,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 23414 "configure"
+#line 23416 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -29307,6 +29309,30 @@ fi
 ISC_ARCH_DIR=$arch
 
 
+#
+# Activate "rrset-order fixed" or not?
+#
+# Check whether --enable-fixed-rrset was given.
+if test "${enable_fixed_rrset+set}" = set; then
+  enableval=$enable_fixed_rrset; enable_fixed="$enableval"
+else
+  enable_fixed="no"
+fi
+
+case "$enable_fixed" in
+       yes)
+
+cat >>confdefs.h <<\_ACEOF
+#define DNS_RDATASET_FIXED 1
+_ACEOF
+
+               ;;
+       no)
+               ;;
+       *)
+               ;;
+esac
+
 #
 #  The following sets up how non-blocking i/o is established.
 #  Sunos, cygwin and solaris 2.x (x<5) require special handling.

diff --git a/configure.in b/configure.in
index 599b1898a8bc908f54ce6c1f02c76426ba9cbf6b..92c3650753e762b4fb77a3e73e164da4cadaaa20 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.432.60.6 $)
+AC_REVISION($Revision: 1.432.60.7 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -2254,6 +2254,25 @@ AC_SUBST(ISC_PLATFORM_USEMACASM)
 ISC_ARCH_DIR=$arch
 AC_SUBST(ISC_ARCH_DIR)
 
+#
+# Activate "rrset-order fixed" or not?
+#
+AC_ARG_ENABLE(fixed-rrset,
+       [  --enable-fixed-rrset        enable fixed rrset ordering
+                       [[default=no]]],
+                       enable_fixed="$enableval",
+                       enable_fixed="no")
+case "$enable_fixed" in
+       yes)
+               AC_DEFINE(DNS_RDATASET_FIXED, 1,
+                          [Define to enable "rrset-order fixed" syntax.])
+               ;;
+       no)
+               ;;
+       *)
+               ;;
+esac
+
 #
 #  The following sets up how non-blocking i/o is established.
 #  Sunos, cygwin and solaris 2.x (x<5) require special handling.

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index e689836c34b4e1707047ab246d423a81ff360a8b..d06afbda66ae43727df0de462be5ca17401b9ad4 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.86.10.3 2008/03/29 23:46:40 tbox Exp $ */
+/* $Id: check.c,v 1.86.10.4 2008/04/23 21:43:57 each Exp $ */
 
 /*! \file */
 
@@ -46,10 +46,6 @@
 
 #include <bind9/check.h>
 
-#ifndef DNS_RDATASET_FIXED
-#define DNS_RDATASET_FIXED 1
-#endif
-
 static void
 freekey(char *key, unsigned int type, isc_symvalue_t value, void *userarg) {
        UNUSED(type);
@@ -128,7 +124,8 @@ check_orderent(const cfg_obj_t *ent, isc_log_t *logctx) {
        } else if (strcasecmp(cfg_obj_asstring(obj), "fixed") == 0) {
 #if !DNS_RDATASET_FIXED
                cfg_obj_log(obj, logctx, ISC_LOG_WARNING,
-                           "rrset-order: order 'fixed' not fully implemented");
+                           "rrset-order: order 'fixed' was disabled at "
+                           "compilation time");
 #endif
        } else if (strcasecmp(cfg_obj_asstring(obj), "random") != 0 &&
                   strcasecmp(cfg_obj_asstring(obj), "cyclic") != 0) {

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 79bd64378e28b1c60dd0480db410a4df2171c2b9..f6196142c7c3972ed7c9aaddd1f4d0d5621365ca 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.248.12.6 2008/04/03 06:10:19 marka Exp $ */
+/* $Id: rbtdb.c,v 1.248.12.7 2008/04/23 21:43:58 each Exp $ */
 
 /*! \file */
 
@@ -182,10 +182,6 @@ typedef isc_mutex_t nodelock_t;
 #define NODE_WEAKDOWNGRADE(l)   ((void)0)
 #endif
 
-#ifndef DNS_RDATASET_FIXED
-#define DNS_RDATASET_FIXED 1
-#endif
-
 /*
  * Allow clients with a virtual time of up to 5 minutes in the past to see
  * records that would have otherwise have expired.

diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index 6de77bac8d01679a26539173dacfe028153d00b9..6d49aa66865287b90ae1db9c1b55fb136d0df554 100644 (file)
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataslab.c,v 1.43 2007/06/18 23:47:41 tbox Exp $ */
+/* $Id: rdataslab.c,v 1.43.128.1 2008/04/23 21:43:58 each Exp $ */
 
 /*! \file */
 
@@ -33,10 +33,6 @@
 #include <dns/rdataset.h>
 #include <dns/rdataslab.h>
 
-#ifndef DNS_RDATASET_FIXED
-#define DNS_RDATASET_FIXED 1
-#endif
-
 /*
  * The rdataslab structure allows iteration to occur in both load order
  * and DNSSEC order.  The structure is as follows:
@@ -799,8 +795,8 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab,
 #if DNS_RDATASET_FIXED
        unsigned char *offsetbase;
        unsigned int *offsettable;
-#endif
        unsigned int order;
+#endif
 
        REQUIRE(tslabp != NULL && *tslabp == NULL);
        REQUIRE(mslab != NULL && sslab != NULL);