From eb3bee5016709bdfb485343c53cd7e52bcf85923 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 17 May 2017 10:57:02 -0400
Subject: [PATCH] Backport syslogd service definition/control to RELENG_2_3.
 Ticket #4382

(cherry picked from commit 5917696ded82c3343d52c03b850d4ce564a159b4)
---
 src/etc/inc/service-utils.inc   | 29 ++++++++++++++++++++++++++---
 src/usr/local/www/shortcuts.inc |  5 +++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/etc/inc/service-utils.inc b/src/etc/inc/service-utils.inc
index 677036cbee..57aee80318 100644
--- a/src/etc/inc/service-utils.inc
+++ b/src/etc/inc/service-utils.inc
@@ -20,13 +20,15 @@
  * limitations under the License.
  */
 
-require_once("globals.inc");
 require_once("captiveportal.inc");
-require_once("openvpn.inc");
+require_once("globals.inc");
+require_once("gwlb.inc");
 require_once("ipsec.inc");
+require_once("openvpn.inc");
+require_once("system.inc");
+require_once("util.inc");
 require_once("vpn.inc");
 require_once("vslb.inc");
-require_once("gwlb.inc");
 
 define("RCFILEPREFIX", "/usr/local/etc/rc.d/");
 function write_rcfile($params) {
@@ -261,6 +263,11 @@ function get_services() {
 	$pconfig['description'] = gettext("NTP clock sync");
 	$services[] = $pconfig;
 
+	$pconfig = array();
+	$pconfig['name'] = "syslogd";
+	$pconfig['description'] = gettext("System Logger Daemon");
+	$services[] = $pconfig;
+
 	if (is_array($config['captiveportal'])) {
 		foreach ($config['captiveportal'] as $zone => $setting) {
 			if (isset($setting['enable'])) {
@@ -620,6 +627,9 @@ function service_control_start($name, $extras) {
 			relayd_configure();
 			filter_configure();
 			break;
+		case 'syslogd':
+			system_syslogd_start();
+			break;
 		default:
 			start_service($name);
 			break;
@@ -690,6 +700,16 @@ function service_control_stop($name, $extras) {
 		case 'relayd':
 			mwexec('pkill relayd');
 			break;
+		case 'syslogd':
+			if (isvalidpid("{$g['varrun_path']}/syslog.pid")) {
+				sigkillbypid("{$g['varrun_path']}/syslog.pid", "TERM");
+				usleep(100000);
+			}
+			if (isvalidpid("{$g['varrun_path']}/syslog.pid")) {
+				sigkillbypid("{$g['varrun_path']}/syslog.pid", "KILL");
+				usleep(100000);
+			}
+			break;
 		default:
 			stop_service($name);
 			break;
@@ -760,6 +780,9 @@ function service_control_restart($name, $extras) {
 			relayd_configure(true);
 			filter_configure();
 			break;
+		case 'syslogd':
+			system_syslogd_start();
+			break;
 		default:
 			restart_service($name);
 			break;
diff --git a/src/usr/local/www/shortcuts.inc b/src/usr/local/www/shortcuts.inc
index 27c36b159a..370080b9b5 100644
--- a/src/usr/local/www/shortcuts.inc
+++ b/src/usr/local/www/shortcuts.inc
@@ -295,6 +295,11 @@ $shortcuts['snmp'] = array();
 $shortcuts['snmp']['main'] = "services_snmp.php";
 $shortcuts['snmp']['service'] = "bsnmpd";
 
+$shortcuts['syslogd'] = array();
+$shortcuts['syslogd']['main'] = "status_logs_settings.php";
+$shortcuts['syslogd']['log'] = "status_logs.php";
+$shortcuts['syslogd']['service'] = "syslogd";
+
 $shortcuts['authentication'] = array();
 $shortcuts['authentication']['main'] = "system_authservers.php";
 // $shortcuts['authentication']['status'] = "diag_authentication.php";