diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-22 17:00:47 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-22 17:00:47 -0400 |
| commit | 0e61e3e47e7a96100225780f0c2abea8d7385c21 (patch) | |
| tree | a666e51ef751cdcf9bb0ee4ef42ec7e7f60278cc /usr/local/www/vpn_ipsec_phase1.php | |
| parent | 160d54978849e5351d039bcfff3fa30374347fe0 (diff) | |
| parent | ff629977e3d45c1d41fc12449e647abd8b780241 (diff) | |
| download | pfsense-0e61e3e47e7a96100225780f0c2abea8d7385c21.zip pfsense-0e61e3e47e7a96100225780f0c2abea8d7385c21.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/filter.inc
etc/inc/util.inc
Diffstat (limited to 'usr/local/www/vpn_ipsec_phase1.php')
| -rw-r--r-- | usr/local/www/vpn_ipsec_phase1.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php index 96ce52d..5917844 100644 --- a/usr/local/www/vpn_ipsec_phase1.php +++ b/usr/local/www/vpn_ipsec_phase1.php @@ -141,6 +141,11 @@ if ($_POST) { /* input validation */ $method = $pconfig['authentication_method']; + // Unset ca and cert if not required to avaoid storing in config + if ($method == "pre_shared_key" || method == "xauth_psk_server"){ + unset($pconfig['caref']); + unset($pconfig['certref']); + } // Only require PSK here for normal PSK tunnels (not mobile) or xauth. // For RSA methods, require the CA/Cert. |
