diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-10-13 08:39:39 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-10-13 08:39:39 -0300 |
commit | 8eec6fc0d1264ab87a9938b25a3f93682d6c8b0f (patch) | |
tree | 2177999c3c13c05c00735008c7345bf7dec6e5d3 /etc/inc/openvpn.inc | |
parent | 10f0a57ab4f47e73a3d248087ee54f805b4d7367 (diff) | |
parent | 5a171fb7cce71f4e2a737847c3ede56298e0b0cf (diff) | |
download | pfsense-8eec6fc0d1264ab87a9938b25a3f93682d6c8b0f.zip pfsense-8eec6fc0d1264ab87a9938b25a3f93682d6c8b0f.tar.gz |
Merge remote branch 'mainline/master' into inc
Diffstat (limited to 'etc/inc/openvpn.inc')
-rw-r--r-- | etc/inc/openvpn.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 1e7e9b8..c528f67 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -392,7 +392,9 @@ function openvpn_reconfigure($mode,& $settings) { $firstsed = 1; $sed .= "\"{$authcfg}\""; } - $sed .= ");"; + $sed .= ");\\\n"; + if (isset($settings['strictusercn'])) + $sed .= "\$strictusercn = true;"; mwexec("/bin/cat /etc/inc/openvpn.auth-user.php | /usr/bin/sed 's/\/\/<template>/{$sed}/g' > {$g['varetc_path']}/openvpn/{$mode_id}.php"); mwexec("/bin/chmod a+x {$g['varetc_path']}/openvpn/{$mode_id}.php"); $conf .= "auth-user-pass-verify {$g['varetc_path']}/openvpn/{$mode_id}.php via-env\n"; |