diff options
author | Ermal Luçi <eri@pfsense.org> | 2008-11-08 15:44:19 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2008-11-08 15:44:19 +0000 |
commit | 15be17221d83c262619df11cf9469eb63f585442 (patch) | |
tree | fed516b25498e4ed3bd1917347a9bbc31ac2a99e /etc/inc/services.inc | |
parent | db9fabf3863dfd68f681d7a5c09403b1db466d13 (diff) | |
download | pfsense-15be17221d83c262619df11cf9469eb63f585442.zip pfsense-15be17221d83c262619df11cf9469eb63f585442.tar.gz |
Use existing functions to not duplicate code.
Diffstat (limited to 'etc/inc/services.inc')
-rw-r--r-- | etc/inc/services.inc | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index de3e4df..a009d2c 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -43,6 +43,10 @@ function services_dhcpd_configure() { echo "services_dhcpd_configure($if) being called $mt\n"; } + /* DHCP enabled on any interfaces? */ + if (!is_dhcp_server_enabled()) + return 0; + /* if OLSRD is enabled, allow WAN to house DHCP. */ if($config['installedpackages']['olsrd']) foreach($config['installedpackages']['olsrd']['config'] as $olsrd) @@ -75,24 +79,8 @@ function services_dhcpd_configure() { $syscfg = $config['system']; $dhcpdcfg = $config['dhcpd']; - - $Iflist = get_configured_interface_list(); - - /* DHCP enabled on any interfaces? */ - $dhcpdenable = false; - if(is_array($dhcpdcfg)) - foreach ($dhcpdcfg as $dhcpif => $dhcpifconf) { - if (isset($dhcpifconf['enable']) && - isset($Iflist[$dhcpif])) { - $dhcpdenable = true; - break; - } - } - - if (!$dhcpdenable) - return 0; - + if ($g['booting']) echo "Starting DHCP service..."; else |