[src/netbsd-1-4]: src/usr.sbin/user Pull up revisions 1.4-1.7 (requested by s...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/52efd8cf97ef
branches:  netbsd-1-4
changeset: 471179:52efd8cf97ef
user:      he <he%NetBSD.org@localhost>
date:      Wed Oct 25 17:07:36 2000 +0000

description:
Pull up revisions 1.4-1.7 (requested by simonb):
  Synchronize to current versions of the user management tool.
  Fixes PR#11100, PR#11103, PR#11123 and PR#10985.

diffstat:

 usr.sbin/user/usermod.8 |  80 ++++++++++++++++++++++++++++++------------------
 1 files changed, 49 insertions(+), 31 deletions(-)

diffs (174 lines):

diff -r 1e66e484b2a6 -r 52efd8cf97ef usr.sbin/user/usermod.8
--- a/usr.sbin/user/usermod.8   Wed Oct 25 17:07:18 2000 +0000
+++ b/usr.sbin/user/usermod.8   Wed Oct 25 17:07:36 2000 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: usermod.8,v 1.3.4.2 2000/01/21 00:01:43 he Exp $ */
+.\" $NetBSD: usermod.8,v 1.3.4.3 2000/10/25 17:07:36 he Exp $ */
 .\"
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -39,42 +39,45 @@
 .Nd modify user login information
 .Sh SYNOPSIS
 .Nm
+.Op Fl mov
 .Op Fl G Ar secondary-group
 .Op Fl c Ar comment
 .Op Fl d Ar home-dir
 .Op Fl e Ar expiry-time
 .Op Fl f Ar inactive-secs
-.Op Fl g Ar gid/name/=uid
+.Oo
+.Fl g Ar gid | name | Li =uid
+.Oc
 .Op Fl l Ar new-login
-.Op Fl m
-.Op Fl o
 .Op Fl p Ar password
 .Op Fl s Ar shell
 .Op Fl u Ar uid
-.Op Fl v
-user
+.Ar user
 .Sh DESCRIPTION
 The
 .Nm
 utility modifies user login information on the system.
 Default values for the user are taken from the information
 provided in the
-/etc/usermgmt.conf
+.Pa /etc/usermgmt.conf
 file.
 .Pp
 After setting any defaults, and then values from that file,
 the command line options are processed:
 .Bl -tag -width Ds
 .It Fl G Ar secondary-group
-is the secondary group to which the user will be added in
-the /etc/group file.
+is the secondary group to which the user will be added in the
+.Pa /etc/group
+file.
 .It Fl c Ar comment
 is the comment field (also, for historical reasons known as the
 GECOS field) which will be added for the user, and typically will include
 the username, and, perhaps, contact information for the user.
 .It Fl d Ar home-directory
 is the home directory which will be created and populated for the user,
-should the -m option be specified.
+should the
+.Fl m
+option be specified.
 .It Fl e Ar secs-to-expiry
 provides the number of seconds since the epoch (UTC) at
 which the current password change expire. This
@@ -89,27 +92,37 @@
 by using the
 .Ar expire
 field in the
-.Xr /etc/usermgmt.conf
+.Pa /etc/usermgmt.conf
 file - it has the format:
-.Ar expire <secs-to-expiry> .
-.It Fl g Ar gid/name/=uid
+.D1 Ic expire Ar secs-to-expiry
+.It Xo
+.Fl g Ar gid | name | Li =uid
+.Xc
 gives the group name or identifier to be used for the new user's primary group.
 If this is
-.Ar "-g=uid" ,
+.Ql =uid ,
 then a uid and gid will be picked which are both unique
 and the same, and a line added to
-.Ar /etc/group
+.Pa /etc/group
 to describe the new group.
 This value can be preset for all users
 by using the
 .Ar gid
 field in the
-.Xr /usr/share/adduser/defaults
+.Pa /usr/share/adduser/defaults
 file - it has the format:
-.Ar group <groupname/groupid/=uid> .
+.br \" XXX Shouldn't be necessary -- mdoc bug? --bjh21
+.Bd -ragged -offset indent -compact
+.Ic group
+.Ar gid | name | Li =uid
+.Ed
 .It Fl l Ar new-user
 gives the new user name.
-It must consist of alphanumeric characters, or the characters '.', '-' or '_'.
+It must consist of alphanumeric characters, or the characters
+.Ql \&. ,
+.Ql \&-
+or
+.Ql \&_ .
 .It Fl m
 moves the home directory from its old position to the new one.
 .It Fl o
@@ -123,27 +136,31 @@
 by using the
 .Ar password
 field in the
-.Xr /etc/usermgmt.conf
+.Pa /etc/usermgmt.conf
 file - it has the format:
-.Ar password <encrypted-password> .
+.D1 Ic password Ar encrypted-password
 .It Fl s Ar shell
 specifies the login shell for the new user.
 This value can be preset for all users
 by using the
 .Ar shell
 field in the
-.Xr /usr/share/adduser/defaults
+.Pa /usr/share/adduser/defaults
 file - it has the format:
-.Ar shell <login-shell> .
+.D1 Ic shell Ar login-shell
 .It Fl u Ar uid
 specifies a new uid for the user.
 Boundaries for this value can be preset for all users
 by using the
 .Ar range
 field in the
-.Xr /etc/usermgmt.conf
+.Pa /etc/usermgmt.conf
 file - they have the format:
-.Ar range <starting-uid>..<ending_uid> .
+.br \" XXX
+.Bd -ragged -offset indent -compact
+.Ic range
+.Ar starting-uid Ns Li .. Ns Ar ending_uid
+.Ed
 .It Fl v
 enables verbose mode - explain the commands as they are executed.
 .El
@@ -151,6 +168,14 @@
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
+.Sh FILES
+.Bl -tag -width /etc/usermgmt.conf -compact
+.It Pa /etc/usermgmt.conf
+.El
+.Sh SEE ALSO
+.Xr chpass 1 ,
+.Xr passwd 5 ,
+.Xr group 5
 .Sh HISTORY
 The
 .Nm
@@ -163,10 +188,3 @@
 The
 .Nm
 utility was written by Alistair G. Crooks (agc%netbsd.org@localhost).
-.Sh SEE ALSO
-.Xr chpass 1 ,
-.Xr passwd 5 ,
-.Xr group 5 ,
-.Xr /etc/usermgmt.conf ,
-.Xr /etc/skel/.[A-z]* ,
-.Xr /usr/share/examples/usermgmt