diff options
| author | Renato Botelho <renato@netgate.com> | 2016-01-26 08:17:40 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-01-26 08:17:40 -0200 |
| commit | 3951d342c7054a5be8622052df7d4802470434a7 (patch) | |
| tree | d827ce2b65f9257c5fa8558fa7c21e4cf97ff7f1 | |
| parent | c7474afc86d72e59266771e0c0f3bc5d5de33229 (diff) | |
| parent | 1ee4cd191803e18ee514b445731e6f4ec3ee93df (diff) | |
| download | pfsense-3951d342c7054a5be8622052df7d4802470434a7.zip pfsense-3951d342c7054a5be8622052df7d4802470434a7.tar.gz | |
Merge pull request #2538 from phil-davis/patch-5
| -rw-r--r-- | src/etc/inc/vpn.inc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc index 46263a1..97eea23 100644 --- a/src/etc/inc/vpn.inc +++ b/src/etc/inc/vpn.inc @@ -1502,6 +1502,10 @@ EOD; function vpn_ipsec_force_reload($interface = "") { global $g, $config; + if (!ipsec_enabled()) { + return; + } + $ipseccfg = $config['ipsec']; if (!empty($interface) && is_array($ipseccfg['phase1'])) { @@ -1518,11 +1522,9 @@ function vpn_ipsec_force_reload($interface = "") { } } - /* if ipsec is enabled, start up again */ - if (isset($ipseccfg['enable'])) { - log_error(gettext("Forcefully reloading IPsec")); - vpn_ipsec_configure(); - } + /* If we get this far then we need to take action. */ + log_error(gettext("Forcefully reloading IPsec")); + vpn_ipsec_configure(); } /* master setup for vpn (mpd) */ |
