diff options
| author | jim-p <jimp@pfsense.org> | 2011-11-11 15:14:24 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-11-11 15:14:24 -0500 |
| commit | bcc46ffe0b5ea31cb6871d4b35d4af701d4bc838 (patch) | |
| tree | 496f7dbe360bd4795c8259ad0b649be0cbc65386 | |
| parent | cfe9d9f9a0886175db93a3957ad1371df5ce6f56 (diff) | |
| download | pfsense-packages-bcc46ffe0b5ea31cb6871d4b35d4af701d4bc838.tar.gz pfsense-packages-bcc46ffe0b5ea31cb6871d4b35d4af701d4bc838.tar.bz2 pfsense-packages-bcc46ffe0b5ea31cb6871d4b35d4af701d4bc838.zip | |
pull in username-as-common-name fix
| -rw-r--r-- | config/openvpn_tapfix_20x/openvpn_tapfix_20x.patch | 12 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/config/openvpn_tapfix_20x/openvpn_tapfix_20x.patch b/config/openvpn_tapfix_20x/openvpn_tapfix_20x.patch index b611f6f5..35925ea8 100644 --- a/config/openvpn_tapfix_20x/openvpn_tapfix_20x.patch +++ b/config/openvpn_tapfix_20x/openvpn_tapfix_20x.patch @@ -48,6 +48,18 @@ index 777b395..701a032 100644 + } break; } + +@@ -452,7 +452,9 @@ function openvpn_reconfigure($mode, $settings) { + case 'server_user': + $conf .= "client-cert-not-required\n"; + case 'server_tls_user': +- $conf .= "username-as-common-name\n"; ++ /* username-as-common-name is not compatible with server-bridge */ ++ if (stristr($conf, "server-bridge") === false) ++ $conf .= "username-as-common-name\n"; + if (!empty($settings['authmode'])) { + $authcfgs = explode(",", $settings['authmode']); + $sed = "\$authmodes=array("; @@ -1021,4 +1039,4 @@ function openvpn_refresh_crls() { } diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 15bfc581..31e5eb57 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1268,7 +1268,7 @@ <descr>Patch to fix OpenVPN tap bridging on 2.0.x. WARNING! Cannot be uninstalled.</descr> <category>System</category> <config_file>http://www.pfsense.com/packages/config/openvpn_tapfix_20x/openvpn_tapfix_20x.xml</config_file> - <version>0.2</version> + <version>0.3</version> <status>BETA</status> <required_version>2.0</required_version> <maximum_version>2.1</maximum_version> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index abaefafa..f16d7993 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1201,7 +1201,7 @@ <descr>Patch to fix OpenVPN tap bridging on 2.0.x. WARNING! Cannot be uninstalled.</descr> <category>System</category> <config_file>http://www.pfsense.com/packages/config/openvpn_tapfix_20x/openvpn_tapfix_20x.xml</config_file> - <version>0.2</version> + <version>0.3</version> <status>BETA</status> <required_version>2.0</required_version> <maximum_version>2.1</maximum_version> |