- A segfault bug in recursive encapsulation support has been corrected.

  [ISC-Bugs #16480]

diff --git a/RELNOTES b/RELNOTES
index a5905ac0e43c7dc763ca779f48d4b9a1230a1e9d..c3466a99f7a8637123d3655c12384182ccdeb4f0 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -57,6 +57,8 @@ the README file.
   runs to be skipped: it still governs the schedule, but every scheduled
   run will attempt balance.
 
+- A segfault bug in recursive encapsulation support has been corrected.
+
                        Changes since 3.0 (New Features)
 
 - A workaround for certain STSN servers that send a mangled domain-name

diff --git a/common/options.c b/common/options.c
index c3a3fde2349696d6afa76b25c239edd79cbd4b88..2a1477dff3cef0e14434221cf2c406a52db60676 100644 (file)
--- a/common/options.c
+++ b/common/options.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: options.c,v 1.100 2006/10/17 20:45:59 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: options.c,v 1.101 2006/11/09 22:08:28 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #define DHCP_OPTION_DATA
@@ -2232,8 +2232,9 @@ int option_space_encapsulate (result, packet, lease, client_state,
         */
        memset(&sub, 0, sizeof(sub));
        for (i = 0 ; i < cfg_options->universe_count ; i++) {
-               subu = cfg_options->universes[i];
-               if (subu != NULL && subu->enc_opt != NULL &&
+               subu = universes[i];
+               if (cfg_options->universes[i] != NULL &&
+                   subu->enc_opt != NULL &&
                    subu->enc_opt->universe == u &&
                    subu->enc_opt->format != NULL &&
                    subu->enc_opt->format[0] == 'E' &&