diff options
| author | Ermal LUÇI <eri@pfsense.org> | 2015-03-31 18:18:21 +0200 |
|---|---|---|
| committer | Ermal LUÇI <eri@pfsense.org> | 2015-03-31 18:18:21 +0200 |
| commit | 887f2517a38c151b040c1a1b28d41e79a7611b61 (patch) | |
| tree | 7589acbfaf4479592ff87633461af49343727f9e | |
| parent | 08c1db2dbfd4dcbbfa58e7e12ba9dca32eeb5e69 (diff) | |
| download | pfsense-887f2517a38c151b040c1a1b28d41e79a7611b61.zip pfsense-887f2517a38c151b040c1a1b28d41e79a7611b61.tar.gz | |
Merge manually pull request #1593
| -rw-r--r-- | etc/inc/vpn.inc | 3 | ||||
| -rw-r--r-- | usr/local/www/vpn_ipsec_settings.php | 1 |
2 files changed, 3 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 */ diff --git a/usr/local/www/vpn_ipsec_settings.php b/usr/local/www/vpn_ipsec_settings.php index 6f49c78..41d6a3a 100644 --- a/usr/local/www/vpn_ipsec_settings.php +++ b/usr/local/www/vpn_ipsec_settings.php @@ -51,6 +51,7 @@ $pconfig['enableinterfacesuse'] = isset($config['ipsec']['enableinterfacesuse']) $pconfig['acceptunencryptedmainmode'] = isset($config['ipsec']['acceptunencryptedmainmode']); $pconfig['maxmss_enable'] = isset($config['system']['maxmss_enable']); $pconfig['maxmss'] = $config['system']['maxmss']; +$pconfig['uniqueids'] = $config['ipsec']['uniqueids']; if ($_POST) { |
