From 86ce2df7fdb04aa15f9fbeda91202c153e9d0cbd Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 7 Oct 2014 14:44:54 -0300 Subject: [PATCH] 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 --- etc/inc/services.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 2f2fc83243..79e205d758 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -358,10 +358,14 @@ function services_dhcpdv4_configure() { return 0; /* 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) - if($olsrd['enable']) - $is_olsr_enabled = true; + if (isset($olsrd['enable']) && $olsrd['enable'] == "on") { + $is_olsr_enabled = true; + break; + } if ($g['booting']) { /* restore the leases, if we have them */