From owner-svn-src-all@FreeBSD.ORG Wed Dec 26 23:16:25 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3DE31DAA; Wed, 26 Dec 2012 23:16:25 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2349C8FC12; Wed, 26 Dec 2012 23:16:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBQNGP1d061199; Wed, 26 Dec 2012 23:16:25 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBQNGPu3061198; Wed, 26 Dec 2012 23:16:25 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201212262316.qBQNGPu3061198@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 26 Dec 2012 23:16:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r244721 - head/usr.sbin/pw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Dec 2012 23:16:25 -0000 Author: bapt Date: Wed Dec 26 23:16:24 2012 New Revision: 244721 URL: http://svnweb.freebsd.org/changeset/base/244721 Log: Simplify copying of group members by using memcpy Submitted by: Christoph Mallon Modified: head/usr.sbin/pw/pw_user.c Modified: head/usr.sbin/pw/pw_user.c ============================================================================== --- head/usr.sbin/pw/pw_user.c Wed Dec 26 23:14:33 2012 (r244720) +++ head/usr.sbin/pw/pw_user.c Wed Dec 26 23:16:24 2012 (r244721) @@ -757,8 +757,7 @@ pw_user(struct userconf * cnf, int mode, continue; members = malloc(sizeof(char *) * (j + 2)); - for (j = 0; grp->gr_mem[j] != NULL; j++) - members[j] = grp->gr_mem[j]; + memcpy(members, grp->gr_mem, j * sizeof(*members)); members[j] = pwd->pw_name; members[j+1] = NULL;