svn merge -r6689:6713 https://eris.llnl.gov/svn/slurm/branches/slurm-0-6-branch

NEWS

@@ -67,6 +67,11 @@ 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.10
+=========================
+ -- Sacct bug fixes: Report correct user name for job step, show "uid.gid"
+    as fifth field of job step record (Andy Riebs, slurm.hp.sacct_uid.patch).
+
 * Changes in SLURM 0.6.9
 ========================
  -- Fix bug in mpi plugin to set the ID correctly

src/sacct/sacct.c

@@ -898,7 +898,7 @@ void doFdump(char* fields[])
 		{ "partition",	"partition",	"partition" },	/*  1 */
 		{ "submitted",	"submitted",	"submitted" },	/*  2 */
 		{ "starttime",	"starttime",	"starttime" },	/*  3 */
-		{ "uid.gid",	"reserved-2",	"uid.gid" },	/*  4 */
+		{ "uid.gid",	"uid.gid",	"uid.gid" },	/*  4 */
 		{ "reserved-1",	"reserved-1",	"reserved-1" },	/*  5 */
 		{ "recordType", "recordType",	"recordType" },	/*  6 */
 		{ "recordVers",	"recordVers",	"recordVers" },	/*  7 */
@@ -2564,7 +2564,6 @@ void printUser(print_what_t which, long idx)
 			printf("%-9s", "---------");
 			break;
 		case JOB:
-		case JOBSTEP:
 			{
 				char	*tmp="(unknown)";
 				struct	passwd *pw;
@@ -2573,6 +2572,15 @@ void printUser(print_what_t which, long idx)
 				printf("%-9s", tmp);
 			}
 			break;
+		case JOBSTEP:
+			{
+				char	*tmp="(unknown)";
+				struct	passwd *pw;
+				if ((pw=getpwuid(jobs[jobsteps[idx].j].uid)))
+					tmp=pw->pw_name;
+				printf("%-9s", tmp);
+			}
+			break;
 	} 
 }