Merge branch 'slurm-2.6' of https://github.com/SchedMD/slurm into slurm-2.6

NEWS

@@ -5,6 +5,8 @@ documents those changes that are of interest to users and admins.
 ========================
  -- Fix issue with reconfig and GrpCPURunMins
  -- Fix of wrong node/job state problem after reconfig
+ -- Allow users who are coordinators update their own limits in the accounts
+    they are coordinators over.
 
 * Changes in Slurm 2.6.1
 ========================

doc/html/faq.shtml

@@ -159,6 +159,7 @@ script for Slurm?</a></li>
 launch a shell on a node in the job's allocation?</a></li>
 <li><a href="#upgrade">What should I be aware of when upgrading Slurm?</a></li>
 <li><a href="#torque">How easy is it to switch from PBS or Torque to Slurm?</a></li>
+<li><a href="#sssd">I am having trouble using SSSD with Slurm.</a></li>
 </ol>
 
 <h2>For Management</h2>
@@ -1701,6 +1702,17 @@ Slurm recognizes and translates the "#PBS" options in batch scripts.
 Most, but not all options are supported.
 Please share any enhancements that you make.</p>
 
+<p><a name="sssd"><b>53. I am having trouble using SSSD with Slurm.</b></a></br>
+SSSD or System Security Services Deamon does not allow enumeration of group
+members by default.
+SSSD is also case sensitive, which could possible raise other issues.
+Add the following lines to <i>/etc/ssd/ssd.conf</i> on your head node to
+address these issues:</p>
+<pre>
+enumerate = True
+case_sensitive = False
+</pre>
+
 <p class="footer"><a href="#top">top</a></p>
 
 <p style="text-align:center;">Last modified 21 August 2013</p>

src/plugins/accounting_storage/mysql/as_mysql_assoc.c

@@ -3022,8 +3022,10 @@ extern List as_mysql_modify_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
 
 	if (!(is_admin = is_user_min_admin_level(
 		      mysql_conn, uid, SLURMDB_ADMIN_OPERATOR))) {
-		if (assoc_cond->user_list
-		    && (list_count(assoc_cond->user_list) == 1)) {
+		if (is_user_any_coord(mysql_conn, &user)) {
+			goto is_same_user;
+		} else if (assoc_cond->user_list
+			   && (list_count(assoc_cond->user_list) == 1)) {
 			uid_t pw_uid;
 			char *name;
 			name = list_peek(assoc_cond->user_list);
@@ -3047,12 +3049,9 @@ extern List as_mysql_modify_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
 			}
 		}
 
-		if (!is_user_any_coord(mysql_conn, &user)) {
-			error("Only admins/coordinators can "
-			      "modify associations");
-			errno = ESLURM_ACCESS_DENIED;
-			return NULL;
-		}
+		error("Only admins/coordinators can modify associations");
+		errno = ESLURM_ACCESS_DENIED;
+		return NULL;
 	}
 is_same_user:
 
@@ -3145,6 +3144,7 @@ is_same_user:
 
 	if (!ret_list) {
 		reset_mysql_conn(mysql_conn);
+		errno = rc;
 		return NULL;
 	} else if (!list_count(ret_list)) {
 		reset_mysql_conn(mysql_conn);