From owner-svn-src-all@FreeBSD.ORG  Wed Oct 12 01:19:12 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE8A3106566B;
	Wed, 12 Oct 2011 01:19:12 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DE6348FC13;
	Wed, 12 Oct 2011 01:19:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9C1JCrv040438;
	Wed, 12 Oct 2011 01:19:12 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9C1JCPd040436;
	Wed, 12 Oct 2011 01:19:12 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201110120119.p9C1JCPd040436@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 12 Oct 2011 01:19:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226274 - head/usr.bin/newgrp
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Oct 2011 01:19:13 -0000

Author: delphij
Date: Wed Oct 12 01:19:12 2011
New Revision: 226274
URL: http://svn.freebsd.org/changeset/base/226274

Log:
   - Fix an off-by-one bug in addgroup().
   - Fix the error message when setgid() failed.
  
  PR:		bin/161509
  Submitted by:	Jeremy Huddleston <jeremyhu apple com>
  MFC after:	2 weeks

Modified:
  head/usr.bin/newgrp/newgrp.c

Modified: head/usr.bin/newgrp/newgrp.c
==============================================================================
--- head/usr.bin/newgrp/newgrp.c	Wed Oct 12 01:09:57 2011	(r226273)
+++ head/usr.bin/newgrp/newgrp.c	Wed Oct 12 01:19:12 2011	(r226274)
@@ -140,7 +140,7 @@ restoregrps(void)
 	if (initres < 0)
 		warn("initgroups");
 	if (setres < 0)
-		warn("setgroups");
+		warn("setgid");
 }
 
 static void
@@ -220,7 +220,7 @@ addgroup(const char *grpname)
 
 	/* Add old effective gid to supp. list if it does not exist. */
 	if (egid != grp->gr_gid && !inarray(egid, grps, ngrps)) {
-		if (ngrps == ngrps_max)
+		if (ngrps + 1 >= ngrps_max)
 			warnx("too many groups");
 		else {
 			grps[ngrps++] = egid;