summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeth Mos <seth.mos@dds.nl>2011-02-11 09:28:11 +0100
committerSeth Mos <seth.mos@dds.nl>2011-02-11 09:28:11 +0100
commitd610946897da3d693ae4b372ce2edf0545d29daf (patch)
tree0bdffc3adaec23c904cf52b576419ce7989654e7
parent1d564143770e22559ca137fa298105300953699a (diff)
downloadpfsense-d610946897da3d693ae4b372ce2edf0545d29daf.zip
pfsense-d610946897da3d693ae4b372ce2edf0545d29daf.tar.gz
Delay resolving dynamic DNS tunnels during boot
-rw-r--r--etc/inc/vpn.inc9
1 files changed, 7 insertions, 2 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index caf8006..ea4940e 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -1677,8 +1677,13 @@ function reload_tunnel_spd_policy($phase1, $phase2, $old_phase1, $old_phase2) {
/* see if this tunnel has a hostname for the remote-gateway, and if so,
* try to resolve it now and add it to the list for filterdns */
if (!is_ipaddr($phase1['remote-gateway'])) {
- $rgip = resolve_retry($phase1['remote-gateway']);
- add_hostname_to_watch($phase1['remote-gateway']);
+ if(! $g['booting']) {
+ $rgip = resolve_retry($phase1['remote-gateway']);
+ add_hostname_to_watch($phase1['remote-gateway']);
+ return false;
+ } else {
+ add_hostname_to_watch($phase1['remote-gateway']);
+ }
if (!$rgip) {
log_error("Could not determine VPN endpoint for '{$phase1['descr']}'");
return false;
OpenPOWER on IntegriCloud