diff options
author | Ermal <eri@pfsense.org> | 2011-06-06 18:12:52 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2011-06-06 18:12:52 +0000 |
commit | 4e19284675cafa8c81ed86e86e9554e4b80d6ecb (patch) | |
tree | 12e4ec7e33679e9cda9af207e048f13b660002a4 | |
parent | f6bf0661e176db8199a75ac4d842a090b3f95569 (diff) | |
download | pfsense-4e19284675cafa8c81ed86e86e9554e4b80d6ecb.zip pfsense-4e19284675cafa8c81ed86e86e9554e4b80d6ecb.tar.gz |
Correct event calling during bootup for rc.newipsecdns and also convert the command executed during an ipsec even to go through check_reload_status which will prevent races on calling rc.newipsecdns. Which might lead to many filterdns processes.
-rw-r--r-- | etc/inc/vpn.inc | 2 | ||||
-rwxr-xr-x | etc/rc.bootup | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 5e014fd..7c08ccb 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -912,7 +912,7 @@ EOD; $hostnames = ""; array_unique($filterdns_list); foreach ($filterdns_list as $hostname) - $hostnames .= "cmd {$hostname} '/etc/rc.newipsecdns'\n"; + $hostnames .= "cmd {$hostname} '/usr/local/sbin/pfSctl -c \"service reload ipsecdns\"'\n"; file_put_contents("{$g['varetc_path']}/filterdns-ipsec.hosts", $hostnames); killbypid("{$g['varrun_path']}/filterdns-ipsec.pid"); diff --git a/etc/rc.bootup b/etc/rc.bootup index 1b71d00..2f0c2cd 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -322,7 +322,7 @@ system_do_shell_commands(); /* start IPsec tunnels */ vpn_ipsec_configure(); /* Reload dynamic hostname tunnels after bootup finishes */ -send_event("reload ipsecdns"); +send_event("service reload ipsecdns"); /* start SNMP service */ services_snmpd_configure(); |