diff options
| author | Mike Pechkin <mpech@cvs.openbsd.org> | 2003-02-11 18:29:18 +0000 |
|---|---|---|
| committer | Mike Pechkin <mpech@cvs.openbsd.org> | 2003-02-11 18:29:18 +0000 |
| commit | d1feb7b418991fc0cfa458cdf2abd71c8d4ea136 (patch) | |
| tree | ce0bd2185173a336af5e60a3207d49557a0b11d5 | |
| parent | cfd3c606fff3cd900bb41d748bbc1bcb056e213d (diff) | |
More -G/-U deletion + style(9) while millert@ is here.
Make sence.
millert@ ok
| -rw-r--r-- | usr.sbin/chroot/chroot.8 | 18 | ||||
| -rw-r--r-- | usr.sbin/chroot/chroot.c | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/chroot/chroot.8 b/usr.sbin/chroot/chroot.8 index 77e34f67bd6..69a4873866d 100644 --- a/usr.sbin/chroot/chroot.8 +++ b/usr.sbin/chroot/chroot.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: chroot.8,v 1.10 2003/02/08 21:37:04 millert Exp $ +.\" $OpenBSD: chroot.8,v 1.11 2003/02/11 18:29:17 mpech Exp $ .\" .\" Copyright (c) 1988, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -41,8 +41,8 @@ .Nd change root directory .Sh SYNOPSIS .Nm chroot -.Op Fl u Ar user .Op Fl g Ar group,group,... +.Op Fl u Ar user .Ar newroot .Op Ar command .Sh DESCRIPTION @@ -60,6 +60,13 @@ command is restricted to the superuser. .Pp The options are as follows: .Bl -tag -width Ds +.It Fl g Ar group,group,... +Override the primary and supplemental group IDs. +The primary group ID is set to the first group in the list. +Any remaining groups are placed in the supplemental group ID vector. +Each group listed must exist in the +.Xr group 5 +databases. .It Fl u Ar user Set user ID to .Ar user @@ -74,13 +81,6 @@ and databases unless overridden by the .Fl g option. -.It Fl G Ar group,group,... -Override the primary and supplemental group IDs. -The primary group ID is set to the first group in the list. -Any remaining groups are placed in the supplemental group ID vector. -Each group listed must exist in the -.Xr group 5 -databases. .El .Sh ENVIRONMENT .Bl -tag -width SHELL diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c index 663d3d6ba44..a58e2343ab9 100644 --- a/usr.sbin/chroot/chroot.c +++ b/usr.sbin/chroot/chroot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chroot.c,v 1.9 2003/02/08 21:37:04 millert Exp $ */ +/* $OpenBSD: chroot.c,v 1.10 2003/02/11 18:29:17 mpech Exp $ */ /* * Copyright (c) 1988, 1993 @@ -33,7 +33,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1988, 1993\n\ @@ -44,10 +43,11 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)chroot.c 8.1 (Berkeley) 6/9/93"; #else -static const char rcsid[] = "$OpenBSD: chroot.c,v 1.9 2003/02/08 21:37:04 millert Exp $"; +static const char rcsid[] = "$OpenBSD: chroot.c,v 1.10 2003/02/11 18:29:17 mpech Exp $"; #endif #endif /* not lint */ +#include <sys/types.h> #include <ctype.h> #include <err.h> #include <errno.h> |