From 2efc0d86687c7ef225affbd4ab118312069c15df Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 5 Jun 2018 13:40:12 +0200
Subject: [PATCH] net/relayd: revert a few changes to plugin file

The diff against stable/18.1 reveals a few modifications that
make it hard to spot actual changes, revert a few of those
since the relayd.inc file is still in place and now clearly
indicates what has been dropped and what hasn't.
---
 .../src/etc/inc/plugins.inc.d/relayd.inc      | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc b/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc
index eec641244..eb3b9f931 100644
--- a/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc
+++ b/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc
@@ -37,45 +37,54 @@ function relayd_enabled()
 
 function relayd_firewall($fw)
 {
-    if (relayd_enabled()) {
-        $fw->registerAnchor('relayd/*', 'rdr');
-        $fw->registerAnchor('relayd/*', 'fw');
+    if (!relayd_enabled()) {
+        return;
     }
+
+    $fw->registerAnchor('relayd/*', 'rdr');
+    $fw->registerAnchor('relayd/*', 'fw');
 }
 
 function relayd_services()
 {
-    global $config;
-
     $services = array();
 
-    if (relayd_enabled()) {
-        $services[] = array(
-            'description' => gettext('Relayd'),
-            'configd' => array(
-                'restart' => array('relayd restart'),
-                'start' => array('relayd start'),
-                'stop' => array('relayd stop'),
-            ),
-            'name' => 'relayd',
-        );
+    if (!relayd_enabled()) {
+        return $services;
     }
 
+    $services[] = array(
+        'description' => gettext('Relayd Load Balancer'),
+        'configd' => array(
+            'restart' => array('relayd restart'),
+            'start' => array('relayd start'),
+            'stop' => array('relayd stop'),
+        ),
+        'name' => 'relayd',
+    );
+
     return $services;
 }
 
 function relayd_xmlrpc_sync()
 {
-    return array(array(
-        'description' => gettext('Relayd'),
+    $result = array();
+
+    $result[] = array(
+        'description' => gettext('Relayd Load Balancer'),
         'section' => 'OPNsense.relayd',
-        'id' => 'relayd',
-    ));
+        /* kept for backwards compat: */
+        'id' => 'lb',
+    );
+
+    return $result;
 }
 
 function relayd_syslog()
 {
-    return array('relayd' => array(
-        'facility' => array('relayd'),
-        'remote' => 'relayd'));
+    $logfacilities = array();
+
+    $logfacilities['relayd'] = array('facility' => array('relayd'), 'remote' => 'relayd');
+
+    return $logfacilities;
 }