mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-30 22:05:23 +00:00
Code Issues Releases Wiki Activity

[master] dhclient now enforces require options statement in -6 mode

Browse Source 
Merges in rt41473.
This commit is contained in:
tmarkwalder
2017-05-03 09:28:12 -04:00
parent 2f5fefd3a8
commit 1d7fceeb40
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
RELNOTES
View File

@@ -179,6 +179,13 @@ by Eric Young (eay@cryptsoft.com).
BlueCat Networks for bringing the matter to our attention. BlueCat Networks for bringing the matter to our attention.
[ISC-Bugs #43592] [ISC-Bugs #43592]
- When running in -6 mode, dhclient now enforces the require option statement
and will discard offered leases that do not contain all the required
options specified in the client configuration. Prior to this the client
would still consider such leases. This may be disabled at compile time
(see ENFORCE_DHCPV6_CLIENT_REQUIRE in includes/site.h).
[ISC-Bugs #41473]
Changes since 4.3.0 (bug fixes) Changes since 4.3.0 (bug fixes)
- Tidy up several small tickets. - Tidy up several small tickets.

14
client/dhc6.c
View File

@@ -141,6 +141,8 @@ static isc_result_t dhc6_check_status(isc_result_t rval,
struct option_state *options, struct option_state *options,
const char *scope, const char *scope,
unsigned *code); unsigned *code);
static int dhc6_score_lease(struct client_state *client,
struct dhc6_lease *lease);
extern int onetry; extern int onetry;
extern int stateless; extern int stateless;
@@ -3133,6 +3135,15 @@ init_handler(struct packet *packet, struct client_state *client)
return; return;
} }
int lease_score = dhc6_score_lease(client, lease);
#ifdef ENFORCE_DHCPV6_CLIENT_REQUIRE
if (lease_score == 0) {
log_debug("RCV:Advertised lease scored 0, toss it.");
dhc6_lease_destroy(&lease, MDL);
return;
}
#endif
insert_lease(&client->advertised_leases, lease); insert_lease(&client->advertised_leases, lease);
/* According to RFC3315 section 17.1.2, the client MUST wait for /* According to RFC3315 section 17.1.2, the client MUST wait for
@@ -3146,8 +3157,7 @@ init_handler(struct packet *packet, struct client_state *client)
* should not if the advertise contains less than one IA and address. * should not if the advertise contains less than one IA and address.
*/ */
if ((client->txcount > 1) || if ((client->txcount > 1) ||
((lease->pref == 255) && ((lease->pref == 255) && (lease_score > SCORE_MIN))) {
(dhc6_score_lease(client, lease) > SCORE_MIN))) {
log_debug("RCV: Advertisement immediately selected."); log_debug("RCV: Advertisement immediately selected.");
cancel_timeout(do_init6, client); cancel_timeout(do_init6, client);
start_selecting6(client); start_selecting6(client);

7
includes/site.h
View File

@@ -325,6 +325,13 @@
* supported by the configure script. */ * supported by the configure script. */
/* #define EUI_64 */ /* #define EUI_64 */
/* Enable enforcement of the require option statement as documented
* in man page. Instructs the dhclient, when in -6 mode, to discard
* offered leases that do not contain all options specified as required
* in the client's configuration file. The client already enforces this
* in -4 mode. */
#define ENFORCE_DHCPV6_CLIENT_REQUIRE
/* Include definitions for various options. In general these /* Include definitions for various options. In general these
should be left as is, but if you have already defined one should be left as is, but if you have already defined one
of these and prefer your definition you can comment the of these and prefer your definition you can comment the