aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-11-11 15:14:24 -0500
committerjim-p <jimp@pfsense.org>2011-11-11 15:14:24 -0500
commitbcc46ffe0b5ea31cb6871d4b35d4af701d4bc838 (patch)
tree496f7dbe360bd4795c8259ad0b649be0cbc65386 /config
parentcfe9d9f9a0886175db93a3957ad1371df5ce6f56 (diff)
downloadpfsense-packages-bcc46ffe0b5ea31cb6871d4b35d4af701d4bc838.tar.gz
pfsense-packages-bcc46ffe0b5ea31cb6871d4b35d4af701d4bc838.tar.bz2
pfsense-packages-bcc46ffe0b5ea31cb6871d4b35d4af701d4bc838.zip
pull in username-as-common-name fix
Diffstat (limited to 'config')
-rw-r--r--config/openvpn_tapfix_20x/openvpn_tapfix_20x.patch12
1 files changed, 12 insertions, 0 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() {
}