diff options
| author | Tomek Mrugalski <tomek@isc.org> | 2011-07-01 12:07:09 +0000 |
|---|---|---|
| committer | Tomek Mrugalski <tomek@isc.org> | 2011-07-01 12:07:09 +0000 |
| commit | d15aa96419b441f66dfd23caab2e691ec03ac614 (patch) | |
| tree | 50caf6f2622a09074057e72ceff89e2f4dd98c84 /client/dhclient.c | |
| parent | f8cc78bad3220fcb5c6c4e78161d34a17b2c8cee (diff) | |
| download | isc-dhcp-d15aa96419b441f66dfd23caab2e691ec03ac614.tar.gz | |
- Strict checks for content of domain-name DHCPv4 option can now be
configured during compilation time. Even though RFC2132 does not allow
to store more than one domain in domain-name option, such behavior is
now enabled by default, but this may change some time in the future.
See ACCEPT_LIST_IN_DOMAIN_NAME define in includes/site.h.
[ISC-Bugs #24167]
Diffstat (limited to 'client/dhclient.c')
| -rw-r--r-- | client/dhclient.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/client/dhclient.c b/client/dhclient.c index 3cc61acf..c17ef6f8 100644 --- a/client/dhclient.c +++ b/client/dhclient.c @@ -4201,8 +4201,13 @@ static int check_option_values(struct universe *universe, /* just reject options we want to protect, will be escaped anyway */ if ((universe == NULL) || (universe == &dhcp_universe)) { switch(opt) { - case DHO_HOST_NAME: case DHO_DOMAIN_NAME: +#ifdef ACCEPT_LIST_IN_DOMAIN_NAME + return check_domain_name_list(ptr, len, 0); +#else + return check_domain_name(ptr, len, 0); +#endif + case DHO_HOST_NAME: case DHO_NIS_DOMAIN: case DHO_NETBIOS_SCOPE: return check_domain_name(ptr, len, 0); |