summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2016-03-18 12:09:20 -0400
committerjim-p <jimp@pfsense.org>2016-03-18 12:11:58 -0400
commit93520d92eb5d9627449c88cd9127868dcf0e2c1f (patch)
treefb2c7393b364e9a6244e9d4d7c531019818de33e
parent48f9b1cf3a1c2b2311494bd44e1175d56b468e38 (diff)
downloadpfsense-93520d92eb5d9627449c88cd9127868dcf0e2c1f.zip
pfsense-93520d92eb5d9627449c88cd9127868dcf0e2c1f.tar.gz
Correct the code saving values for GRE. The GRE configure backend code tests for isset, the way the values were copied before it would be set to 'false' which was still set, so the code always triggered when it shouldn't. When reading back from XML at boot time it's OK, so only the web interface is affected. Fixes #6010
-rw-r--r--src/usr/local/www/interfaces_gre_edit.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/usr/local/www/interfaces_gre_edit.php b/src/usr/local/www/interfaces_gre_edit.php
index 6c34470..6ab6d77 100644
--- a/src/usr/local/www/interfaces_gre_edit.php
+++ b/src/usr/local/www/interfaces_gre_edit.php
@@ -147,9 +147,15 @@ if ($_POST) {
$gre['tunnel-remote-net'] = $_POST['tunnel-remote-net'];
$gre['remote-addr'] = $_POST['remote-addr'];
$gre['descr'] = $_POST['descr'];
- $gre['link1'] = isset($_POST['link1']);
- $gre['link2'] = isset($_POST['link2']);
- $gre['link0'] = isset($_POST['link0']);
+ if (isset($_POST['link0'])) {
+ $gre['link0'] = '';
+ }
+ if (isset($_POST['link1'])) {
+ $gre['link1'] = '';
+ }
+ if (isset($_POST['link2'])) {
+ $gre['link2'] = '';
+ }
$gre['greif'] = $_POST['greif'];
$gre['greif'] = interface_gre_configure($gre);
OpenPOWER on IntegriCloud