diff options
author | jim-p <jim@pingle.org> | 2010-05-08 12:12:04 -0400 |
---|---|---|
committer | jim-p <jim@pingle.org> | 2010-05-08 12:12:04 -0400 |
commit | 21c776dd85331afd178dd322de6d092f3c427b9c (patch) | |
tree | a154fcbeb9a415d2cb127e9b4d500f03a50cacaf /usr/local/www | |
parent | 520b1e07b039fd95a3750319fba2b2490d92b891 (diff) | |
download | pfsense-21c776dd85331afd178dd322de6d092f3c427b9c.zip pfsense-21c776dd85331afd178dd322de6d092f3c427b9c.tar.gz |
Fix OpenVPN server validation logic. It was failing if you tried to save a shared key server instance with an existing shared key.
Diffstat (limited to 'usr/local/www')
-rw-r--r-- | usr/local/www/vpn_openvpn_server.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index f19a216..6a022b7 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -244,12 +244,14 @@ if ($_POST) { if ($pconfig['maxclients'] && !is_numeric($pconfig['maxclients'])) $input_errors[] = "The field 'Concurrent connections' must be numeric."; - if (!$tls_mode && !$pconfig['autokey_enable']) { - $reqdfields = array('shared_key'); - $reqdfieldsn = array('Shared key'); - } else { + /* If we are not in shared key mode, then we need the CA/Cert. */ + if ($pconfig['mode'] != "p2p_shared_key") { $reqdfields = explode(" ", "caref certref"); $reqdfieldsn = explode(",", "Certificate Authority,Certificate");; + } elseif (!$pconfig['autokey_enable']) { + /* We only need the shared key filled in if we are in shared key mode and autokey is not selected. */ + $reqdfields = array('shared_key'); + $reqdfieldsn = array('Shared key'); } $reqdfields[] = 'tunnel_network'; |