Commit 8c94bf71 authored by Shawn Routhier's avatar Shawn Routhier
Browse files

[v4_1_esv]

Modify the server code to allow the administrator to configure
options 51, 58 and 59 in all universes except the dhcp universe.
[rt32309_41]
parent db3e58c1
......@@ -53,6 +53,12 @@ The system has only been tested on Linux, FreeBSD, and Solaris, and may not
work on other platforms. Please report any problems and suggested fixes to
<dhcp-users@isc.org>.
Changes since 4.1-ESV-R8
- Modify the server code to only prohibit the administrator from configuring
some options in the dhcp universe instead of all universes.
[ISC-Bugs #32309]
Changes since 4.1-ESV-R8rc1
- None
......
......@@ -764,10 +764,11 @@ int parse_statement (cfile, group, type, host_decl, declaration)
* XXX: We may want to include a "blacklist" of
* options we ignore in the future, as a table.
*/
if ((option->code == DHO_DHCP_LEASE_TIME) ||
((local_family != AF_INET6) &&
((option->code == DHO_DHCP_RENEWAL_TIME) ||
(option->code == DHO_DHCP_REBINDING_TIME))))
if ((option->universe == &dhcp_universe) &&
((option->code == DHO_DHCP_LEASE_TIME) ||
((local_family != AF_INET6) &&
((option->code == DHO_DHCP_RENEWAL_TIME) ||
(option->code == DHO_DHCP_REBINDING_TIME)))))
{
log_error("WARNING: server ignoring option %s "
"in configuration file.",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment