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

Merge pull request #371 from bcyrill/patch-18

Browse Source 
Fix filterdns termination
This commit is contained in:
rbgarga 2013-02-04 01:26:44 -08:00
commit 0677741a58
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/inc/captiveportal.inc
View File

@ -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;

4
etc/inc/filter.inc
View File

@ -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 */

4
etc/inc/vpn.inc
View File

@ -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();

1
usr/local/www/services_captiveportal_hostname.php
View File

@ -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;
}