aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2013-11-11 12:46:51 -0200
committerMarcello Coutinho <marcellocoutinho@gmail.com>2013-11-11 12:46:51 -0200
commit141c6b63a6b630415d3862b5d530cd4f49bf789d (patch)
tree9057a753fdab1ee498ff0101fb2b9800991ba5a6
parent48c047241c2f5dfcfb5f58d7759ba8412f7b4830 (diff)
parent03d4c6e46aceee78b62ad8bec0590a6a4f6df89c (diff)
downloadpfsense-packages-141c6b63a6b630415d3862b5d530cd4f49bf789d.tar.gz
pfsense-packages-141c6b63a6b630415d3862b5d530cd4f49bf789d.tar.bz2
pfsense-packages-141c6b63a6b630415d3862b5d530cd4f49bf789d.zip
Merge branch 'master' of https://github.com/pfsense/pfsense-packages
-rwxr-xr-xconfig/openvpn-client-export/openvpn-client-export.inc4
-rwxr-xr-xconfig/openvpn-client-export/openvpn-client-export.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
4 files changed, 6 insertions, 4 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>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 10782d1f..b64f01ba 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1463,7 +1463,7 @@
<depends_on_package_pbi>zip-3.0-i386.pbi p7zip-9.20.1-i386.pbi</depends_on_package_pbi>
<build_port_path>/usr/ports/archivers/p7zip</build_port_path>
<build_port_path>/usr/ports/archivers/zip</build_port_path>
- <version>1.1.3</version>
+ <version>1.1.4</version>
<status>RELEASE</status>
<required_version>2.0</required_version>
<config_file>http://www.pfsense.com/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 99ccb0ef..21988f98 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1450,7 +1450,7 @@
<depends_on_package_pbi>p7zip-9.20.1-amd64.pbi zip-3.0-amd64.pbi</depends_on_package_pbi>
<build_port_path>/usr/ports/archivers/p7zip</build_port_path>
<build_port_path>/usr/ports/archivers/zip</build_port_path>
- <version>1.1.3</version>
+ <version>1.1.4</version>
<status>RELEASE</status>
<required_version>2.0</required_version>
<config_file>http://www.pfsense.com/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file>