diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-03-12 21:07:28 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-03-12 21:09:46 -0300 |
| commit | f087d453987dd46f070c10cc3d97dfb0d87d8f46 (patch) | |
| tree | d2d8b3b64e25f1b8135282a9bda2a97a9e61d65c /etc/inc/filter.inc | |
| parent | aec55f9aa49112ec8d793f8cae6277a3d5e08d9d (diff) | |
| download | pfsense-f087d453987dd46f070c10cc3d97dfb0d87d8f46.zip pfsense-f087d453987dd46f070c10cc3d97dfb0d87d8f46.tar.gz | |
Do not start filterdns during boot until a proper fix is done. Ticket #4296
Diffstat (limited to 'etc/inc/filter.inc')
| -rw-r--r-- | etc/inc/filter.inc | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 93901e8..9e20344 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -457,26 +457,28 @@ function filter_configure_sync($delete_states_if_needed = true) { update_filter_reload_status(gettext("Starting up layer7 daemon")); layer7_start_l7daemon(); - if (!empty($filterdns)) { - @file_put_contents("{$g['varetc_path']}/filterdns.conf", implode("", $filterdns)); - unset($filterdns); - if (isvalidpid("{$g['varrun_path']}/filterdns.pid")) { - sigkillbypid("{$g['varrun_path']}/filterdns.pid", "HUP"); - } else { - /* - * FilterDNS has three debugging levels. The default chosen is 1. - * Available are level 2 and greater then 2. - */ - if (isset($config['system']['aliasesresolveinterval']) && is_numeric($config['system']['aliasesresolveinterval'])) { - $resolve_interval = $config['system']['aliasesresolveinterval']; + if (!platform_booting()) { + if (!empty($filterdns)) { + @file_put_contents("{$g['varetc_path']}/filterdns.conf", implode("", $filterdns)); + unset($filterdns); + if (isvalidpid("{$g['varrun_path']}/filterdns.pid")) { + sigkillbypid("{$g['varrun_path']}/filterdns.pid", "HUP"); } else { - $resolve_interval = 300; + /* + * FilterDNS has three debugging levels. The default chosen is 1. + * Available are level 2 and greater then 2. + */ + if (isset($config['system']['aliasesresolveinterval']) && is_numeric($config['system']['aliasesresolveinterval'])) { + $resolve_interval = $config['system']['aliasesresolveinterval']; + } else { + $resolve_interval = 300; + } + mwexec("/usr/local/sbin/filterdns -p {$g['varrun_path']}/filterdns.pid -i {$resolve_interval} -c {$g['varetc_path']}/filterdns.conf -d 1"); } - mwexec("/usr/local/sbin/filterdns -p {$g['varrun_path']}/filterdns.pid -i {$resolve_interval} -c {$g['varetc_path']}/filterdns.conf -d 1"); + } else { + killbypid("{$g['varrun_path']}/filterdns.pid"); + @unlink("{$g['varrun_path']}/filterdns.pid"); } - } else { - killbypid("{$g['varrun_path']}/filterdns.pid"); - @unlink("{$g['varrun_path']}/filterdns.pid"); } /* run items scheduled for after filter configure run */ |
