From 49d67d7c2723b1a85dae39bbacc47736879f16f5 Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Fri, 5 Jan 2024 14:33:45 +0100
Subject: [PATCH] set version to 2.1.4 for bugfix release

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 install/froxlor.sql.php                    | 2 +-
 install/updates/froxlor/update_2.1.inc.php | 5 +++++
 lib/Froxlor/Cli/MasterCron.php             | 4 ++++
 lib/Froxlor/Froxlor.php                    | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php
index 0b4d0218..7c7b5bfb 100644
--- a/install/froxlor.sql.php
+++ b/install/froxlor.sql.php
@@ -726,7 +726,7 @@ opcache.validate_timestamps'),
 	('panel', 'logo_overridecustom', '0'),
 	('panel', 'settings_mode', '0'),
 	('panel', 'menu_collapsed', '1'),
-	('panel', 'version', '2.1.3'),
+	('panel', 'version', '2.1.4'),
 	('panel', 'db_version', '202312120');
 
 
diff --git a/install/updates/froxlor/update_2.1.inc.php b/install/updates/froxlor/update_2.1.inc.php
index 8d5f3b7f..484bb645 100644
--- a/install/updates/froxlor/update_2.1.inc.php
+++ b/install/updates/froxlor/update_2.1.inc.php
@@ -274,3 +274,8 @@ if (Froxlor::isFroxlorVersion('2.1.2')) {
 	Update::showUpdateStep("Updating from 2.1.2 to 2.1.3", false);
 	Froxlor::updateToVersion('2.1.3');
 }
+
+if (Froxlor::isFroxlorVersion('2.1.3')) {
+	Update::showUpdateStep("Updating from 2.1.3 to 2.1.4", false);
+	Froxlor::updateToVersion('2.1.4');
+}
diff --git a/lib/Froxlor/Cli/MasterCron.php b/lib/Froxlor/Cli/MasterCron.php
index 4364f5a8..b0b3eac3 100644
--- a/lib/Froxlor/Cli/MasterCron.php
+++ b/lib/Froxlor/Cli/MasterCron.php
@@ -263,6 +263,8 @@ final class MasterCron extends CliCommand
 		if ($jobcount > 0) {
 			if (Settings::Get('system.nssextrausers') == 1) {
 				Extrausers::generateFiles($this->cronLog);
+				// reload crond as shell users might use crontab and the user is only known to crond if reloaded
+				FileDir::safe_exec(escapeshellcmd(Settings::Get('system.crondreload')));
 				return;
 			}
 
@@ -275,6 +277,8 @@ final class MasterCron extends CliCommand
 				FileDir::safe_exec('nscd -i group 1> /dev/null', $false_val, [
 					'>'
 				]);
+				// reload crond as shell users might use crontab and the user is only known to crond if reloaded
+				FileDir::safe_exec(escapeshellcmd(Settings::Get('system.crondreload')));
 			}
 		}
 	}
diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php
index afc45568..e93e48bc 100644
--- a/lib/Froxlor/Froxlor.php
+++ b/lib/Froxlor/Froxlor.php
@@ -31,7 +31,7 @@ final class Froxlor
 {
 
 	// Main version variable
-	const VERSION = '2.1.3';
+	const VERSION = '2.1.4';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
 	const DBVERSION = '202312120';