[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

diff --git a/RELNOTES b/RELNOTES
index 8907016915dfe55bac9976560df9cc91923f7411..0c20cea8aaef27bdfcee104e6807d42f4ff72197 100644 (file)
--- 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 5ecd26567d53d81e926c998a548d6b86dd212571..2723356ba55124647fb15c34b71011b9b9056405 100644 (file)
--- 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 */
        }