From bc7b4c27ce30e59bed18d252d921b2e159e6eb78 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 11 Dec 2017 07:35:55 +0100
Subject: [PATCH] security/tinc: merge cleanups from master

---
 .../controllers/OPNsense/Tinc/Api/ServiceController.php   | 8 +++++++-
 .../mvc/app/controllers/OPNsense/Tinc/IndexController.php | 1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/ServiceController.php b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/ServiceController.php
index 0da9416a3..ab8618bb4 100644
--- a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/ServiceController.php
+++ b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/ServiceController.php
@@ -60,8 +60,10 @@ class ServiceController extends ApiControllerBase
     public function startAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
-            $response = $backend->configdRun("tinc start", true);
+            $response = $backend->configdRun("tinc start");
             return array("response" => $response);
         } else {
             return array("response" => array());
@@ -75,6 +77,8 @@ class ServiceController extends ApiControllerBase
     public function stopAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
             $response = $backend->configdRun("tinc stop");
             return array("response" => $response);
@@ -90,6 +94,8 @@ class ServiceController extends ApiControllerBase
     public function restartAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
             $response = $backend->configdRun("tinc restart");
             return array("response" => $response);
diff --git a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/IndexController.php b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/IndexController.php
index b284d1be3..e39afcedd 100644
--- a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/IndexController.php
+++ b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/IndexController.php
@@ -38,7 +38,6 @@ class IndexController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext('Tinc VPN');
         // link dialogs
         $this->view->formDialogNetwork = $this->getForm("dialogNetwork");
         $this->view->formDialogHost = $this->getForm("dialogHost");