diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2015-11-22 09:37:31 -0600 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2015-11-22 09:37:31 -0600 |
| commit | fef38e5aa049a4aef6ce5188f1db9c92ffb0969b (patch) | |
| tree | 8379a7a4dcb3da6921bae37744eaf7d7da1cc0ea /src/etc | |
| parent | 1a2de6d640e720773e5701d53e25ed5bd728da65 (diff) | |
| download | pfsense-fef38e5aa049a4aef6ce5188f1db9c92ffb0969b.zip pfsense-fef38e5aa049a4aef6ce5188f1db9c92ffb0969b.tar.gz | |
Fix ipsec_enabled() to return true only when at least one of the phase 1 entries are enabled.
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/ipsec.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/etc/inc/ipsec.inc b/src/etc/inc/ipsec.inc index 502cc37..c951ed2 100644 --- a/src/etc/inc/ipsec.inc +++ b/src/etc/inc/ipsec.inc @@ -213,13 +213,19 @@ function ipsec_enabled() { if (!isset($config['ipsec']) || !is_array($config['ipsec'])) return false; + /* Check if we have at least one phase 1 entry. */ if (!isset($config['ipsec']['phase1']) || !is_array($config['ipsec']['phase1']) || empty($config['ipsec']['phase1'])) { return false; } + /* Check if at least one phase 1 entry is enabled. */ + foreach ($config['ipsec']['phase1'] as $phase1) { + if (!isset($phase1['disabled'])) + return true; + } - return true; + return false; } /* |
