d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct use of .Nm. Use .Ar when appropriate. Remove unused #includes. Typos.

Browse Source
This commit is contained in:
Philippe Charnier 1998-07-15 06:12:32 +00:00
parent 1ede4662be
commit 6036829ceb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=37660
6 changed files with 74 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
sbin/mount_umap/mount_umap.8
View File

@ -34,6 +34,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mount_umap.8 8.4 (Berkeley) 5/1/95
.\" $Id$
.\"
.Dd May 1, 1995
.Dt MOUNT_UMAP 8
@ -50,13 +51,25 @@
.Ar mount-point
.Sh DESCRIPTION
The
.Nm mount_umap
.Nm
command is used to mount a sub-tree of an existing file system
that uses a different set of uids and gids than the local system.
Such a file system could be mounted from a remote site via NFS or
it could be a file system on removable media brought from some
foreign location that uses a different password file.
.Pp
The
.Nm
command uses a set of files provided by the user to make correspondences
between uids and gids in the sub-tree's original environment and
some other set of ids in the local environment. For instance, user
smith might have uid 1000 in the original environment, while having
uid 2000 in the local environment. The
.Nm
command allows the subtree from smith's original environment to be
mapped in such a way that all files with owning uid 1000 look like
they are actually owned by uid 2000.
.Pp
The options are as follows:
.Bl -tag -width indent
.It Fl o
@ -66,58 +79,44 @@ flag followed by a comma separated string of options.
See the
.Xr mount 8
man page for possible options and their meanings.
.El
.Pp
The
.Nm mount_umap
command uses a set of files provided by the user to make correspondences
between uids and gids in the sub-tree's original environment and
some other set of ids in the local environment. For instance, user
smith might have uid 1000 in the original environment, while having
uid 2000 in the local environment. The
.Nm mount_umap
command allows the subtree from smith's original environment to be
mapped in such a way that all files with owning uid 1000 look like
they are actually owned by uid 2000.
.Pp
.Em target
should be the current location of the sub-tree in the
.It Ar target
Should be the current location of the sub-tree in the
local system's name space.
.Em mount-point
should be a directory
.It Ar mount-point
Should be a directory
where the mapped subtree is to be placed.
.Em uid-mapfile
and
.Em gid-mapfile
describe the mappings to be made between identifiers.
.It Fl u Ar uid-mapfile
.It Fl g Ar gid-mapfile
Describe the mappings to be made between identifiers.
Briefly, the format of these files is a count of the number of
mappings on the first line, with each subsequent line containing
a single mapping. Each of these mappings consists of an id in
the local environment and the corresponding id from the original environment,
separated by white space.
.Em uid-mapfile
.Ar Uid-mapfile
should contain all uid
mappings, and
.Em gid-mapfile
.Ar gid-mapfile
should contain all gid mappings.
Any uids not mapped in
.Em uid-mapfile
.Ar uid-mapfile
will be treated as user NOBODY,
and any gids not mapped in
.Em gid-mapfile
.Ar gid-mapfile
will be treated as group
NULLGROUP. At most 64 uids can be mapped for a given subtree, and
at most 16 groups can be mapped by a given subtree.
.El
.Pp
The mapfiles can be located anywhere in the file hierarchy, but they
must be owned by root, and they must be writable only by root.
.Nm mount_umap
.Nm Mount_umap
will refuse to map the sub-tree if the ownership or permissions on
these files are improper. It will also balk if the count of mappings
in the first line of the map files is not correct.
.Pp
The layer created by the
.Nm mount_umap
.Nm
command is meant to serve as a simple example of file system layering.
It is not meant for production use. The implementation is not very
sophisticated.
@ -126,6 +125,6 @@ sophisticated.
.Xr mount_null 8
.Sh HISTORY
The
.Nm mount_umap
.Nm
utility first appeared in
.Bx 4.4 .

11
sbin/mount_umap/mount_umap.c
View File

