From owner-svn-src-projects@FreeBSD.ORG Wed Jun 17 20:26:21 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC3971065672; Wed, 17 Jun 2009 20:26:21 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DA5348FC18; Wed, 17 Jun 2009 20:26:21 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5HKQLGO087126; Wed, 17 Jun 2009 20:26:21 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5HKQLA3087124; Wed, 17 Jun 2009 20:26:21 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <200906172026.n5HKQLA3087124@svn.freebsd.org> From: Brooks Davis Date: Wed, 17 Jun 2009 20:26:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r194394 - projects/ngroups/usr.sbin/mountd X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2009 20:26:22 -0000 Author: brooks Date: Wed Jun 17 20:26:21 2009 New Revision: 194394 URL: http://svn.freebsd.org/changeset/base/194394 Log: We're filling in an xucred so use XU_NGROUPS instead of NGRPS. Modified: projects/ngroups/usr.sbin/mountd/mountd.c Modified: projects/ngroups/usr.sbin/mountd/mountd.c ============================================================================== --- projects/ngroups/usr.sbin/mountd/mountd.c Wed Jun 17 20:12:23 2009 (r194393) +++ projects/ngroups/usr.sbin/mountd/mountd.c Wed Jun 17 20:26:21 2009 (r194394) @@ -2644,7 +2644,7 @@ parsecred(namelist, cr) char *names; struct passwd *pw; struct group *gr; - gid_t groups[NGRPS + 1]; + gid_t groups[XU_NGROUPS + 1]; int ngroups; cr->cr_version = XUCRED_VERSION; @@ -2672,7 +2672,7 @@ parsecred(namelist, cr) return; } cr->cr_uid = pw->pw_uid; - ngroups = NGRPS + 1; + ngroups = XU_NGROUPS + 1; if (getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups)) syslog(LOG_ERR, "too many groups"); /* @@ -2697,7 +2697,7 @@ parsecred(namelist, cr) return; } cr->cr_ngroups = 0; - while (names != NULL && *names != '\0' && cr->cr_ngroups < NGRPS) { + while (names != NULL && *names != '\0' && cr->cr_ngroups < XU_NGROUPS) { name = strsep(&names, ":"); if (isdigit(*name) || *name == '-') { cr->cr_groups[cr->cr_ngroups++] = atoi(name); @@ -2709,7 +2709,7 @@ parsecred(namelist, cr) cr->cr_groups[cr->cr_ngroups++] = gr->gr_gid; } } - if (names != NULL && *names != '\0' && cr->cr_ngroups == NGRPS) + if (names != NULL && *names != '\0' && cr->cr_ngroups == XU_NGROUPS) syslog(LOG_ERR, "too many groups"); }