From: Michael Adam <obnox@samba.org>
Date: Thu, 21 Jun 2007 14:23:06 +0000 (+0000)
Subject: r23566: Fix the sys_bsd_setgroups function. The actual workaround was inactive.
X-Git-Tag: samba-4.0.0alpha6~801^2~5576
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f7f3b72b21a024b69f861f2e2169f5efc1a2dce3;p=thirdparty%2Fsamba.git

r23566: Fix the sys_bsd_setgroups function. The actual workaround was inactive.

Michael
(This used to be commit 4b5d9b2ba773e6ce57c38e3c0d5af72ad5a98b51)
---

diff --git a/source3/lib/system.c b/source3/lib/system.c
index 309b21f59fe..9f62ce760af 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -1006,14 +1006,12 @@ static int sys_bsd_setgroups(gid_t primary_gid, int setlen, const gid_t *gidset)
 	 * and insert it at the front.
 	 */
 	if (gidset[0] != primary_gid) {
-	        gid_t *new_gidset;
-
 	        new_gidset = SMB_MALLOC_ARRAY(gid_t, setlen + 1);
 	        if (new_gidset == NULL) {
 			return -1;
 	        }
 
-		memcpy(new_gidset + 1, gidset, ((setlen + 1) * sizeof(gid_t)));
+		memcpy(new_gidset + 1, gidset, (setlen * sizeof(gid_t)));
 		new_gidset[0] = primary_gid;
 		setlen++;
 	}