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

- A bug in dhclient was repaired which caused it to send parameter request

Browse Source 
lists of 55 bytes in length no matter how long the declared PRL was.
  [ISC-Bugs #16882]
This commit is contained in:
David Hankins
2007-05-21 18:16:54 +00:00
parent 3d1cf13dac
commit d6614ea2ee
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
RELNOTES
View File

@@ -158,6 +158,9 @@ suggested fixes to <dhcp-users@isc.org>.
- A bug was repaired in subencapsulation support, where spaces separated - A bug was repaired in subencapsulation support, where spaces separated
by empty spaces would not get included. by empty spaces would not get included.
- A bug in dhclient was repaired which caused it to send parameter request
lists of 55 bytes in length no matter how long the declared PRL was.
Changes since 3.1.0a3 Changes since 3.1.0a3
- Some spelling fixes. - Some spelling fixes.

7
client/dhclient.c
View File

@@ -32,7 +32,7 @@
#ifndef lint #ifndef lint
static char ocopyright[] = static char ocopyright[] =
"$Id: dhclient.c,v 1.150 2007/05/19 18:47:13 dhankins Exp $ Copyright (c) 2004-2007 Internet Systems Consortium. All rights reserved.\n"; "$Id: dhclient.c,v 1.151 2007/05/21 18:16:54 dhankins Exp $ Copyright (c) 2004-2007 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -2001,12 +2001,13 @@ void make_client_options (client, lease, type, sid, rip, prl, op)
if (!buffer_allocate (&bp, i, MDL)) if (!buffer_allocate (&bp, i, MDL))
log_error ("can't make parameter list buffer."); log_error ("can't make parameter list buffer.");
else { else {
unsigned code = DHO_DHCP_PARAMETER_REQUEST_LIST;
for (i = 0; prl [i]; i++) for (i = 0; prl [i]; i++)
bp -> data [i] = prl [i]; bp -> data [i] = prl [i];
i = DHO_DHCP_PARAMETER_REQUEST_LIST;
if (!(option_code_hash_lookup(&option, if (!(option_code_hash_lookup(&option,
dhcp_universe.code_hash, dhcp_universe.code_hash,
&i, 0, MDL) && &code, 0, MDL) &&
make_const_option_cache(&oc, &bp, NULL, i, make_const_option_cache(&oc, &bp, NULL, i,
option, MDL))) option, MDL)))
log_error ("can't make option cache"); log_error ("can't make option cache");