This is Joel's diff, extracted from the jumbo diff.

If there is an interface config but no "send client id" option, send the
default as the man page claims we would do.

This is OK florian, or if someone wants to give me an OK...

diff --git frontend.c frontend.c
index e4b2419c96a..4984cb63e06 100644
--- frontend.c
+++ frontend.c
@@ -949,6 +949,10 @@ build_packet(uint8_t message_type, char *if_name, uint32_t 
xid,
                        /* XXX check space */
                        memcpy(p, iface_conf->c_id, iface_conf->c_id_len);
                        p += iface_conf->c_id_len;
+               } else {
+                       memcpy(dhcp_client_id + 3, hw_address, 
sizeof(*hw_address));
+                       memcpy(p, dhcp_client_id, sizeof(dhcp_client_id));
+                       p += sizeof(dhcp_client_id);
                }
                if (iface_conf->vc_id_len > 0) {
                        /* XXX check space */

-- 
I'm not entirely sure you are real.

Reply via email to