Skip to content
Snippets Groups Projects
Commit 146bd61a authored by Danny Auble's avatar Danny Auble
Browse files

Fixes for Allowing user root to add jobs/steps to the dbd.

parent 782b3fdb
No related branches found
No related tags found
No related merge requests found
...@@ -1791,7 +1791,7 @@ static int _job_complete(slurmdbd_conn_t *slurmdbd_conn, ...@@ -1791,7 +1791,7 @@ static int _job_complete(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS; int rc = SLURM_SUCCESS;
char *comment = NULL; 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"; comment = "DBD_JOB_COMPLETE message from invalid uid";
error("CONN:%u %s %u", error("CONN:%u %s %u",
slurmdbd_conn->newsockfd, comment, *uid); slurmdbd_conn->newsockfd, comment, *uid);
...@@ -1861,7 +1861,7 @@ static int _job_start(slurmdbd_conn_t *slurmdbd_conn, ...@@ -1861,7 +1861,7 @@ static int _job_start(slurmdbd_conn_t *slurmdbd_conn,
dbd_id_rc_msg_t id_rc_msg; dbd_id_rc_msg_t id_rc_msg;
char *comment = NULL; 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"; comment = "DBD_JOB_START message from invalid uid";
error("CONN:%u %s %u", error("CONN:%u %s %u",
slurmdbd_conn->newsockfd, comment, *uid); slurmdbd_conn->newsockfd, comment, *uid);
...@@ -1901,7 +1901,7 @@ static int _job_suspend(slurmdbd_conn_t *slurmdbd_conn, ...@@ -1901,7 +1901,7 @@ static int _job_suspend(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS; int rc = SLURM_SUCCESS;
char *comment = NULL; 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"; comment = "DBD_JOB_SUSPEND message from invalid uid";
error("CONN:%u %s %u", error("CONN:%u %s %u",
slurmdbd_conn->newsockfd, comment, *uid); slurmdbd_conn->newsockfd, comment, *uid);
...@@ -2530,7 +2530,7 @@ static int _node_state(slurmdbd_conn_t *slurmdbd_conn, ...@@ -2530,7 +2530,7 @@ static int _node_state(slurmdbd_conn_t *slurmdbd_conn,
char *comment = NULL; 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"; comment = "DBD_NODE_STATE message from invalid uid";
error("CONN:%u %s %u", error("CONN:%u %s %u",
slurmdbd_conn->newsockfd, comment, *uid); slurmdbd_conn->newsockfd, comment, *uid);
...@@ -3347,7 +3347,7 @@ static int _send_mult_job_start(slurmdbd_conn_t *slurmdbd_conn, ...@@ -3347,7 +3347,7 @@ static int _send_mult_job_start(slurmdbd_conn_t *slurmdbd_conn,
dbd_job_start_msg_t *job_start_msg; dbd_job_start_msg_t *job_start_msg;
dbd_id_rc_msg_t *id_rc_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"; comment = "DBD_SEND_MULT_JOB_START message from invalid uid";
error("%s %u", comment, *uid); error("%s %u", comment, *uid);
*out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version, *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
...@@ -3401,7 +3401,7 @@ static int _send_mult_msg(slurmdbd_conn_t *slurmdbd_conn, ...@@ -3401,7 +3401,7 @@ static int _send_mult_msg(slurmdbd_conn_t *slurmdbd_conn,
Buf req_buf = NULL, ret_buf = NULL; Buf req_buf = NULL, ret_buf = NULL;
int rc = SLURM_SUCCESS; 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"; comment = "DBD_SEND_MULT_MSG message from invalid uid";
error("%s %u", comment, *uid); error("%s %u", comment, *uid);
*out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version, *out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
...@@ -3457,7 +3457,7 @@ static int _step_complete(slurmdbd_conn_t *slurmdbd_conn, ...@@ -3457,7 +3457,7 @@ static int _step_complete(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS; int rc = SLURM_SUCCESS;
char *comment = NULL; 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"; comment = "DBD_STEP_COMPLETE message from invalid uid";
error("%s %u", comment, *uid); error("%s %u", comment, *uid);
rc = ESLURM_ACCESS_DENIED; rc = ESLURM_ACCESS_DENIED;
...@@ -3530,7 +3530,7 @@ static int _step_start(slurmdbd_conn_t *slurmdbd_conn, ...@@ -3530,7 +3530,7 @@ static int _step_start(slurmdbd_conn_t *slurmdbd_conn,
int rc = SLURM_SUCCESS; int rc = SLURM_SUCCESS;
char *comment = NULL; 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"; comment = "DBD_STEP_START message from invalid uid";
error("%s %u", comment, *uid); error("%s %u", comment, *uid);
rc = ESLURM_ACCESS_DENIED; rc = ESLURM_ACCESS_DENIED;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment