mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-29 13:28:14 +00:00
Code Issues Releases Wiki Activity

[master] Correct ordering for subnet mask and router and overload vs relay option

Browse Source 
Conflicts:
	RELNOTES
This commit is contained in:
Shawn Routhier 2014-04-28 16:15:36 -07:00
parent dceef8736e
commit 1be2ba154d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RELNOTES
View File

@ -84,6 +84,12 @@ by Eric Young (eay@cryptsoft.com).
heard from this partner) field when updating the state in failover. heard from this partner) field when updating the state in failover.
[ISC-Bugs #35549] [ISC-Bugs #35549]
- Modify the overload processing to allow space for the remote agent ID
[ISC-Bugs #35569]
Handle the ordering of the SUBNET_MASK option even if it is the last
option in the list.
[ISC-Bugs #24580]
Changes since 4.3.0rc1 Changes since 4.3.0rc1
- None - None

7
common/options.c
View File

@ -623,7 +623,10 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket,
* Set offsets for buffer data to be copied into filename * Set offsets for buffer data to be copied into filename
* and servername fields * and servername fields
*/ */
mb_max = mb_size; if (mb_size > agent_size)
mb_max = mb_size - agent_size;
else
mb_max = mb_size;
if (overload_avail & 1) { if (overload_avail & 1) {
of1 = mb_max; of1 = mb_max;
@ -1167,7 +1170,7 @@ store_options(int *ocount,
/* Eliminate duplicate options from the parameter request list. /* Eliminate duplicate options from the parameter request list.
* Enforce RFC-mandated ordering of options that are present. * Enforce RFC-mandated ordering of options that are present.
*/ */
for (i = 0; i < priority_len - 1; i++) { for (i = 0; i < priority_len; i++) {
/* Eliminate duplicates. */ /* Eliminate duplicates. */
tto = 0; tto = 0;
for (ix = i + 1; ix < priority_len + tto; ix++) { for (ix = i + 1; ix < priority_len + tto; ix++) {