diff options
| author | Marcello Coutinho <marcellocoutinho@gmail.com> | 2013-11-11 12:46:51 -0200 |
|---|---|---|
| committer | Marcello Coutinho <marcellocoutinho@gmail.com> | 2013-11-11 12:46:51 -0200 |
| commit | 141c6b63a6b630415d3862b5d530cd4f49bf789d (patch) | |
| tree | 9057a753fdab1ee498ff0101fb2b9800991ba5a6 /config | |
| parent | 48c047241c2f5dfcfb5f58d7759ba8412f7b4830 (diff) | |
| parent | 03d4c6e46aceee78b62ad8bec0590a6a4f6df89c (diff) | |
| download | pfsense-packages-141c6b63a6b630415d3862b5d530cd4f49bf789d.tar.gz pfsense-packages-141c6b63a6b630415d3862b5d530cd4f49bf789d.tar.bz2 pfsense-packages-141c6b63a6b630415d3862b5d530cd4f49bf789d.zip | |
Merge branch 'master' of https://github.com/pfsense/pfsense-packages
Diffstat (limited to 'config')
| -rwxr-xr-x | config/openvpn-client-export/openvpn-client-export.inc | 4 | ||||
| -rwxr-xr-x | config/openvpn-client-export/openvpn-client-export.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc index c7afb9e6..cf7eb7a4 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -209,7 +209,9 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $quotese if (($expformat != "inlinedroid") && ($expformat != "inlineios")) $conf .= "resolv-retry infinite{$nl}"; $conf .= "$remotes{$nl}"; - if (!empty($servercn)) { + /* This line can cause problems with auth-only setups and also with Yealink/Snom phones + since they are stuck on an older OpenVPN version that does not support this feature. */ + if (!empty($servercn) && !$nokeys && (substr($expformat, 0, 7) != "yealink") && ($expformat != "snom")) { $qw = ($quoteservercn) ? "\"" : ""; $conf .= "verify-x509-name {$qw}{$servercn}{$qw} name{$nl}"; } diff --git a/config/openvpn-client-export/openvpn-client-export.xml b/config/openvpn-client-export/openvpn-client-export.xml index a1c263f1..f00ff084 100755 --- a/config/openvpn-client-export/openvpn-client-export.xml +++ b/config/openvpn-client-export/openvpn-client-export.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <packagegui> <name>OpenVPN Client Export</name> - <version>1.1.3</version> + <version>1.1.4</version> <title>OpenVPN Client Export</title> <include_file>/usr/local/pkg/openvpn-client-export.inc</include_file> <backup_file></backup_file> |