From owner-svn-src-projects@FreeBSD.ORG  Fri May 29 19:03:47 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 B40F91065674;
	Fri, 29 May 2009 19:03:47 +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 A2D548FC1D;
	Fri, 29 May 2009 19:03:47 +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 n4TJ3l20083624;
	Fri, 29 May 2009 19:03:47 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4TJ3lxj083623;
	Fri, 29 May 2009 19:03:47 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200905291903.n4TJ3lxj083623@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 29 May 2009 19:03:47 +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: r193048 - projects/ngroups/usr.sbin/jail
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 May 2009 19:03:48 -0000

Author: brooks
Date: Fri May 29 19:03:47 2009
New Revision: 193048
URL: http://svn.freebsd.org/changeset/base/193048

Log:
  Fix a botched merge in r193002 by removing an almost duplicate line.

Modified:
  projects/ngroups/usr.sbin/jail/jail.c

Modified: projects/ngroups/usr.sbin/jail/jail.c
==============================================================================
--- projects/ngroups/usr.sbin/jail/jail.c	Fri May 29 18:50:27 2009	(r193047)
+++ projects/ngroups/usr.sbin/jail/jail.c	Fri May 29 19:03:47 2009	(r193048)
@@ -101,7 +101,7 @@ main(int argc, char **argv)
 	struct iovec rparams[2];
 	struct passwd *pwd = NULL;
 	gid_t *groups = NULL;
-	int ch, cmdarg, i, jail_set_flags, jid, ngroups;
+	int ch, cmdarg, i, jail_set_flags, jid, ngroups, ngroups_max;
 	int hflag, iflag, Jflag, lflag, rflag, uflag, Uflag;
 	char *ep, *jailname, *securelevel, *username, *JidFile;
 	char errmsg[ERRMSG_SIZE];
@@ -119,7 +119,6 @@ main(int argc, char **argv)
 	if ((groups = malloc(sizeof(gid_t) * ngroups_max)) == NULL)
 		err(1, "malloc");
 
-	while ((ch = getopt(argc, argv, "hiln:s:u:U:J:")) != -1) {
 	while ((ch = getopt(argc, argv, "cdhilmn:r:s:u:U:J:")) != -1) {
 		switch (ch) {
 		case 'd':