Project

General

Profile

« Previous | Next » 

Revision db9fabf3

Added by Ermal Luçi over 16 years ago

Simplify and return correct information if dhcpd is active.

View differences:

etc/inc/pfsense-utils.inc
3445 3445
/* DHCP enabled on any interfaces? */
3446 3446
function is_dhcp_server_enabled() 
3447 3447
{
3448
	global $config, $g;
3448
	global $config;
3449 3449

  
3450 3450
	$dhcpdenable = false;
3451 3451
	
3452 3452
	if (!is_array($config['dhcpd']))
3453 3453
		return false;
3454 3454

  
3455
	$Iflist = get_configured_interface_list();
3456

  
3455 3457
	foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) {
3456
		if (isset ($dhcpifconf['enable']) && (($dhcpif == "lan") || (isset ($config['interfaces'][$dhcpif]['enable']) && $config['interfaces'][$dhcpif]['if'] && (!link_interface_to_bridge($dhcpif)))))
3457
			$dhcpdenable = true;
3458
		if (isset ($dhcpifconf['enable']) && (($dhcpif == "wan") || (isset ($config['interfaces'][$dhcpif]['enable']) && $config['interfaces'][$dhcpif]['if'] && (!link_interface_to_bridge($dhcpif)))))
3458
		if (isset($dhcpifconf['enable']) && isset($Iflist[$dhcpif])) {
3459 3459
			$dhcpdenable = true;
3460
			break;
3461
		}
3460 3462
	}
3461 3463

  
3462 3464
	return $dhcpdenable;

Also available in: Unified diff