diff options
| author | David Hankins <dhankins@isc.org> | 2006-11-09 22:08:28 +0000 |
|---|---|---|
| committer | David Hankins <dhankins@isc.org> | 2006-11-09 22:08:28 +0000 |
| commit | a7ee93fe5715be458e80201b794fec30b9f937d3 (patch) | |
| tree | 66cf034584e34dce73ab78e10f7dc3f543e75df4 | |
| parent | c1e6c8329f41b05cdb065af0b20631fc6d33230b (diff) | |
| download | isc-dhcp-a7ee93fe5715be458e80201b794fec30b9f937d3.tar.gz | |
- A segfault bug in recursive encapsulation support has been corrected.
[ISC-Bugs #16480]
| -rw-r--r-- | RELNOTES | 2 | ||||
| -rw-r--r-- | common/options.c | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -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 c3a3fde2..2a1477df 100644 --- 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' && |