From 0b0a1399fa462bcbc5897019f55c2b784bb0c770 Mon Sep 17 00:00:00 2001 From: Shawn Routhier Date: Wed, 1 Jun 2016 10:25:08 -0700 Subject: [PATCH] [master] Fix copy and paste error to use remote id instead of circuit id Squashed commit of the following: commit 0f8b7fe0a421e3c46ffff69ac0fe47804fc663ec Author: Shawn Routhier Date: Wed Jun 1 09:53:11 2016 -0700 [rt42556] Fix copy and paste error to use remote id instead of circuit id --- RELNOTES | 4 ++++ relay/dhcrelay.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/RELNOTES b/RELNOTES index 89070169..0c20cea8 100644 --- a/RELNOTES +++ b/RELNOTES @@ -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 diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c index 5ecd2656..2723356b 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c @@ -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 */ }