merge -r 5505:5523 from slurm-0-6-branch

META

@@ -9,8 +9,8 @@
   Name:		slurm
   Major:	0
   Minor:	6
-  Micro:        1
-  Version:	0.6.1
+  Micro:        2
+  Version:	0.6.2
   Release:	1
   API_CURRENT:	7	
   API_AGE:	4

NEWS

@@ -15,6 +15,10 @@ documents those changes that are of interest to users and admins.
  -- Some infrastructure added for task launch controls (slurm.conf:
     TaskProlog, TaskEpilog, TaskPlugin; srun --task-prolog, --task-epilog).
 
+* Changes in SLURM 0.6.3
+========================
+ -- Fix slurmctld mem leaks (step name and hostlist struct).
+
 * Changes in SLURM 0.6.2
 ========================
  -- Fix sinfo and squeue formatting to properly handle slurm nodes, 

src/common/dist_tasks.c

@@ -81,6 +81,8 @@ int *distribute_tasks(const char *mlist, uint16_t num_cpu_groups,
 	nnodes = hostlist_count(task_hl);
 	ntask = (int *) xmalloc(sizeof(int *) * nnodes);
 	if (!ntask) {
+		hostlist_destroy(master_hl);
+		hostlist_destroy(task_hl);
 		slurm_seterrno(ENOMEM);
 		return NULL;
 	}
@@ -106,6 +108,7 @@ int *distribute_tasks(const char *mlist, uint16_t num_cpu_groups,
 		}
 		free(this_node_name);
 	}
+	hostlist_destroy(master_hl);
 	hostlist_destroy(task_hl);
 
 	if (num_tasks >= ncpus) {

src/slurmctld/step_mgr.c

@@ -107,6 +107,7 @@ delete_all_step_records (struct job_record *job_ptr)
 		}
 		checkpoint_free_jobinfo(step_ptr->check_job);
 		xfree(step_ptr->host);
+		xfree(step_ptr->name);
 		xfree(step_ptr->step_node_list);
 		FREE_NULL_BITMAP(step_ptr->step_node_bitmap);
 		xfree(step_ptr);
@@ -149,6 +150,7 @@ delete_step_record (struct job_record *job_ptr, uint32_t step_id)
 			}
 			checkpoint_free_jobinfo (step_ptr->check_job);
 			xfree(step_ptr->host);
+			xfree(step_ptr->name);
 			xfree(step_ptr->step_node_list);
 			FREE_NULL_BITMAP(step_ptr->step_node_bitmap);
 			xfree(step_ptr);