mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-22 09:57:20 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
[ISC-Bugs #16480]
This commit is contained in:
David Hankins 2006-11-09 22:08:28 +00:00
parent c1e6c8329f
commit a7ee93fe57
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELNOTES
View File

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

7
common/options.c
View File

@ -34,7 +34,7 @@
#ifndef lint #ifndef lint
static char copyright[] = 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 */ #endif /* not lint */
#define DHCP_OPTION_DATA #define DHCP_OPTION_DATA
@ -2232,8 +2232,9 @@ int option_space_encapsulate (result, packet, lease, client_state,
*/ */
memset(&sub, 0, sizeof(sub)); memset(&sub, 0, sizeof(sub));
for (i = 0 ; i < cfg_options->universe_count ; i++) { for (i = 0 ; i < cfg_options->universe_count ; i++) {
subu = cfg_options->universes[i]; subu = universes[i];
if (subu != NULL && subu->enc_opt != NULL && if (cfg_options->universes[i] != NULL &&
subu->enc_opt != NULL &&
subu->enc_opt->universe == u && subu->enc_opt->universe == u &&
subu->enc_opt->format != NULL && subu->enc_opt->format != NULL &&
subu->enc_opt->format[0] == 'E' && subu->enc_opt->format[0] == 'E' &&