summaryrefslogtreecommitdiffstats
path: root/usr/local/www
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-10-28 18:34:38 +0000
committerErmal <eri@pfsense.org>2010-10-28 18:34:38 +0000
commite3bbd29a562c8d534e52b3c1016935de89b7e586 (patch)
tree32ee47d9e2fdf04c84e73430035c7f296c523059 /usr/local/www
parent7c2551881c7de4c2823f8b0b0f1a2af5eb57961c (diff)
downloadpfsense-e3bbd29a562c8d534e52b3c1016935de89b7e586.zip
pfsense-e3bbd29a562c8d534e52b3c1016935de89b7e586.tar.gz
Replace \r from custom options otherwise it breaks config.
Diffstat (limited to 'usr/local/www')
-rw-r--r--usr/local/www/vpn_openvpn_client.php2
-rw-r--r--usr/local/www/vpn_openvpn_server.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php
index 750f936..4b23c95 100644
--- a/usr/local/www/vpn_openvpn_client.php
+++ b/usr/local/www/vpn_openvpn_client.php
@@ -225,7 +225,7 @@ if ($_POST) {
$client['proxy_passwd'] = $pconfig['proxy_passwd'];
$client['description'] = $pconfig['description'];
$client['mode'] = $pconfig['mode'];
- $client['custom_options'] = $pconfig['custom_options'];
+ $client['custom_options'] = str_replace("\r\n", "\n", $pconfig['custom_options']);
if ($tls_mode) {
$client['caref'] = $pconfig['caref'];
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php
index db02085..ca6c261 100644
--- a/usr/local/www/vpn_openvpn_server.php
+++ b/usr/local/www/vpn_openvpn_server.php
@@ -285,7 +285,7 @@ if ($_POST) {
list($server['interface'], $server['ipaddr']) = explode ("|",$pconfig['interface']);
$server['local_port'] = $pconfig['local_port'];
$server['description'] = $pconfig['description'];
- $server['custom_options'] = $pconfig['custom_options'];
+ $server['custom_options'] = str_replace("\r\n", "\n", $pconfig['custom_options']);
if ($tls_mode) {
if ($pconfig['tlsauth_enable']) {
OpenPOWER on IntegriCloud