1 diff -up dhcp-4.3.1b1/client/dhc6.c.mRfpsB dhcp-4.3.1b1/client/dhc6.c
2 --- dhcp-4.3.1b1/client/dhc6.c.mRfpsB 2014-07-10 17:48:03.779424870 +0200
3 +++ dhcp-4.3.1b1/client/dhc6.c 2014-07-10 17:48:03.795424644 +0200
4 @@ -5088,7 +5088,8 @@ make_client6_options(struct client_state
6 if ((oc = lookup_option(&dhcpv6_universe, *op,
7 D6O_CLIENTID)) == NULL) {
8 - if (!option_cache(&oc, &default_duid, NULL, clientid_option,
9 + if (default_duid.len == 0 ||
10 + !option_cache(&oc, &default_duid, NULL, clientid_option,
12 log_fatal("Failure assembling a DUID.");
14 diff -up dhcp-4.3.1b1/client/dhclient.c.mRfpsB dhcp-4.3.1b1/client/dhclient.c
15 --- dhcp-4.3.1b1/client/dhclient.c.mRfpsB 2014-07-10 17:39:25.853763858 +0200
16 +++ dhcp-4.3.1b1/client/dhclient.c 2014-07-10 17:49:49.882925843 +0200
17 @@ -948,8 +948,8 @@ main(int argc, char **argv) {
18 if (default_duid.buffer != NULL)
19 data_string_forget(&default_duid, MDL);
21 - form_duid(&default_duid, MDL);
22 - write_duid(&default_duid);
23 + if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS)
24 + write_duid(&default_duid);
28 @@ -3267,7 +3267,7 @@ write_options(struct client_state *clien
29 * is not how it is intended. Upcoming rearchitecting the client should
30 * address this "one daemon model."
34 form_duid(struct data_string *duid, const char *file, int line)
36 struct interface_info *ip;
37 @@ -3280,6 +3280,15 @@ form_duid(struct data_string *duid, cons
39 log_fatal("Impossible condition at %s:%d.", MDL);
41 + while (ip && ip->hw_address.hbuf[0] == HTYPE_RESERVED) {
42 + /* Try the other interfaces */
43 + log_debug("Cannot form default DUID from interface %s.", ip->name);
47 + return ISC_R_UNEXPECTED;
50 if ((ip->hw_address.hlen == 0) ||
51 (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf)))
52 log_fatal("Impossible hardware address length at %s:%d.", MDL);
53 @@ -3323,6 +3332,8 @@ form_duid(struct data_string *duid, cons
54 log_info("Created duid %s.", str);
58 + return ISC_R_SUCCESS;
61 /* Write the default DUID to the lease store. */
62 diff -up dhcp-4.3.1b1/common/bpf.c.mRfpsB dhcp-4.3.1b1/common/bpf.c
63 --- dhcp-4.3.1b1/common/bpf.c.mRfpsB 2014-07-10 17:39:25.797764653 +0200
64 +++ dhcp-4.3.1b1/common/bpf.c 2014-07-10 17:48:03.797424616 +0200
65 @@ -600,6 +600,22 @@ get_hw_addr(const char *name, struct har
66 memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen);
71 + if (local_family != AF_INET6)
72 + log_fatal("Unsupported device type %d for \"%s\"",
73 + sa->sdl_type, name);
75 + hw->hbuf[0] = HTYPE_RESERVED;
76 + /* 0xdeadbeef should never occur on the wire,
77 + * and is a signature that something went wrong.
86 log_fatal("Unsupported device type %d for \"%s\"",
88 diff -up dhcp-4.3.1b1/common/lpf.c.mRfpsB dhcp-4.3.1b1/common/lpf.c
89 --- dhcp-4.3.1b1/common/lpf.c.mRfpsB 2014-07-10 17:39:25.744765404 +0200
90 +++ dhcp-4.3.1b1/common/lpf.c 2014-07-10 17:48:03.797424616 +0200
91 @@ -511,6 +511,22 @@ get_hw_addr(const char *name, struct har
92 hw->hbuf[0] = HTYPE_FDDI;
93 memcpy(&hw->hbuf[1], sa->sa_data, 6);
95 +#if defined(ARPHRD_PPP)
97 + if (local_family != AF_INET6)
98 + log_fatal("Unsupported device type %d for \"%s\"",
99 + sa->sa_family, name);
101 + hw->hbuf[0] = HTYPE_RESERVED;
102 + /* 0xdeadbeef should never occur on the wire,
103 + * and is a signature that something went wrong.
105 + hw->hbuf[1] = 0xde;
106 + hw->hbuf[2] = 0xad;
107 + hw->hbuf[3] = 0xbe;
108 + hw->hbuf[4] = 0xef;
112 log_fatal("Unsupported device type %ld for \"%s\"",
113 (long int)sa->sa_family, name);
114 diff -up dhcp-4.3.1b1/includes/dhcpd.h.mRfpsB dhcp-4.3.1b1/includes/dhcpd.h
115 --- dhcp-4.3.1b1/includes/dhcpd.h.mRfpsB 2014-07-10 17:48:03.761425124 +0200
116 +++ dhcp-4.3.1b1/includes/dhcpd.h 2014-07-10 17:48:03.798424601 +0200
117 @@ -2839,7 +2839,7 @@ void client_dns_remove(struct client_sta
119 void dhcpv4_client_assignments(void);
120 void dhcpv6_client_assignments(void);
121 -void form_duid(struct data_string *duid, const char *file, int line);
122 +isc_result_t form_duid(struct data_string *duid, const char *file, int line);
125 void dhc6_lease_destroy(struct dhc6_lease **src, const char *file, int line);
126 diff -up dhcp-4.3.1b1/includes/dhcp.h.mRfpsB dhcp-4.3.1b1/includes/dhcp.h
127 --- dhcp-4.3.1b1/includes/dhcp.h.mRfpsB 2014-07-10 17:48:03.761425124 +0200
128 +++ dhcp-4.3.1b1/includes/dhcp.h 2014-07-10 17:48:03.798424601 +0200
129 @@ -81,6 +81,8 @@ struct dhcp_packet {
130 * is no standard for this so we
131 * just steal a type */
133 +#define HTYPE_RESERVED 0 /* RFC 5494 */
135 /* Magic cookie validating dhcp options field (and bootp vendor
136 extensions field). */
137 #define DHCP_OPTIONS_COOKIE "\143\202\123\143"
138 diff -up dhcp-4.3.1b1/server/dhcpv6.c.mRfpsB dhcp-4.3.1b1/server/dhcpv6.c
139 --- dhcp-4.3.1b1/server/dhcpv6.c.mRfpsB 2014-07-10 17:47:31.464881409 +0200
140 +++ dhcp-4.3.1b1/server/dhcpv6.c 2014-07-10 17:48:03.800424573 +0200
141 @@ -330,6 +330,9 @@ generate_new_server_duid(void) {
142 if (p->hw_address.hlen > 0) {
145 + if (p->next == NULL && p->hw_address.hbuf[0] == HTYPE_RESERVED) {
146 + log_error("Can not generate DUID from interfaces which do not have hardware addresses, please configure server-duid!");
150 return ISC_R_UNEXPECTED;