- A bug was fixed where the nwip virtual option space was referencing

  the fqdn option's virtual option space's option cache. [ISC-Bugs #16801]

diff --git a/RELNOTES b/RELNOTES
index 62fc6cd06a3a42e35b7ed06269d8dbf364292158..ed2edfd2ff28cb225fd55d8b822f90fa34e37de9 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -221,6 +221,9 @@ the README file.
   copy written to persistent storage was actually the contents of the
   'file' field.
 
+- A bug was fixed where the nwip virtual option space was referencing
+  the fqdn option's virtual option space's option cache.
+
                        Changes since 3.0.5rc1
 
 - A bug was repaired in fixes to the dhclient, which sought to run the

diff --git a/common/options.c b/common/options.c
index 4b7aa35fe2d55aee27eafd5f10f4464b4be188dd..85afba7bc6bea5b513195180391ca79fbe32a92a 100644 (file)
--- a/common/options.c
+++ b/common/options.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: options.c,v 1.103 2007/01/29 10:25:54 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: options.c,v 1.104 2007/04/11 02:04:39 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #define DHCP_OPTION_DATA
@@ -2315,7 +2315,7 @@ int nwip_option_space_encapsulate (result, packet, lease, client_state,
        if (universe -> index >= cfg_options -> universe_count)
                return 0;
        head = ((struct option_chain_head *)
-               cfg_options -> universes [fqdn_universe.index]);
+               cfg_options -> universes [nwip_universe.index]);
        if (!head)
                return 0;