diff options
| author | rbgarga <garga@FreeBSD.org> | 2013-02-04 01:26:44 -0800 |
|---|---|---|
| committer | rbgarga <garga@FreeBSD.org> | 2013-02-04 01:26:44 -0800 |
| commit | 0677741a587b58459331bdc36087596e91bd4d7f (patch) | |
| tree | d705530ee23d2471f5205158feb6e9b3de50b8d8 /etc/inc/captiveportal.inc | |
| parent | 032c72453158ed20c38c57015e3ffd1eead2e3dc (diff) | |
| parent | fe17da8a411c95e6444ab3c9929ff6e529ba2981 (diff) | |
| download | pfsense-0677741a587b58459331bdc36087596e91bd4d7f.zip pfsense-0677741a587b58459331bdc36087596e91bd4d7f.tar.gz | |
Merge pull request #371 from bcyrill/patch-18
Fix filterdns termination
Diffstat (limited to 'etc/inc/captiveportal.inc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index e7e9e47..6f9461c 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1024,9 +1024,11 @@ function captiveportal_allowedhostname_configure() { if (isvalidpid("{$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid")) sigkillbypid("{$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid", "HUP"); else { - killbypid("{$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid"); mwexec("/usr/local/sbin/filterdns -p {$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid -i 300 -c {$cp_filterdns_filename} -y {$cpzone} -d 1"); } + } else { + killbypid("{$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid"); + @unlink("{$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid"); } return $rules; |
