[v4_1_esv] 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 207f1b48343290b39a777c434b6e56e753c524a7..acc00abac082a2b8c4bf7463551394dbbf9be046 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -60,7 +60,9 @@ by Eric Young (eay@cryptsoft.com).
 
                        Changes since 4.1-ESV-R13
 
-
+- Correct error message in relay to use remote id length instead
+  of circuit id length.
+  [ISC-Bugs #42556]
 
                        Changes since 4.1-ESV-R13b1
 

diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index 18a03abc665f1154edd1a13324b1e5f7e41818fe..f52e64349cd0eff0aa68cbc8515c28130cb23686 100644 (file)
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -1108,7 +1108,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 */
        }