@ -35,17 +35,17 @@
*/
#ifndef lint
char copyright[] =
static const char copyright[] =
"@(#) Copyright (c) 1992, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
/*
#if 0
static char sccsid[] = "@(#)mount_umap.c 8.5 (Berkeley) 4/26/95";
*/
#endif
static const char rcsid[] =
"$Id: mount_umap.c,v 1.11 1997/03/29 03:32:47 imp Exp $";
"$Id$";
#endif /* not lint */
#include <sys/param.h>
@ -56,7 +56,6 @@ static const char rcsid[] =
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sysexits.h>
#include <unistd.h>
@ -93,7 +92,7 @@ main(argc, argv)
int argc;
char *argv[];
{
static char not[] = "; not mounted.";
static char not[] = "; not mounted";
struct stat statbuf;
struct umap_args args;
FILE *fp, *gfp;

6
sbin/mount_umap/umap_manual
View File

@ -11,7 +11,7 @@ the yellow pages mechanism. File hierarchies that span more
than one domain leads to certain problems, since the same numerical
UID in one domain may correspond to a different user in another domain.
If the system administrator is very careful to ensure that both domains
contain identical user ID information, The umap layer can be used to
contain identical user ID information, the umap layer can be used to
run between those domains without changes
The umap layer is a file system layer that sits on top of the normal
@ -104,8 +104,8 @@ The user and group mapping files should be owned by the root user, and
should be writable only by that user. If they are not owned by root, or
are writable by some other user, the umap mounting command will abort.
Normally, the sub-treeis grafted directly into the place in
the file hierarchy where the it should appear to users.Using the umap
Normally, the sub-tree is grafted directly into the place in
the file hierarchy where the it should appear to users. Using the umap
layer requires that the sub-tree be grafted somewhere else, and
the umap layer be mounted in the desired position in the file hierarchy.
Depending on the situation, the underlying sub-tree can be wherever is

59
sbin/mount_umapfs/mount_umapfs.8
View File

@ -34,6 +34,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mount_umap.8 8.4 (Berkeley) 5/1/95
.\" $Id$
.\"
.Dd May 1, 1995
.Dt MOUNT_UMAP 8
@ -50,13 +51,25 @@
.Ar mount-point
.Sh DESCRIPTION
The
.Nm mount_umap
.Nm
command is used to mount a sub-tree of an existing file system
that uses a different set of uids and gids than the local system.
Such a file system could be mounted from a remote site via NFS or
it could be a file system on removable media brought from some
foreign location that uses a different password file.
.Pp
The
.Nm
command uses a set of files provided by the user to make correspondences
between uids and gids in the sub-tree's original environment and
some other set of ids in the local environment. For instance, user
smith might have uid 1000 in the original environment, while having
uid 2000 in the local environment. The
.Nm
command allows the subtree from smith's original environment to be
mapped in such a way that all files with owning uid 1000 look like
they are actually owned by uid 2000.
.Pp
The options are as follows:
.Bl -tag -width indent
.It Fl o
@ -66,58 +79,44 @@ flag followed by a comma separated string of options.
See the
.Xr mount 8
man page for possible options and their meanings.
.El
.Pp
The
.Nm mount_umap
command uses a set of files provided by the user to make correspondences
between uids and gids in the sub-tree's original environment and
some other set of ids in the local environment. For instance, user
smith might have uid 1000 in the original environment, while having
uid 2000 in the local environment. The
.Nm mount_umap
command allows the subtree from smith's original environment to be
mapped in such a way that all files with owning uid 1000 look like
they are actually owned by uid 2000.
.Pp
.Em target
should be the current location of the sub-tree in the
.It Ar target
Should be the current location of the sub-tree in the
local system's name space.
.Em mount-point
should be a directory
.It Ar mount-point
Should be a directory
where the mapped subtree is to be placed.
.Em uid-mapfile
and
.Em gid-mapfile
describe the mappings to be made between identifiers.
.It Fl u Ar uid-mapfile
.It Fl g Ar gid-mapfile
Describe the mappings to be made between identifiers.
Briefly, the format of these files is a count of the number of
mappings on the first line, with each subsequent line containing
a single mapping. Each of these mappings consists of an id in
the local environment and the corresponding id from the original environment,
separated by white space.
.Em uid-mapfile
.Ar Uid-mapfile
should contain all uid
mappings, and
.Em gid-mapfile
.Ar gid-mapfile
should contain all gid mappings.
Any uids not mapped in
.Em uid-mapfile
.Ar uid-mapfile
will be treated as user NOBODY,
and any gids not mapped in
.Em gid-mapfile
.Ar gid-mapfile
will be treated as group
NULLGROUP. At most 64 uids can be mapped for a given subtree, and
at most 16 groups can be mapped by a given subtree.
.El
.Pp
The mapfiles can be located anywhere in the file hierarchy, but they
must be owned by root, and they must be writable only by root.
.Nm mount_umap
.Nm Mount_umap
will refuse to map the sub-tree if the ownership or permissions on
these files are improper. It will also balk if the count of mappings
in the first line of the map files is not correct.
.Pp
The layer created by the
.Nm mount_umap
.Nm
command is meant to serve as a simple example of file system layering.
It is not meant for production use. The implementation is not very
sophisticated.
@ -126,6 +125,6 @@ sophisticated.
.Xr mount_null 8
.Sh HISTORY
The
.Nm mount_umap
.Nm
utility first appeared in
.Bx 4.4 .

11
sbin/mount_umapfs/mount_umapfs.c
View File

@ -35,17 +35,17 @@
*/
#ifndef lint
char copyright[] =
static const char copyright[] =
"@(#) Copyright (c) 1992, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
/*
#if 0
static char sccsid[] = "@(#)mount_umap.c 8.5 (Berkeley) 4/26/95";
*/
#endif
static const char rcsid[] =
"$Id: mount_umap.c,v 1.11 1997/03/29 03:32:47 imp Exp $";
"$Id$";
#endif /* not lint */
#include <sys/param.h>
@ -56,7 +56,6 @@ static const char rcsid[] =
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sysexits.h>
#include <unistd.h>
@ -93,7 +92,7 @@ main(argc, argv)
int argc;
char *argv[];
{
static char not[] = "; not mounted.";
static char not[] = "; not mounted";
struct stat statbuf;
struct umap_args args;
FILE *fp, *gfp;

6
sbin/mount_umapfs/umap_manual
View File

@ -11,7 +11,7 @@ the yellow pages mechanism. File hierarchies that span more
than one domain leads to certain problems, since the same numerical
UID in one domain may correspond to a different user in another domain.
If the system administrator is very careful to ensure that both domains
contain identical user ID information, The umap layer can be used to
contain identical user ID information, the umap layer can be used to
run between those domains without changes
The umap layer is a file system layer that sits on top of the normal
@ -104,8 +104,8 @@ The user and group mapping files should be owned by the root user, and
should be writable only by that user. If they are not owned by root, or
are writable by some other user, the umap mounting command will abort.
Normally, the sub-treeis grafted directly into the place in
the file hierarchy where the it should appear to users.Using the umap
Normally, the sub-tree is grafted directly into the place in
the file hierarchy where the it should appear to users. Using the umap
layer requires that the sub-tree be grafted somewhere else, and
the umap layer be mounted in the desired position in the file hierarchy.
Depending on the situation, the underlying sub-tree can be wherever is