diff options
author | jim-p <jimp@pfsense.org> | 2011-07-27 12:49:55 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2011-07-27 12:49:55 -0400 |
commit | 2c466077934c3812aed9d15b77ab515e4b3e116d (patch) | |
tree | 6c8a9fb343f978ac65ab94c5265114ce775336b9 /etc | |
parent | c355573484bead1410cca17b20ba831d7328d366 (diff) | |
download | pfsense-2c466077934c3812aed9d15b77ab515e4b3e116d.zip pfsense-2c466077934c3812aed9d15b77ab515e4b3e116d.tar.gz |
Relax PPTP password restrictions, just prevent starting with a !, and limit to common printable/keyboard characters so it doesn't result in invalid xml. Fixes #1720
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/vpn.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index a217cc7..b731fd0 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -1159,8 +1159,10 @@ EOD; $mpdsecret = ""; if (is_array($pptpdcfg['user'])) { - foreach ($pptpdcfg['user'] as $user) - $mpdsecret .= "{$user['name']} \"{$user['password']}\" {$user['ip']}\n"; + foreach ($pptpdcfg['user'] as $user) { + $pass = str_replace('"', '\"', $user['password']); + $mpdsecret .= "{$user['name']} \"{$pass}\" {$user['ip']}\n"; + } } fwrite($fd, $mpdsecret); |