svn commit: r193048 - projects/ngroups/usr.sbin/jail
Brooks Davis
brooks at FreeBSD.org
Fri May 29 19:03:48 UTC 2009
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':
More information about the svn-src-projects
mailing list