mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Be more strict when checking if olsrd is enabled, otherwise when package is deinstalled and configuration is kept dhcpd will consider it's always as enabled

Browse Source
This commit is contained in:
Renato Botelho 2014-10-07 14:44:54 -03:00
parent a3cc8dcc60
commit 86ce2df7fd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/inc/services.inc
View File

@ -358,10 +358,14 @@ function services_dhcpdv4_configure() {
return 0; return 0;
/* if OLSRD is enabled, allow WAN to house DHCP. */ /* if OLSRD is enabled, allow WAN to house DHCP. */
if($config['installedpackages']['olsrd']) if (!function_exists('is_package_installed'))
require_once('pkg-utils.inc');
if (is_package_installed('olsrd') && isset($config['installedpackages']['olsrd']))
foreach($config['installedpackages']['olsrd']['config'] as $olsrd) foreach($config['installedpackages']['olsrd']['config'] as $olsrd)
if($olsrd['enable']) if (isset($olsrd['enable']) && $olsrd['enable'] == "on") {
$is_olsr_enabled = true; $is_olsr_enabled = true;
break;
}
if ($g['booting']) { if ($g['booting']) {
/* restore the leases, if we have them */ /* restore the leases, if we have them */