From: David Hankins Date: Wed, 11 Apr 2007 02:04:39 +0000 (+0000) Subject: - A bug was fixed where the nwip virtual option space was referencing X-Git-Tag: v4_0_0a1~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ecde99a330157dafc43a7770b0eecf82b1779719;p=thirdparty%2Fdhcp.git - 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 62fc6cd06..ed2edfd2f 100644 --- 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 4b7aa35fe..85afba7bc 100644 --- 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;