From 146bd61a96fdef49d46caad2fad907478325a6be Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Tue, 26 Mar 2013 06:51:15 -0700
Subject: [PATCH] Fixes for Allowing user root to add jobs/steps to the dbd.
---
src/slurmdbd/proc_req.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/slurmdbd/proc_req.c b/src/slurmdbd/proc_req.c
index af585029d22..02b11c44ec6 100644
--- a/src/slurmdbd/proc_req.c
+++ b/src/slurmdbd/proc_req.c
@@ -1791,7 +1791,7 @@ static int _job_complete(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS;
char *comment = NULL;
- if (*uid != slurmdbd_conf->slurm_user_id) {
+ if (*uid != slurmdbd_conf->slurm_user_id && *uid != 0) {
comment = "DBD_JOB_COMPLETE message from invalid uid";
error("CONN:%u %s %u",
slurmdbd_conn->newsockfd, comment, *uid);
@@ -1861,7 +1861,7 @@ static int _job_start(slurmdbd_conn_t *slurmdbd_conn,
dbd_id_rc_msg_t id_rc_msg;
char *comment = NULL;
- if (*uid != slurmdbd_conf->slurm_user_id) {
+ if (*uid != slurmdbd_conf->slurm_user_id && *uid != 0) {
comment = "DBD_JOB_START message from invalid uid";
error("CONN:%u %s %u",
slurmdbd_conn->newsockfd, comment, *uid);
@@ -1901,7 +1901,7 @@ static int _job_suspend(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS;
char *comment = NULL;
- if (*uid != slurmdbd_conf->slurm_user_id) {
+ if (*uid != slurmdbd_conf->slurm_user_id && *uid != 0) {
comment = "DBD_JOB_SUSPEND message from invalid uid";
error("CONN:%u %s %u",
slurmdbd_conn->newsockfd, comment, *uid);
@@ -2530,7 +2530,7 @@ static int _node_state(slurmdbd_conn_t *slurmdbd_conn,
char *comment = NULL;
- if (*uid != slurmdbd_conf->slurm_user_id) {
+ if (*uid != slurmdbd_conf->slurm_user_id && *uid != 0) {
comment = "DBD_NODE_STATE message from invalid uid";
error("CONN:%u %s %u",
slurmdbd_conn->newsockfd, comment, *uid);
@@ -3347,7 +3347,7 @@ static int _send_mult_job_start(slurmdbd_conn_t *slurmdbd_conn,
dbd_job_start_msg_t *job_start_msg;
dbd_id_rc_msg_t *id_rc_msg;
- if (*uid != slurmdbd_conf->slurm_user_id) {
+ if (*uid != slurmdbd_conf->slurm_user_id && *uid != 0) {
comment = "DBD_SEND_MULT_JOB_START message from invalid uid";
error("%s %u", comment, *uid);
*out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
@@ -3401,7 +3401,7 @@ static int _send_mult_msg(slurmdbd_conn_t *slurmdbd_conn,
Buf req_buf = NULL, ret_buf = NULL;
int rc = SLURM_SUCCESS;
- if (*uid != slurmdbd_conf->slurm_user_id) {
+ if (*uid != slurmdbd_conf->slurm_user_id && *uid != 0) {
comment = "DBD_SEND_MULT_MSG message from invalid uid";
error("%s %u", comment, *uid);
*out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
@@ -3457,7 +3457,7 @@ static int _step_complete(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS;
char *comment = NULL;
- if (*uid != slurmdbd_conf->slurm_user_id) {
+ if (*uid != slurmdbd_conf->slurm_user_id && *uid != 0) {
comment = "DBD_STEP_COMPLETE message from invalid uid";
error("%s %u", comment, *uid);
rc = ESLURM_ACCESS_DENIED;
@@ -3530,7 +3530,7 @@ static int _step_start(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS;
char *comment = NULL;
- if (*uid != slurmdbd_conf->slurm_user_id) {
+ if (*uid != slurmdbd_conf->slurm_user_id && *uid != 0) {
comment = "DBD_STEP_START message from invalid uid";
error("%s %u", comment, *uid);
rc = ESLURM_ACCESS_DENIED;
--
GitLab