From bd6d928aa83dd4cbd4ec12288cd98727f4af2a65 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 7 Nov 2016 19:46:40 +0100
Subject: [PATCH] relayd: should grep from top dir ;)

---
 src/etc/rc.bootup                        | 2 +-
 src/etc/rc.filter_configure_xmlrpc       | 2 +-
 src/www/load_balancer_monitor.php        | 2 +-
 src/www/load_balancer_pool.php           | 2 +-
 src/www/load_balancer_setting.php        | 2 +-
 src/www/load_balancer_virtual_server.php | 2 +-
 src/www/status_lb_pool.php               | 2 +-
 src/www/status_lb_vs.php                 | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index 776341ef8..f75cf878c 100755
--- a/src/etc/rc.bootup
+++ b/src/etc/rc.bootup
@@ -201,7 +201,7 @@ system_ntp_configure(false);
 echo "done.\n";
 
 /* start load balancer daemon */
-relayd_configure();
+relayd_configure_do();
 
 /* start DHCP service */
 services_dhcpd_configure();
diff --git a/src/etc/rc.filter_configure_xmlrpc b/src/etc/rc.filter_configure_xmlrpc
index fbd51d44a..8d3e52eab 100755
--- a/src/etc/rc.filter_configure_xmlrpc
+++ b/src/etc/rc.filter_configure_xmlrpc
@@ -45,6 +45,6 @@ require_once("rrd.inc");
 
 system_routing_configure();
 setup_gateways_monitor();
-relayd_configure();
+relayd_configure_do();
 openvpn_resync_all();
 services_dhcpd_configure();
diff --git a/src/www/load_balancer_monitor.php b/src/www/load_balancer_monitor.php
index 7a52ade1c..4d806bc24 100644
--- a/src/www/load_balancer_monitor.php
+++ b/src/www/load_balancer_monitor.php
@@ -62,7 +62,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         exit;
     } elseif (!empty($_POST['apply'])) {
         /* reload all components that use igmpproxy */
-        relayd_configure();
+        relayd_configure_do();
         filter_configure();
         clear_subsystem_dirty('loadbalancer');
         header(url_safe('Location: /load_balancer_monitor.php'));
diff --git a/src/www/load_balancer_pool.php b/src/www/load_balancer_pool.php
index c0f5908d6..fa60eed11 100644
--- a/src/www/load_balancer_pool.php
+++ b/src/www/load_balancer_pool.php
@@ -61,7 +61,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         }
         exit;
     } elseif (!empty($_POST['apply'])) {
-        relayd_configure();
+        relayd_configure_do();
         filter_configure();
         clear_subsystem_dirty('loadbalancer');
         header(url_safe('Location: /load_balancer_monitor.php'));
diff --git a/src/www/load_balancer_setting.php b/src/www/load_balancer_setting.php
index cf34894ae..f76346d00 100644
--- a/src/www/load_balancer_setting.php
+++ b/src/www/load_balancer_setting.php
@@ -53,7 +53,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig = $_POST;
     $input_errors = array();
     if (!empty($pconfig['apply'])) {
-        relayd_configure();
+        relayd_configure_do();
         filter_configure();
         clear_subsystem_dirty('loadbalancer');
         header(url_safe('Location: /load_balancer_setting.php'));
diff --git a/src/www/load_balancer_virtual_server.php b/src/www/load_balancer_virtual_server.php
index fb0597c47..36c81cb89 100644
--- a/src/www/load_balancer_virtual_server.php
+++ b/src/www/load_balancer_virtual_server.php
@@ -86,7 +86,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         }
         exit;
     } elseif (!empty($_POST['apply'])) {
-        relayd_configure();
+        relayd_configure_do();
         filter_configure();
         /* Wipe out old relayd anchors no longer in use. */
         cleanup_lb_marked();
diff --git a/src/www/status_lb_pool.php b/src/www/status_lb_pool.php
index 2b869cdd9..7b0e698b0 100644
--- a/src/www/status_lb_pool.php
+++ b/src/www/status_lb_pool.php
@@ -45,7 +45,7 @@ $a_pool = &$config['load_balancer']['lbpool'];
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     if (!empty($_POST['apply'])) {
-        relayd_configure();
+        relayd_configure_do();
         filter_configure();
         clear_subsystem_dirty('loadbalancer');
         header(url_safe('Location: /status_lb_pool.php'));
diff --git a/src/www/status_lb_vs.php b/src/www/status_lb_vs.php
index 811b7deb5..3ac4e0223 100644
--- a/src/www/status_lb_vs.php
+++ b/src/www/status_lb_vs.php
@@ -45,7 +45,7 @@ if (empty($config['load_balancer']['virtual_server']) || !is_array($config['load
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     if (!empty($_POST['apply'])) {
-        relayd_configure();
+        relayd_configure_do();
         filter_configure();
         clear_subsystem_dirty('loadbalancer');
         header(url_safe('Location: /status_lb_vs.php'));