summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hankins <dhankins@isc.org>2007-04-11 02:06:57 +0000
committerDavid Hankins <dhankins@isc.org>2007-04-11 02:06:57 +0000
commit419ccda1ec3e76ddf0467c478dcab52b380a480f (patch)
treefc09c7862cbe4752c969528b465e18f12a2fdb52
parentde2874220f49ec69dbc9da2224bfebd3efde75b1 (diff)
downloadisc-dhcp-419ccda1ec3e76ddf0467c478dcab52b380a480f.tar.gz
- 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]
-rw-r--r--RELNOTES3
-rw-r--r--common/options.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/RELNOTES b/RELNOTES
index 15d93728..fe7a0106 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -106,6 +106,9 @@ and for prodding me into improving it.
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.5rc2
- Failover servers try harder to retransmit binding updates upon entering
diff --git a/common/options.c b/common/options.c
index c11df0aa..792c7eb5 100644
--- a/common/options.c
+++ b/common/options.c
@@ -34,7 +34,7 @@
#ifndef lint
static char copyright[] =
-"$Id: options.c,v 1.85.2.35 2007/01/29 10:41:01 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n";
+"$Id: options.c,v 1.85.2.36 2007/04/11 02:06:57 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */
#define DHCP_OPTION_DATA
@@ -2014,7 +2014,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;