You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
208 lines
8.3 KiB
208 lines
8.3 KiB
5 years ago
|
diff -up dhcp-4.2.5/common/options.c.option97 dhcp-4.2.5/common/options.c
|
||
|
|
--- dhcp-4.2.5/common/options.c.option97 2015-05-20 16:44:34.958765179 +0200
|
||
|
|
+++ dhcp-4.2.5/common/options.c 2015-05-20 16:44:35.078763436 +0200
|
||
|
|
@@ -4222,13 +4222,26 @@ int validate_packet(struct packet *packe
|
||
|
|
"a future version of ISC DHCP will reject this");
|
||
|
|
}
|
||
|
|
} else {
|
||
|
|
- /*
|
||
|
|
- * If hlen is 0 we don't have any identifier, we warn the user
|
||
|
|
- * but continue processing the packet as we can.
|
||
|
|
- */
|
||
|
|
- if (packet->raw->hlen == 0) {
|
||
|
|
- log_debug("Received DHCPv4 packet without client-id"
|
||
|
|
- " option and empty hlen field.");
|
||
|
|
+ oc = lookup_option (&dhcp_universe, packet->options,
|
||
|
|
+ DHO_PXE_CLIENT_ID);
|
||
|
|
+ if (oc) {
|
||
|
|
+ /* Let's check if pxe-client-id is sane */
|
||
|
|
+ if ((oc->data.len < 2) ||
|
||
|
|
+ (oc->data.data[0] == '\0' &&
|
||
|
|
+ oc->data.len != 17)) {
|
||
|
|
+ log_debug("Dropped DHCPv4 packet with wrong "
|
||
|
|
+ "(len == %d) pxe-client-id", oc->data.len);
|
||
|
|
+ return (0);
|
||
|
|
+ }
|
||
|
|
+ } else {
|
||
|
|
+ /*
|
||
|
|
+ * If hlen is 0 we don't have any identifier, we warn the user
|
||
|
|
+ * but continue processing the packet as we can.
|
||
|
|
+ */
|
||
|
|
+ if (packet->raw->hlen == 0) {
|
||
|
|
+ log_debug("Received DHCPv4 packet without client-id"
|
||
|
|
+ " option and empty hlen field.");
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
diff -up dhcp-4.2.5/common/tables.c.option97 dhcp-4.2.5/common/tables.c
|
||
|
|
--- dhcp-4.2.5/common/tables.c.option97 2015-05-20 16:44:35.079763422 +0200
|
||
|
|
+++ dhcp-4.2.5/common/tables.c 2015-05-20 16:47:50.172931400 +0200
|
||
|
|
@@ -203,8 +203,9 @@ static struct option dhcp_options[] = {
|
||
|
|
/* Defined by RFC 4578 */
|
||
|
|
{ "pxe-system-type", "S", &dhcp_universe, 93, 1 },
|
||
|
|
{ "pxe-interface-id", "BBB", &dhcp_universe, 94, 1 },
|
||
|
|
- { "pxe-client-id", "BX", &dhcp_universe, 97, 1 },
|
||
|
|
#endif
|
||
|
|
+ { "pxe-client-id", "BX", &dhcp_universe, 97, 1 },
|
||
|
|
+
|
||
|
|
{ "uap-servers", "t", &dhcp_universe, 98, 1 },
|
||
|
|
{ "netinfo-server-address", "Ia", &dhcp_universe, 112, 1 },
|
||
|
|
{ "netinfo-server-tag", "t", &dhcp_universe, 113, 1 },
|
||
|
|
diff -up dhcp-4.2.5/includes/dhcp.h.option97 dhcp-4.2.5/includes/dhcp.h
|
||
|
|
--- dhcp-4.2.5/includes/dhcp.h.option97 2015-05-20 16:44:34.975764932 +0200
|
||
|
|
+++ dhcp-4.2.5/includes/dhcp.h 2015-05-20 16:44:35.079763422 +0200
|
||
|
|
@@ -163,6 +163,7 @@ struct dhcp_packet {
|
||
|
|
#define DHO_AUTHENTICATE 90 /* RFC3118, was 210 */
|
||
|
|
#define DHO_CLIENT_LAST_TRANSACTION_TIME 91
|
||
|
|
#define DHO_ASSOCIATED_IP 92
|
||
|
|
+#define DHO_PXE_CLIENT_ID 97 /* RFC4578 */
|
||
|
|
#define DHO_SUBNET_SELECTION 118 /* RFC3011! */
|
||
|
|
#define DHO_DOMAIN_SEARCH 119 /* RFC3397 */
|
||
|
|
#define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */
|
||
|
|
diff -up dhcp-4.2.5/server/dhcp.c.option97 dhcp-4.2.5/server/dhcp.c
|
||
|
|
--- dhcp-4.2.5/server/dhcp.c.option97 2015-05-20 16:44:35.060763698 +0200
|
||
|
|
+++ dhcp-4.2.5/server/dhcp.c 2015-05-20 16:51:26.718798033 +0200
|
||
|
|
@@ -202,6 +205,10 @@ dhcp (struct packet *packet) {
|
||
|
|
oc = lookup_option (&dhcp_universe, packet -> options,
|
||
|
|
DHO_DHCP_CLIENT_IDENTIFIER);
|
||
|
|
if (!oc)
|
||
|
|
+ oc = lookup_option (&dhcp_universe,
|
||
|
|
+ packet -> options,
|
||
|
|
+ DHO_PXE_CLIENT_ID);
|
||
|
|
+ if (!oc)
|
||
|
|
goto nolease;
|
||
|
|
|
||
|
|
memset (&data, 0, sizeof data);
|
||
|
|
@@ -770,6 +777,9 @@ void dhcprelease (packet, ms_nulltp)
|
||
|
|
|
||
|
|
oc = lookup_option (&dhcp_universe, packet -> options,
|
||
|
|
DHO_DHCP_CLIENT_IDENTIFIER);
|
||
|
|
+ if (!oc)
|
||
|
|
+ oc = lookup_option (&dhcp_universe, packet -> options,
|
||
|
|
+ DHO_PXE_CLIENT_ID);
|
||
|
|
memset (&data, 0, sizeof data);
|
||
|
|
if (oc &&
|
||
|
|
evaluate_option_cache (&data, packet, (struct lease *)0,
|
||
|
|
@@ -1841,6 +1851,9 @@ void ack_lease (packet, lease, offer, wh
|
||
|
|
can be used. */
|
||
|
|
oc = lookup_option (&dhcp_universe, packet -> options,
|
||
|
|
DHO_DHCP_CLIENT_IDENTIFIER);
|
||
|
|
+ if (!oc)
|
||
|
|
+ oc = lookup_option (&dhcp_universe, packet -> options,
|
||
|
|
+ DHO_PXE_CLIENT_ID);
|
||
|
|
if (oc &&
|
||
|
|
evaluate_option_cache (&d1, packet, lease,
|
||
|
|
(struct client_state *)0,
|
||
|
|
@@ -2386,6 +2399,9 @@ void ack_lease (packet, lease, offer, wh
|
||
|
|
/* Record the uid, if given... */
|
||
|
|
oc = lookup_option (&dhcp_universe, packet -> options,
|
||
|
|
DHO_DHCP_CLIENT_IDENTIFIER);
|
||
|
|
+ if (!oc)
|
||
|
|
+ oc = lookup_option (&dhcp_universe, packet -> options,
|
||
|
|
+ DHO_PXE_CLIENT_ID);
|
||
|
|
if (oc &&
|
||
|
|
evaluate_option_cache (&d1, packet, lease,
|
||
|
|
(struct client_state *)0,
|
||
|
|
@@ -3429,6 +3445,9 @@ int find_lease (struct lease **lp,
|
||
|
|
specified unique client identifier. */
|
||
|
|
oc = lookup_option (&dhcp_universe, packet -> options,
|
||
|
|
DHO_DHCP_CLIENT_IDENTIFIER);
|
||
|
|
+ if (!oc)
|
||
|
|
+ oc = lookup_option (&dhcp_universe, packet -> options,
|
||
|
|
+ DHO_PXE_CLIENT_ID);
|
||
|
|
memset (&client_identifier, 0, sizeof client_identifier);
|
||
|
|
if (oc &&
|
||
|
|
evaluate_option_cache (&client_identifier,
|
||
|
|
diff -up dhcp-4.2.5/server/dhcpd.conf.5.option97 dhcp-4.2.5/server/dhcpd.conf.5
|
||
|
|
--- dhcp-4.2.5/server/dhcpd.conf.5.option97 2015-05-20 16:44:34.908765906 +0200
|
||
|
|
+++ dhcp-4.2.5/server/dhcpd.conf.5 2015-05-20 16:44:35.081763393 +0200
|
||
|
|
@@ -1657,10 +1657,12 @@ should be a name identifying the host.
|
||
|
|
not specified for the host, \fIhostname\fR is used.
|
||
|
|
.PP
|
||
|
|
\fIHost\fR declarations are matched to actual DHCP or BOOTP clients
|
||
|
|
-by matching the \fRdhcp-client-identifier\fR option specified in the
|
||
|
|
+by matching the \fIdhcp-client-identifier\fR or \fIpxe-client-id\fR
|
||
|
|
+options specified in the
|
||
|
|
\fIhost\fR declaration to the one supplied by the client, or, if the
|
||
|
|
\fIhost\fR declaration or the client does not provide a
|
||
|
|
-\fRdhcp-client-identifier\fR option, by matching the \fIhardware\fR
|
||
|
|
+\fIdhcp-client-identifier\fR or \fIpxe-client-id\fR options,
|
||
|
|
+by matching the \fIhardware\fR
|
||
|
|
parameter in the \fIhost\fR declaration to the network hardware
|
||
|
|
address supplied by the client. BOOTP clients do not normally
|
||
|
|
provide a \fIdhcp-client-identifier\fR, so the hardware address must
|
||
|
|
@@ -1672,7 +1674,8 @@ to identify hosts.
|
||
|
|
.PP
|
||
|
|
Please be aware that
|
||
|
|
.B only
|
||
|
|
-the \fIdhcp-client-identifier\fR option and the hardware address can be
|
||
|
|
+the \fIdhcp-client-identifier\fR and \fIpxe-client-id\fR
|
||
|
|
+options and the hardware address can be
|
||
|
|
used to match a host declaration, or the \fIhost-identifier option\fR
|
||
|
|
parameter for DHCPv6 servers. For example, it is not possible to
|
||
|
|
match a host declaration to a \fIhost-name\fR option. This is
|
||
|
|
diff -up dhcp-4.2.5/server/dhcpleasequery.c.option97 dhcp-4.2.5/server/dhcpleasequery.c
|
||
|
|
--- dhcp-4.2.5/server/dhcpleasequery.c.option97 2013-01-03 01:02:25.000000000 +0100
|
||
|
|
+++ dhcp-4.2.5/server/dhcpleasequery.c 2015-05-20 16:44:35.082763378 +0200
|
||
|
|
@@ -279,7 +279,7 @@ dhcpleasequery(struct packet *packet, in
|
||
|
|
*/
|
||
|
|
|
||
|
|
memset(&uid, 0, sizeof(uid));
|
||
|
|
- if (get_option(&uid,
|
||
|
|
+ i = get_option(&uid,
|
||
|
|
&dhcp_universe,
|
||
|
|
packet,
|
||
|
|
NULL,
|
||
|
|
@@ -289,8 +289,20 @@ dhcpleasequery(struct packet *packet, in
|
||
|
|
packet->options,
|
||
|
|
&global_scope,
|
||
|
|
DHO_DHCP_CLIENT_IDENTIFIER,
|
||
|
|
- MDL)) {
|
||
|
|
-
|
||
|
|
+ MDL);
|
||
|
|
+ if (!i)
|
||
|
|
+ i = get_option(&uid,
|
||
|
|
+ &dhcp_universe,
|
||
|
|
+ packet,
|
||
|
|
+ NULL,
|
||
|
|
+ NULL,
|
||
|
|
+ packet->options,
|
||
|
|
+ NULL,
|
||
|
|
+ packet->options,
|
||
|
|
+ &global_scope,
|
||
|
|
+ DHO_PXE_CLIENT_ID,
|
||
|
|
+ MDL);
|
||
|
|
+ if (i) {
|
||
|
|
snprintf(dbg_info,
|
||
|
|
sizeof(dbg_info),
|
||
|
|
"client-id %s",
|
||
|
|
diff -up dhcp-4.2.5/server/failover.c.option97 dhcp-4.2.5/server/failover.c
|
||
|
|
--- dhcp-4.2.5/server/failover.c.option97 2015-05-20 16:44:35.001764555 +0200
|
||
|
|
+++ dhcp-4.2.5/server/failover.c 2015-05-20 16:44:35.083763364 +0200
|
||
|
|
@@ -5875,6 +5875,9 @@ int load_balance_mine (struct packet *pa
|
||
|
|
|
||
|
|
oc = lookup_option(&dhcp_universe, packet->options,
|
||
|
|
DHO_DHCP_CLIENT_IDENTIFIER);
|
||
|
|
+ if (!oc)
|
||
|
|
+ oc = lookup_option(&dhcp_universe, packet -> options,
|
||
|
|
+ DHO_PXE_CLIENT_ID);
|
||
|
|
memset(&ds, 0, sizeof ds);
|
||
|
|
if (oc &&
|
||
|
|
evaluate_option_cache(&ds, packet, NULL, NULL,
|
||
|
|
diff -up dhcp-4.2.5/server/mdb.c.option97 dhcp-4.2.5/server/mdb.c
|
||
|
|
--- dhcp-4.2.5/server/mdb.c.option97 2013-01-03 01:02:25.000000000 +0100
|
||
|
|
+++ dhcp-4.2.5/server/mdb.c 2015-05-20 16:44:35.084763349 +0200
|
||
|
|
@@ -127,8 +127,9 @@ static int find_uid_statement (struct ex
|
||
|
|
esp -> data.option &&
|
||
|
|
(esp -> data.option -> option -> universe ==
|
||
|
|
&dhcp_universe) &&
|
||
|
|
- (esp -> data.option -> option -> code ==
|
||
|
|
- DHO_DHCP_CLIENT_IDENTIFIER)) {
|
||
|
|
+ ((esp -> data.option -> option -> code ==
|
||
|
|
+ DHO_DHCP_CLIENT_IDENTIFIER) ||
|
||
|
|
+ (esp -> data.option -> option -> code == DHO_PXE_CLIENT_ID))) {
|
||
|
|
if (condp) {
|
||
|
|
log_error ("dhcp client identifier may not be %s",
|
||
|
|
"specified conditionally.");
|