]>
Commit | Line | Data |
---|---|---|
d8feb2d7 SS |
1 | diff -up dhcp-4.3.1b1/client/dhclient.8.KrJcIv dhcp-4.3.1b1/client/dhclient.8 |
2 | --- dhcp-4.3.1b1/client/dhclient.8.KrJcIv 2014-07-10 17:39:25.852763873 +0200 | |
3 | +++ dhcp-4.3.1b1/client/dhclient.8 2014-07-10 17:54:26.841012988 +0200 | |
4 | @@ -458,6 +458,9 @@ used to construct a RFC4361 style client | |
5 | in the client's messages. This client id can be overridden by | |
6 | setting a client id in the configuration file. Overridding the | |
7 | client id in this fashion is discouraged. | |
8 | +This option is turned on by default, if you want to redefine or turn off | |
9 | +sending of client id, use send dhcp-client-identifier = "better identifier" | |
10 | +or send dhcp-client-identifier = "" in /etc/dhcp/dhclient.conf. | |
11 | .TP | |
12 | .BI \-I | |
13 | Use the standard DDNS scheme from RFCs 4701 & 4702. | |
14 | diff -up dhcp-4.3.1b1/client/dhclient.c.KrJcIv dhcp-4.3.1b1/client/dhclient.c | |
15 | --- dhcp-4.3.1b1/client/dhclient.c.KrJcIv 2014-07-10 17:54:26.829013157 +0200 | |
16 | +++ dhcp-4.3.1b1/client/dhclient.c 2014-07-10 17:55:50.155835918 +0200 | |
17 | @@ -73,7 +73,7 @@ struct sockaddr_in sockaddr_broadcast; | |
18 | struct in_addr giaddr; | |
19 | struct data_string default_duid; | |
20 | int duid_type = 0; | |
21 | -int duid_v4 = 0; | |
22 | +int duid_v4 = 1; | |
23 | int std_dhcid = 0; | |
24 | ||
25 | /* ASSERT_STATE() does nothing now; it used to be | |
26 | @@ -1301,7 +1301,7 @@ static void setup_ib_interface(struct in | |
27 | } | |
28 | ||
29 | /* No client ID specified */ | |
30 | - log_fatal("dhcp-client-identifier must be specified for InfiniBand"); | |
31 | + //log_fatal("dhcp-client-identifier must be specified for InfiniBand"); | |
32 | } | |
33 | ||
34 | /* Individual States: |