From cff821257bebdbfba87d183726ea9672625c2e77 Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Tue, 31 Oct 2023 01:47:26 +0100
Subject: check_users: Change option for sanity checking arguments to avoid
 segfault

---
 plugins/check_users.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'plugins/check_users.c')

diff --git a/plugins/check_users.c b/plugins/check_users.c
index 7cf7a2cc..916a691d 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -227,18 +227,23 @@ process_arguments (int argc, char **argv)
 	}
 
 	c = optind;
+
 	if (warning_range == NULL && argc > c)
 		warning_range = argv[c++];
+
 	if (critical_range == NULL && argc > c)
 		critical_range = argv[c++];
 
 	/* this will abort in case of invalid ranges */
 	set_thresholds (&thlds, warning_range, critical_range);
 
-	if (thlds->warning->end < 0)
-		usage4 (_("Warning threshold must be a positive integer"));
-	if (thlds->critical->end < 0)
-		usage4 (_("Critical threshold must be a positive integer"));
+	if (!thlds->warning) {
+		usage4 (_("Warning threshold must be a valid range expression"));
+	}
+
+	if (!thlds->critical) {
+		usage4 (_("Critical threshold must be a valid range expression"));
+	}
 
 	return OK;
 }
-- 
cgit v1.2.3-74-g34f1


From a9d77ac5456fa0366783f7fec2525d4c159fecdf Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Tue, 31 Oct 2023 01:51:27 +0100
Subject: check_users: Update help to properly show that thresholds are ranges

---
 plugins/check_users.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/check_users.c')

diff --git a/plugins/check_users.c b/plugins/check_users.c
index 916a691d..89b95369 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -266,10 +266,10 @@ print_help (void)
 	printf (UT_HELP_VRSN);
 	printf (UT_EXTRA_OPTS);
 
-	printf (" %s\n", "-w, --warning=INTEGER");
-	printf ("    %s\n", _("Set WARNING status if more than INTEGER users are logged in"));
-	printf (" %s\n", "-c, --critical=INTEGER");
-	printf ("    %s\n", _("Set CRITICAL status if more than INTEGER users are logged in"));
+	printf (" %s\n", "-w, --warning=RANGE_EXPRESSION");
+	printf ("    %s\n", _("Set WARNING status if number of logged in users violates RANGE_EXPRESSION"));
+	printf (" %s\n", "-c, --critical=RANGE_EXPRESSION");
+	printf ("    %s\n", _("Set CRITICAL status if number of logged in users violates RANGE_EXPRESSION"));
 
 	printf (UT_SUPPORT);
 }
-- 
cgit v1.2.3-74-g34f1