diff options
| author | Ermal <eri@pfsense.org> | 2010-11-26 21:54:44 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-11-26 21:54:44 +0000 |
| commit | befad72821f522bf2c23a883f72ade8af48b8533 (patch) | |
| tree | 7ad22eb6e84e12ac5ebdc1130af5eafc3c7c63f7 /etc/inc/openvpn.inc | |
| parent | bad2989788835047d97667ae69b11885e2e3d493 (diff) | |
| download | pfsense-befad72821f522bf2c23a883f72ade8af48b8533.zip pfsense-befad72821f522bf2c23a883f72ade8af48b8533.tar.gz | |
Ticket #1037. Move environment manipulation to the authentication script since escaping slashes is not so easz on dynamic built paths.
Diffstat (limited to 'etc/inc/openvpn.inc')
| -rw-r--r-- | etc/inc/openvpn.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 9da5ce1..9c85172 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -394,9 +394,8 @@ function openvpn_reconfigure($mode,& $settings) { } $sed .= ");\\\n"; if ($settings['strictusercn']) - $sed .= "\$strictusercn = true;\n"; - $sed .= "putenv(\"LDAPTLS_CACERT={$g['varetc_path']}/openvpn/{$modeid}.ca\");\n"; - $sed .= "putenv(\"LDAPTLS_REQCERT=never\");\n"; + $sed .= "\$strictusercn = true;"; + $sed .= " \$modeid = \"{$mode_id}\""; 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"; |
