diff options
| author | jim-p <jimp@pfsense.org> | 2013-07-11 09:55:54 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-07-11 09:56:53 -0400 |
| commit | 4f04e374e024c87496a6d8556975ff191fef461a (patch) | |
| tree | 1ce56308e65d733b83870de1e1e603327499d1f9 | |
| parent | 3ca1b0aaa7268c362b644d656a6b01cececfd844 (diff) | |
| download | pfsense-packages-4f04e374e024c87496a6d8556975ff191fef461a.tar.gz pfsense-packages-4f04e374e024c87496a6d8556975ff191fef461a.tar.bz2 pfsense-packages-4f04e374e024c87496a6d8556975ff191fef461a.zip | |
When we don't need a client cert, add a line to tell the client that we don't need a client cert, or else the OpenVPN Connect app will try to force the user to pick one.
| -rwxr-xr-x | config/openvpn-client-export/openvpn-client-export.inc | 3 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc index 06a0928c..d88d988f 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -383,6 +383,9 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $quotese $conf .= "<cert>{$nl}" . trim(base64_decode($cert['crt'])) . "{$nl}</cert>{$nl}"; // Inline Key $conf .= "<key>{$nl}" . trim(base64_decode($cert['prv'])) . "{$nl}</key>{$nl}"; + } else { + // Work around OpenVPN Connect assuming you have a client cert even when you don't need one + $conf .= "setenv CLIENT_CERT 0{$nl}"; } // Inline TLS if ($settings['tls']) { diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 34f76973..1c2c1068 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1435,7 +1435,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.0.7</version> + <version>1.0.8</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 7f86849b..9f178416 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1422,7 +1422,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.0.7</version> + <version>1.0.8</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> |