summaryrefslogtreecommitdiffstats
path: root/etc/inc
diff options
context:
space:
mode:
authorsmos <seth.mos@dds.nl>2011-03-02 10:14:37 +0100
committersmos <seth.mos@dds.nl>2011-03-02 10:14:37 +0100
commitd161b4d4c56eb7dbb8b468817d88ab6a9d430baa (patch)
treec6afc6ec8b259157526c48a11901d6320df0575d /etc/inc
parentbb3c656263dee78437ec6b3ae67fc7b194d96c7e (diff)
downloadpfsense-d161b4d4c56eb7dbb8b468817d88ab6a9d430baa.zip
pfsense-d161b4d4c56eb7dbb8b468817d88ab6a9d430baa.tar.gz
Always write out the filterdns-ipsec.hosts file, otherwise deleted tunnels will never get removed from the
filterdns-ipsec.hosts
Diffstat (limited to 'etc/inc')
-rw-r--r--etc/inc/vpn.inc30
1 files changed, 15 insertions, 15 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 2e72a6d..0e21224 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -903,21 +903,21 @@ EOD;
/* load SPD */
mwexec("/usr/local/sbin/setkey -f {$g['varetc_path']}/spd.conf", false);
- /* start filterdns, if necessary */
- if (count($filterdns_list) > 0) {
- $interval = 60;
- if (!empty($ipseccfg['dns-interval']) && is_numeric($ipseccfg['dns-interval']))
- $interval = $ipseccfg['dns-interval'];
-
- $hostnames = "";
- array_unique($filterdns_list);
- foreach ($filterdns_list as $hostname)
- $hostnames .= "cmd {$hostname} '/etc/rc.newipsecdns'\n";
- file_put_contents("{$g['varetc_path']}/filterdns-ipsec.hosts", $hostnames);
-
- 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']}/filterdns-ipsec.hosts -d 1");
- }
+ }
+ /* start filterdns, if necessary */
+ if (count($filterdns_list) > 0) {
+ $interval = 60;
+ if (!empty($ipseccfg['dns-interval']) && is_numeric($ipseccfg['dns-interval']))
+ $interval = $ipseccfg['dns-interval'];
+
+ $hostnames = "";
+ array_unique($filterdns_list);
+ foreach ($filterdns_list as $hostname)
+ $hostnames .= "cmd {$hostname} '/etc/rc.newipsecdns'\n";
+ file_put_contents("{$g['varetc_path']}/filterdns-ipsec.hosts", $hostnames);
+
+ 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']}/filterdns-ipsec.hosts -d 1");
}
vpn_ipsec_failover_configure();
OpenPOWER on IntegriCloud