aboutsummaryrefslogtreecommitdiffstats
path: root/config/openvpn-client-export/vpn_openvpn_export.php
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-11-17 13:30:45 -0500
committerjim-p <jimp@pfsense.org>2011-11-17 13:34:20 -0500
commit5b998d49bf356c4f1c5548f67378eb637ade18ec (patch)
tree9c2d961b466c9ebb0cd13eb565cc6d8b27984144 /config/openvpn-client-export/vpn_openvpn_export.php
parent0d8274b646bdea5391418aa293899160a19d2704 (diff)
downloadpfsense-packages-5b998d49bf356c4f1c5548f67378eb637ade18ec.tar.gz
pfsense-packages-5b998d49bf356c4f1c5548f67378eb637ade18ec.tar.bz2
pfsense-packages-5b998d49bf356c4f1c5548f67378eb637ade18ec.zip
Fix up various export scenarios that were not functioning properly.
Diffstat (limited to 'config/openvpn-client-export/vpn_openvpn_export.php')
-rwxr-xr-xconfig/openvpn-client-export/vpn_openvpn_export.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/openvpn-client-export/vpn_openvpn_export.php b/config/openvpn-client-export/vpn_openvpn_export.php
index 98d4fafc..5a41b85d 100755
--- a/config/openvpn-client-export/vpn_openvpn_export.php
+++ b/config/openvpn-client-export/vpn_openvpn_export.php
@@ -59,7 +59,7 @@ foreach($a_server as $sindex => $server) {
$ras_certs = array();
if (stripos($server['mode'], "server") === false)
continue;
- if ($server['authmode'] == "Local Database" && ($server['mode'] != "server_user")) {
+ if (($server['mode'] == "server_tls_user") && ($server['authmode'] == "Local Database")) {
foreach($a_user as $uindex => $user) {
if (!is_array($user['cert']))
continue;
@@ -78,7 +78,7 @@ foreach($a_server as $sindex => $server) {
$ras_user[] = $ras_userent;
}
}
- } elseif ((!empty($server['authmode']) && ($server['mode'] != "server_user")) || ($server['mode'] == "server_tls")) {
+ } elseif (($server['mode'] == "server_tls") || (($server['mode'] == "server_tls_user") && ($server['authmode'] != "Local Database"))) {
foreach($a_cert as $cindex => $cert) {
if ($cert['caref'] != $server['caref'])
continue;