Merge remote-tracking branch 'origin/slurm-2.6' into slurm-14.03

NEWS

@@ -453,8 +453,9 @@ documents those changes that are of interest to users and admins.
  -- Handle node ranges better when dealing with accounting max node limits.
  -- Fix perlapi to compile correctly with perl 5.18
  -- BGQ - Fix issue with uninitialized variable.
- -- Correct sinfo --sort fields to match documentation: E => Reason, 
+ -- Correct sinfo --sort fields to match documentation: E => Reason,
     H -> Reason Time (new), R -> Partition Name, u/U -> Reason user (new)
+ -- If an invalid assoc_ptr comes in don't use the id to verify it.
 
 * Changes in Slurm 2.6.9
 ========================

src/slurmctld/acct_policy.c

@@ -88,14 +88,12 @@ static bool _valid_job_assoc(struct job_record *job_ptr)
 	    (assoc_ptr->uid != job_ptr->user_id)) {
 		error("Invalid assoc_ptr for jobid=%u", job_ptr->job_id);
 		memset(&assoc_rec, 0, sizeof(slurmdb_association_rec_t));
-		if (job_ptr->assoc_id)
-			assoc_rec.id = job_ptr->assoc_id;
-		else {
-			assoc_rec.acct      = job_ptr->account;
-			if (job_ptr->part_ptr)
-				assoc_rec.partition = job_ptr->part_ptr->name;
-			assoc_rec.uid       = job_ptr->user_id;
-		}
+
+		assoc_rec.acct      = job_ptr->account;
+		if (job_ptr->part_ptr)
+			assoc_rec.partition = job_ptr->part_ptr->name;
+		assoc_rec.uid       = job_ptr->user_id;
+
 		if (assoc_mgr_fill_in_assoc(acct_db_conn, &assoc_rec,
 					    accounting_enforce,
 					    (slurmdb_association_rec_t **)