diff options
| author | jkim <jkim@FreeBSD.org> | 2006-07-03 22:05:38 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2006-07-03 22:05:38 +0000 |
| commit | 47919b584ba9f4b69650f676210268ff9990b140 (patch) | |
| tree | 73a12557efaa5dbbc1750e1a1d9ecb17e44c1cd1 /sbin/dhclient/dhclient.c | |
| parent | c2e8dadb45e2cea1a205d6aa482791723efd01c9 (diff) | |
| download | FreeBSD-src-47919b584ba9f4b69650f676210268ff9990b140.zip FreeBSD-src-47919b584ba9f4b69650f676210268ff9990b140.tar.gz | |
Send client identifier unconditionally. My ancient D-Link router response
with NACK if I don't set it. Setting 'option dhcp-client-identifier' is
alternative but it is inconvenient because I have to keep the list of
all MAC addresses. As bin/94743 pointed out, it is always sent from
Windows clients and I found Mac OS X does the same.
OK'd by: brooks
Diffstat (limited to 'sbin/dhclient/dhclient.c')
| -rw-r--r-- | sbin/dhclient/dhclient.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 05f99c8..ce40562 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1480,7 +1480,6 @@ make_discover(struct interface_info *ip, struct client_lease *lease) } } -#ifdef SEND_CLIENT_IDENTIFIER /* set unique client identifier */ char client_ident[sizeof(struct hardware)]; if (!options[DHO_DHCP_CLIENT_IDENTIFIER]) { @@ -1494,7 +1493,6 @@ make_discover(struct interface_info *ip, struct client_lease *lease) options[DHO_DHCP_CLIENT_IDENTIFIER]->buf_size = hwlen+1; options[DHO_DHCP_CLIENT_IDENTIFIER]->timeout = 0xFFFFFFFF; } -#endif /* Set up the option buffer... */ ip->client->packet_length = cons_options(NULL, &ip->client->packet, 0, @@ -1606,7 +1604,6 @@ make_request(struct interface_info *ip, struct client_lease * lease) } } -#ifdef SEND_CLIENT_IDENTIFIER /* set unique client identifier */ char client_ident[sizeof(struct hardware)]; if (!options[DHO_DHCP_CLIENT_IDENTIFIER]) { @@ -1620,7 +1617,6 @@ make_request(struct interface_info *ip, struct client_lease * lease) options[DHO_DHCP_CLIENT_IDENTIFIER]->buf_size = hwlen+1; options[DHO_DHCP_CLIENT_IDENTIFIER]->timeout = 0xFFFFFFFF; } -#endif /* Set up the option buffer... */ ip->client->packet_length = cons_options(NULL, &ip->client->packet, 0, |
