summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2015-03-31 18:18:21 +0200
committerErmal LUÇI <eri@pfsense.org>2015-03-31 18:18:21 +0200
commit887f2517a38c151b040c1a1b28d41e79a7611b61 (patch)
tree7589acbfaf4479592ff87633461af49343727f9e /etc
parent08c1db2dbfd4dcbbfa58e7e12ba9dca32eeb5e69 (diff)
downloadpfsense-887f2517a38c151b040c1a1b28d41e79a7611b61.zip
pfsense-887f2517a38c151b040c1a1b28d41e79a7611b61.tar.gz
Merge manually pull request #1593
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/vpn.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 4d242e6..4b19457 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -575,8 +575,9 @@ EOD;
$uniqueids = 'yes';
if (!empty($config['ipsec']['uniqueids'])) {
- if (in_array($uniqueids, $ipsec_idhandling))
+ if (array_key_exists($config['ipsec']['uniqueids'], $ipsec_idhandling)) {
$uniqueids = $config['ipsec']['uniqueids'];
+ }
}
$natfilterrules = false;
/* begin ipsec.conf */
OpenPOWER on IntegriCloud