Project

General

Profile

« Previous | Next » 

Revision 3fa4d6fe

Added by Christian McDonald almost 2 years ago

Revert "dhcp: support simultaneous v4 dhcpd and dhcrelay, Implements #14620"

This reverts commit e9577ebfd7852646a66697a3bde41b712687a4ca.

View differences:

src/usr/local/www/services_dhcp.php
994 994
	exit;
995 995
}
996 996

  
997
$dhcrelay_enabled = config_path_enabled('dhcrelay');
998
if ($dhcrelay_enabled) {
999
	print_info_box(gettext('DHCP Relay is currently enabled. DHCP Server cannot be enabled while the DHCP Relay is enabled on any interface.'), 'danger', false);
1000
}
1001

  
997 1002
display_top_tabs($tab_array);
998 1003

  
999 1004
$form = new Form();
1000 1005

  
1001
$section = new Form_Section(gettext('General Options'));
1006
$section = new Form_Section('General Options');
1002 1007

  
1003 1008
if (!is_numeric($pool) && !($act === 'newpool')) {
1004 1009
	$input = new Form_Checkbox(
......
1015 1020
$section->addInput(new Form_Checkbox(
1016 1021
	'ignorebootp',
1017 1022
	'BOOTP',
1018
	gettext('Ignore BOOTP queries'),
1023
	'Ignore BOOTP queries',
1019 1024
	$pconfig['ignorebootp']
1020 1025
));
1021 1026

  
1022 1027
$section->addInput(new Form_Select(
1023 1028
	'denyunknown',
1024
	gettext('Deny unknown clients'),
1029
	'Deny unknown clients',
1025 1030
	$pconfig['denyunknown'],
1026 1031
	array(
1027
		"disabled" => gettext('Allow all clients'),
1028
		"enabled" => gettext('Allow known clients from any interface'),
1029
		"class" => gettext('Allow known clients from only this interface')
1032
		"disabled" => "Allow all clients",
1033
		"enabled" => "Allow known clients from any interface",
1034
		"class" => "Allow known clients from only this interface",
1030 1035
	)
1031
))->setHelp(gettext('When set to %3$sAllow all clients%4$s, any DHCP client will get an IP address within this scope/range on this interface. '.
1036
))->setHelp('When set to %3$sAllow all clients%4$s, any DHCP client will get an IP address within this scope/range on this interface. '.
1032 1037
	'If set to %3$sAllow known clients from any interface%4$s, any DHCP client with a MAC address listed in a static mapping on %1$s%3$sany%4$s%2$s scope(s)/interface(s) will get an IP address. ' .
1033
	'If set to %3$sAllow known clients from only this interface%4$s, only MAC addresses listed in static mappings on this interface will get an IP address within this scope/range.'),
1038
	'If set to %3$sAllow known clients from only this interface%4$s, only MAC addresses listed in static mappings on this interface will get an IP address within this scope/range.',
1034 1039
	'<i>', '</i>', '<b>', '</b>');
1035 1040

  
1036 1041
$section->addInput(new Form_Checkbox(
1037 1042
	'nonak',
1038
	gettext('Ignore denied clients'),
1039
	gettext('Ignore denied clients rather than reject'),
1043
	'Ignore denied clients',
1044
	'Ignore denied clients rather than reject',
1040 1045
	$pconfig['nonak']
1041
))->setHelp(gettext('This option is not compatible with failover and cannot be enabled when a Failover Peer IP address is configured.'));
1046
))->setHelp("This option is not compatible with failover and cannot be enabled when a Failover Peer IP address is configured.");
1042 1047

  
1043 1048
$section->addInput(new Form_Checkbox(
1044 1049
	'ignoreclientuids',
1045
	gettext('Ignore client identifiers'),
1046
	gettext('Do not record a unique identifier (UID) in client lease data if present in the client DHCP request'),
1050
	'Ignore client identifiers',
1051
	'Do not record a unique identifier (UID) in client lease data if present in the client DHCP request',
1047 1052
	$pconfig['ignoreclientuids']
1048
))->setHelp(gettext('This option may be useful when a client can dual boot using different client identifiers but the same hardware (MAC) address.  Note that the resulting server behavior violates the official DHCP specification.'));
1053
))->setHelp("This option may be useful when a client can dual boot using different client identifiers but the same hardware (MAC) address.  Note that the resulting server behavior violates the official DHCP specification.");
1049 1054

  
1050 1055

  
1051 1056
if (is_numeric($pool) || ($act == "newpool")) {

Also available in: Unified diff