From 027f4ab75627ec22eafd0ec57674842ab2e7a73c Mon Sep 17 00:00:00 2001
From: Don Lipari <lipari1@llnl.gov>
Date: Tue, 1 Dec 2009 21:05:03 +0000
Subject: [PATCH] -- Patch from Matthieu Hautreux to improve error message in
 slurmd/req.c

---
 NEWS                    | 1 +
 src/slurmd/slurmd/req.c | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 73e46002f67..cb37208d62b 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ documents those changes that are of interest to users and admins.
  -- replaced local gtk m4 test with AM_PATH_GTK_2_0
  -- changed AC_CHECK_LIB to AC_SEARCH_LIBS to avoid extra libs in
     compile lines.
+ -- Patch from Matthieu Hautreux to improve error message in slurmd/req.c
 
 * Changes in SLURM 2.1.0-pre7
 =============================
diff --git a/src/slurmd/slurmd/req.c b/src/slurmd/slurmd/req.c
index ef1fe47216c..cfaf8c66ac1 100644
--- a/src/slurmd/slurmd/req.c
+++ b/src/slurmd/slurmd/req.c
@@ -718,8 +718,10 @@ _check_job_credential(launch_tasks_request_msg_t *req, uid_t uid,
 	}
 
 	if (!hostset_within(hset, conf->node_name)) {
-		error("job credential invalid for this host [%u.%u %ld %s]",
-		      arg.jobid, arg.stepid, (long) arg.uid, arg.hostlist);
+		error("Invalid job %u.%u credential for user %u: "
+		      "host %s not in hostset %s",
+		      arg.jobid, arg.stepid, arg.uid,
+		      conf->node_name, arg.hostlist);
 		goto fail;
 	}
 
-- 
GitLab