From c84ee389854fe6860bc85c120e18defc85bd269e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 7 Feb 2018 14:59:35 +0100
Subject: [PATCH] net/relayd: post-merge cleanups 1/2

---
 .../OPNsense/Relayd/Api/ServiceController.php          |  6 +++---
 .../OPNsense/Relayd/Api/SettingsController.php         | 10 +++++-----
 .../mvc/app/models/OPNsense/Relayd/ACL/ACL.xml         |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/ServiceController.php b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/ServiceController.php
index ef20031ca..125a69592 100644
--- a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/ServiceController.php
+++ b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/ServiceController.php
@@ -44,7 +44,7 @@ class ServiceController extends ApiMutableServiceControllerBase
     static protected $internalServiceEnabled = 'general.enabled';
     static protected $internalServiceTemplate = 'OPNsense/Relayd';
     static protected $internalServiceName = 'relayd';
-    
+
     /**
      * test relayd configuration
      * @return array
@@ -53,7 +53,7 @@ class ServiceController extends ApiMutableServiceControllerBase
     {
         if ($this->request->isPost()) {
             $this->sessionClose();
-            
+
             $backend = new Backend();
 
             $result['function'] = "configtest";
@@ -68,7 +68,7 @@ class ServiceController extends ApiMutableServiceControllerBase
             return array('status' => 'failed');
         }
     }
-    
+
     /**
      * avoid restarting Relayd on reconfigure
      */
diff --git a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php
index edd7e88a4..15d77c250 100644
--- a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php
+++ b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php
@@ -69,7 +69,7 @@ class SettingsController extends ApiMutableModelControllerBase
         }
         return array("result" => "failed");
     }
-    
+
     /**
      * set relayd properties
      * @param $nodeType
@@ -82,11 +82,11 @@ class SettingsController extends ApiMutableModelControllerBase
         if (!$this->request->isPost() || !$this->request->hasPost("relayd") || $nodeType == null) {
             return array('result' => 'failed');
         }
-        
+
         $this->validateNodeType($nodeType);
-                
+
         $relaydInfo = $this->request->getPost("relayd");
-        
+
         if ($nodeType == 'general') {
             $mdlRelayd = new Relayd();
             $node = $mdlRelayd->getNodeByReference($nodeType);
@@ -99,7 +99,7 @@ class SettingsController extends ApiMutableModelControllerBase
             Config::getInstance()->save();
             return array("result" => "saved");
         }
-            
+
         // perform plugin specific validations
         if ($nodeType == 'virtualserver') {
             if ($relaydInfo[$nodeType]['type'] == 'redirect') {
diff --git a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml
index 85536bca9..34778b365 100644
--- a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml
+++ b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml
@@ -5,6 +5,7 @@
       <patterns>
          <pattern>ui/relayd/*</pattern>
          <pattern>api/relayd/*</pattern>
+         <pattern>diag_logs_relayd.php*</pattern>
       </patterns>
    </page-services-relayd>
 </acl>