Merge branch 'slurm-16.05' into slurm-17.02

NEWS

@@ -288,6 +288,8 @@ documents those changes that are of interest to users and administrators.
     limits.
  -- Fix correct state reason when job can't run 'safely' because of an
     association GrpWall limit.
+ -- Squeue always loads new data if user_id option specified
+ -- Fix for possible job ID parsing failure and abort.
 
 * Changes in Slurm 16.05.9
 ==========================

src/squeue/opts.c

@@ -1889,6 +1889,8 @@ _build_step_list( char* str )
 	step = strtok_r(my_step_list, ",", &tmp_char);
 	while (step) {
 		job_name = strtok_r(step, ".", &tmps_char);
+		if (job_name == NULL)
+			break;
 		step_name = strtok_r(NULL, ".", &tmps_char);
 		job_id = strtol(job_name, &end_ptr, 10);
 		if (end_ptr[0] == '_')

src/squeue/squeue.c

@@ -217,7 +217,7 @@ _print_job ( bool clear_old )
 		return SLURM_ERROR;
 	}
 	old_job_ptr = new_job_ptr;
-	if (params.job_id || params.job_id)
+	if (params.job_id || params.user_id)
 		old_job_ptr->last_update = (time_t) 0;
 
 	if (params.verbose) {