From 36718220b2de8b95ea8ba91a8ca8361a01c40ae3 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Tue, 9 May 2017 15:32:43 -0600
Subject: [PATCH] Revert "Return error when bad separator is given for scontrol
update job licenses."
This reverts commit ecfd007f28e0fb2257ab058e5df64edae5353fad.
---
NEWS | 1 -
src/slurmctld/licenses.c | 5 +----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/NEWS b/NEWS
index ba362ffee4b..f14b8bde6e7 100644
--- a/NEWS
+++ b/NEWS
@@ -64,7 +64,6 @@ documents those changes that are of interest to users and administrators.
destroying a mutex.
-- Fix updating job priority on multiple partitions to be correct.
-- Don't remove admin comment when updating a job.
- -- Return error when bad separator is given for scontrol update job licenses.
* Changes in Slurm 17.02.2
==========================
diff --git a/src/slurmctld/licenses.c b/src/slurmctld/licenses.c
index 2a7053e3f58..0e65617acf7 100644
--- a/src/slurmctld/licenses.c
+++ b/src/slurmctld/licenses.c
@@ -148,12 +148,9 @@ static List _build_license_list(char *licenses, bool *valid)
if ((token[i] == ':') || (token[i] == '*')) {
token[i++] = '\0';
num = (int32_t)strtol(&token[i], &end_num, 10);
- if (*end_num != '\0')
- *valid = false;
- break;
}
}
- if (num < 0 || !(*valid)) {
+ if (num < 0) {
*valid = false;
break;
}
--
GitLab