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 | |
| 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
| -rw-r--r-- | etc/inc/captiveportal.inc | 4 | ||||
| -rw-r--r-- | etc/inc/filter.inc | 4 | ||||
| -rw-r--r-- | etc/inc/vpn.inc | 4 | ||||
| -rwxr-xr-x | usr/local/www/services_captiveportal_hostname.php | 1 |
4 files changed, 10 insertions, 3 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; diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 6bd9401..89cfcca 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -337,13 +337,15 @@ function filter_configure_sync($delete_states_if_needed = true) { if (isvalidpid("{$g['varrun_path']}/filterdns.pid")) sigkillbypid("{$g['varrun_path']}/filterdns.pid", "HUP"); else { - killbypid("{$g['varrun_path']}/filterdns.pid"); /* * FilterDNS has three debugging levels. The default choosen is 1. * Availabe are level 2 and greater then 2. */ mwexec("/usr/local/sbin/filterdns -p {$g['varrun_path']}/filterdns.pid -i 300 -c {$g['varetc_path']}/filterdns.conf -d 1"); } + } else { + killbypid("{$g['varrun_path']}/filterdns.pid"); + @unlink("{$g['varrun_path']}/filterdns.pid"); } /* run items scheduled for after filter configure run */ diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index c890382..75fa74c 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -980,9 +980,11 @@ EOD; if (isvalidpid("{$g['varrun_path']}/filterdns-ipsec.pid")) sigkillbypid("{$g['varrun_path']}/filterdns-ipsec.pid", "HUP"); else { - killbypid("{$g['varrun_path']}/filterdns-ipsec.pid"); mwexec("/usr/local/sbin/filterdns -p {$g['varrun_path']}/filterdns-ipsec.pid -i {$interval} -c {$g['varetc_path']}/ipsec/filterdns-ipsec.hosts -d 1"); } + } else { + killbypid("{$g['varrun_path']}/filterdns-ipsec.pid"); + @unlink("{$g['varrun_path']}/filterdns-ipsec.pid"); } vpn_ipsec_failover_configure(); diff --git a/usr/local/www/services_captiveportal_hostname.php b/usr/local/www/services_captiveportal_hostname.php index 7a7fb87..dbbb688 100755 --- a/usr/local/www/services_captiveportal_hostname.php +++ b/usr/local/www/services_captiveportal_hostname.php @@ -86,6 +86,7 @@ if ($_GET['act'] == "del" && !empty($cpzone)) { unset($a_allowedhostnames[$_GET['id']]); write_config(); + captiveportal_allowedhostname_configure(); header("Location: services_captiveportal_hostname.php?zone={$cpzone}"); exit; } |
