diff --git a/doc/html/faq.shtml b/doc/html/faq.shtml
index 2c7451ba89946fc2471e3e25cb88abafce0f9a4f..094826494e89c7b5becb197266731c21d8f7b4b5 100644
--- a/doc/html/faq.shtml
+++ b/doc/html/faq.shtml
@@ -1145,7 +1145,7 @@ chmod 600 /etc/ssh/allowed_users
 <p><b>NOTE:</b> root is not necessarily listed on the allowed_users, but I
 feel somewhat safe if it's on the list.</p>
 
-<p><b>Step 3.</b> On /etc/pam.d/sshd, add pam_listfile.so with sufficient flag 
+<p><b>Step 3.</b> On /etc/pam.d/sshd, add pam_listfile.so with sufficient flag
 before pam_slurm.so (e.g. my /etc/pam.d/sshd looks like this):</p>
 <pre>
 #%PAM-1.0
diff --git a/src/slurmctld/partition_mgr.c b/src/slurmctld/partition_mgr.c
index 74b50dd6d3e7ec7f325f0c75ee01454a9c03404b..6256e96383e8012e10c0f52d7b9e65eb081c5167 100644
--- a/src/slurmctld/partition_mgr.c
+++ b/src/slurmctld/partition_mgr.c
@@ -1767,6 +1767,7 @@ extern int validate_group(struct part_record *part_ptr, uid_t run_uid)
 	ii = sysconf(_SC_GETGR_R_SIZE_MAX);
 	buflen = MAX(PW_BUF_SIZE, ii);
 #endif
+	grp_buffer = xmalloc(buflen);
 	while (1) {
 		slurm_seterrno(0);
 		res = getgrgid_r(pwd.pw_gid, &grp, grp_buffer, buflen,
@@ -1784,6 +1785,7 @@ extern int validate_group(struct part_record *part_ptr, uid_t run_uid)
 			}
 			error("%s: Could not find group with gid %ld",
 			      __func__, (long) pwd.pw_gid);
+			xfree(buf);
 			xfree(grp_buffer);
 			return 0;
 		}
@@ -1793,7 +1795,6 @@ extern int validate_group(struct part_record *part_ptr, uid_t run_uid)
 	/* And finally check the name of the primary group against the
 	 * list of allowed group names.  */
 	groups = xstrdup(part_ptr->allow_groups);
-	saveptr;
 	one_group_name = strtok_r(groups, ",", &saveptr);
 	while (one_group_name) {
 		if (strcmp (one_group_name, grp.gr_name) == 0) {