Merge pull request #712 from phil-davis/master

Correctly decide if dhcrelay (v4) is enabled
This commit is contained in:
Jim P 2013-07-14 11:23:22 -07:00
commit da60727cea

View File

@ -282,13 +282,8 @@ function get_services() {
if ($oc['if'] && (!link_interface_to_bridge($if)))
$iflist[$if] = $if;
}
$show_dhcprelay = false;
foreach($iflist as $if) {
if(isset($config['dhcrelay'][$if]['enable']))
$show_dhcprelay = true;
}
if($show_dhcprelay == true) {
if(isset($config['dhcrelay']['enable'])) {
$pconfig = array();
$pconfig['name'] = "dhcrelay";
$pconfig['description'] = gettext("DHCP Relay");