Commit 0b0a1399 authored by Shawn Routhier's avatar Shawn Routhier
Browse files

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

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
parent 914c567d
...@@ -57,6 +57,10 @@ by Eric Young (eay@cryptsoft.com). ...@@ -57,6 +57,10 @@ by Eric Young (eay@cryptsoft.com).
- Fixed util/bindvar.sh error handling. - Fixed util/bindvar.sh error handling.
[ISC-Bugs #41973] [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 Changes since 4.3.4b1
- None - None
......
...@@ -1174,7 +1174,7 @@ add_relay_agent_options(struct interface_info *ip, struct dhcp_packet *packet, ...@@ -1174,7 +1174,7 @@ add_relay_agent_options(struct interface_info *ip, struct dhcp_packet *packet,
if (ip->remote_id) { if (ip->remote_id) {
if (ip->remote_id_len > 255 || ip->remote_id_len < 1) if (ip->remote_id_len > 255 || ip->remote_id_len < 1)
log_fatal("Remote ID length %d out of range [1-255] " 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 */ optlen += ip->remote_id_len + 2; /* RAI_REMOTE_ID + len */
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment