On Sun, Feb 27, 2011 at 04:56:11PM +0100, [email protected] wrote:
> >Number: 6571
> >Category: system
> >Synopsis: locking a user with userdel -p ambiguity
> >Confidential: yes
> >Severity: serious
> >Priority: medium
> >Responsible: bugs
> >State: open
> >Quarter:
> >Keywords:
> >Date-Required:
> >Class: sw-bug
> >Submitter-Id: unknown
> >Arrival-Date: Sun Feb 27 16:10:02 GMT 2011
> >Closed-Date:
> >Last-Modified:
> >Originator:
> >Release:
> >Organization:
> >Environment:
I believe the documentation is wrong. Here is a patch, and it matches
the usage from NetBSD.
Index: user.8
===================================================================
RCS file: /home/danh/.cvs/openbsd/src/usr.sbin/user/user.8,v
retrieving revision 1.18
diff -u -p -r1.18 user.8
--- user.8 3 Sep 2010 11:22:36 -0000 1.18
+++ user.8 1 Mar 2011 15:59:46 -0000
@@ -74,7 +74,8 @@
.Op Fl p Ar preserve-value
.Nm user
.Cm del
-.Op Fl prv
+.Op Fl rv
+.Op Fl p Ar preserve-value
.Ar user
.Nm user
.Cm info
Index: user.c
===================================================================
RCS file: /home/danh/.cvs/openbsd/src/usr.sbin/user/user.c,v
retrieving revision 1.78
diff -u -p -r1.78 user.c
--- user.c 26 Jul 2010 10:55:17 -0000 1.78
+++ user.c 1 Mar 2011 16:03:46 -0000
@@ -1631,7 +1631,8 @@ usermgmt_usage(const char *prog)
} else if (strcmp(prog, "userdel") == 0) {
(void) fprintf(stderr, "usage: %s -D [-p preserve-value]\n",
prog);
- (void) fprintf(stderr, " %s [-prv] user\n", prog);
+ (void) fprintf(stderr, " "
+ "%s [-rv] [-p preserve-value] user\n", prog);
#ifdef EXTENSIONS
} else if (strcmp(prog, "userinfo") == 0) {
(void) fprintf(stderr, "usage: %s [-e] user\n", prog);
Index: userdel.8
===================================================================
RCS file: /home/danh/.cvs/openbsd/src/usr.sbin/user/userdel.8,v
retrieving revision 1.14
diff -u -p -r1.14 userdel.8
--- userdel.8 3 Sep 2010 11:22:36 -0000 1.14
+++ userdel.8 1 Mar 2011 15:58:36 -0000
@@ -42,7 +42,8 @@
.Fl D
.Op Fl p Ar preserve-value
.Nm userdel
-.Op Fl prv
+.Op Fl rv
+.Op Fl p Ar preserve-value
.Ar user
.Sh DESCRIPTION
The
@@ -84,7 +85,7 @@ after setting any defaults, and then rea
.Pa /etc/usermgmt.conf ,
the following command line options are processed:
.Bl -tag -width Ds
-.It Fl p
+.It Fl p Ar preserve-value
Preserve the user information in the password file,
but do not allow the user to login, by switching the
password to an
