Prolog startup bug fix

This bug was introduced yesterday in commit
6cb722dc

src/slurmd/slurmd/req.c

@@ -476,7 +476,7 @@ static int _send_slurmd_conf_lite (int fd, slurmd_conf_t *cf)
 }
 
 static int
-_send_slurmstepd_init(int fd, uint16_t type, void *req,
+_send_slurmstepd_init(int fd, int type, void *req,
 		      slurm_addr_t *cli, slurm_addr_t *self,
 		      hostset_t step_hset, uint16_t protocol_version)
 {
@@ -5481,7 +5481,7 @@ _add_starting_step(uint16_t type, void *req)
 		rc = SLURM_FAILURE;
 		goto fail;
 	}
-	switch(type) {
+	switch (type) {
 	case LAUNCH_BATCH_JOB:
 		starting_step->job_id =
 			((batch_job_launch_msg_t *)req)->job_id;
@@ -5504,6 +5504,7 @@ _add_starting_step(uint16_t type, void *req)
 		xfree(starting_step);
 		goto fail;
 	}
+
 	if (!list_append(conf->starting_steps, starting_step)) {
 		error("%s failed to allocate memory for list", __func__);
 		rc = SLURM_FAILURE;
@@ -5537,10 +5538,6 @@ _remove_starting_step(uint16_t type, void *req)
 		job_id =  ((launch_tasks_request_msg_t *)req)->job_id;
 		step_id = ((launch_tasks_request_msg_t *)req)->job_step_id;
 		break;
-	case REQUEST_LAUNCH_PROLOG:
-		job_id  = ((prolog_launch_msg_t *)req)->job_id;
-		step_id = SLURM_EXTERN_CONT;
-		break;
 	default:
 		error("%s called with an invalid type: %u", __func__, type);
 		rc = SLURM_FAILURE;

src/slurmd/slurmstepd/slurmstepd.c

@@ -466,7 +466,7 @@ _init_from_slurmd(int sock, char **argv,
 	slurm_msg_t_init(msg);
 	msg->protocol_version = (uint16_t)proto;
 
-	switch(step_type) {
+	switch (step_type) {
 	case LAUNCH_BATCH_JOB:
 		msg->msg_type = REQUEST_BATCH_JOB_LAUNCH;
 		break;
@@ -474,7 +474,7 @@ _init_from_slurmd(int sock, char **argv,
 		msg->msg_type = REQUEST_LAUNCH_TASKS;
 		break;
 	default:
-		fatal("Unrecognized launch RPC");
+		fatal("%s: Unrecognized launch RPC (%d)", __func__, step_type);
 		break;
 	}
 	if (unpack_msg(msg, buffer) == SLURM_ERROR)