Revision 3475eb04
Added by Andrew Pilloud almost 10 years ago
src/etc/inc/services.inc | ||
---|---|---|
776 | 776 |
} |
777 | 777 |
$dhcpdconf .= " allow members of \"" . str_replace(':', '', $mac) . "\";\n"; |
778 | 778 |
} |
779 |
$deny_action = "deny"; |
|
780 |
if (isset($poolconf['nonak'])) { |
|
781 |
$deny_action = "ignore"; |
|
782 |
} |
|
779 | 783 |
$mac_deny_list = array_unique(explode(',', $poolconf['mac_deny'])); |
780 | 784 |
foreach ($mac_deny_list as $mac) { |
781 | 785 |
if (empty($mac)) { |
782 | 786 |
continue; |
783 | 787 |
} |
784 |
$dhcpdconf .= " deny members of \"" . str_replace(':', '', $mac) . "\";\n";
|
|
788 |
$dhcpdconf .= " $deny_action members of \"" . str_replace(':', '', $mac) . "\";\n";
|
|
785 | 789 |
} |
786 | 790 |
|
787 | 791 |
if ($poolconf['failover_peerip'] <> "") { |
788 |
$dhcpdconf .= " deny dynamic bootp clients;\n";
|
|
792 |
$dhcpdconf .= " $deny_action dynamic bootp clients;\n";
|
|
789 | 793 |
} |
790 | 794 |
|
791 | 795 |
if (isset($poolconf['denyunknown'])) { |
792 |
$dhcpdconf .= " deny unknown-clients;\n";
|
|
796 |
$dhcpdconf .= " $deny_action unknown-clients;\n";
|
|
793 | 797 |
} |
794 | 798 |
|
795 | 799 |
if ($poolconf['gateway'] && $poolconf['gateway'] != "none" && ($poolconf['gateway'] != $dhcpifconf['gateway'])) { |
src/usr/local/www/services_dhcp.php | ||
---|---|---|
183 | 183 |
list($pconfig['wins1'], $pconfig['wins2']) = $dhcpdconf['winsserver']; |
184 | 184 |
list($pconfig['dns1'], $pconfig['dns2'], $pconfig['dns3'], $pconfig['dns4']) = $dhcpdconf['dnsserver']; |
185 | 185 |
$pconfig['denyunknown'] = isset($dhcpdconf['denyunknown']); |
186 |
$pconfig['nonak'] = isset($dhcpdconf['nonak']); |
|
186 | 187 |
$pconfig['ddnsdomain'] = $dhcpdconf['ddnsdomain']; |
187 | 188 |
$pconfig['ddnsdomainprimary'] = $dhcpdconf['ddnsdomainprimary']; |
188 | 189 |
$pconfig['ddnsdomainkeyname'] = $dhcpdconf['ddnsdomainkeyname']; |
... | ... | |
540 | 541 |
$dhcpdconf['domain'] = $_POST['domain']; |
541 | 542 |
$dhcpdconf['domainsearchlist'] = $_POST['domainsearchlist']; |
542 | 543 |
$dhcpdconf['denyunknown'] = ($_POST['denyunknown']) ? true : false; |
544 |
$dhcpdconf['nonak'] = ($_POST['nonak']) ? true : false; |
|
543 | 545 |
$dhcpdconf['ddnsdomain'] = $_POST['ddnsdomain']; |
544 | 546 |
$dhcpdconf['ddnsdomainprimary'] = $_POST['ddnsdomainprimary']; |
545 | 547 |
$dhcpdconf['ddnsdomainkeyname'] = $_POST['ddnsdomainkeyname']; |
... | ... | |
773 | 775 |
$pconfig['denyunknown'] |
774 | 776 |
)); |
775 | 777 |
|
778 |
$section->addInput(new Form_Checkbox( |
|
779 |
'nonak', |
|
780 |
'Ignore denied clients', |
|
781 |
'Denied clients will be ignored rather than rejected.', |
|
782 |
$pconfig['nonak'] |
|
783 |
)); |
|
784 |
|
|
785 |
|
|
776 | 786 |
if (is_numeric($pool) || ($act == "newpool")) { |
777 | 787 |
$section->addInput(new Form_Input( |
778 | 788 |
'descr', |
Also available in: Unified diff
Make DHCP deny action configurable