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

[master] Fix copy and paste error to use remote id instead of circuit id

Browse Source 
Squashed commit of the following:

commit 0f8b7fe0a421e3c46ffff69ac0fe47804fc663ec
Author: Shawn Routhier <sar@isc.org>
Date:   Wed Jun 1 09:53:11 2016 -0700

    [rt42556] Fix copy and paste error to use remote id instead of circuit id
This commit is contained in:
Shawn Routhier 2016-06-01 10:25:08 -07:00
parent 914c567d8e
commit 0b0a1399fa
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RELNOTES
View File

@ -57,6 +57,10 @@ by Eric Young (eay@cryptsoft.com).
- Fixed util/bindvar.sh error handling.
[ISC-Bugs #41973]
- Correct error message in relay to use remote id length instead
of circuit id length.
[ISC-Bugs #42556]
Changes since 4.3.4b1
- None

2
relay/dhcrelay.c
View File

@ -1174,7 +1174,7 @@ add_relay_agent_options(struct interface_info *ip, struct dhcp_packet *packet,
if (ip->remote_id) {
if (ip->remote_id_len > 255 || ip->remote_id_len < 1)
log_fatal("Remote ID length %d out of range [1-255] "
"on %s\n", ip->circuit_id_len, ip->name);
"on %s\n", ip->remote_id_len, ip->name);
optlen += ip->remote_id_len + 2; /* RAI_REMOTE_ID + len */
}