-p requires an argument; from Stefan Pettersson

ok krw

2 files changed, 8 insertions, 6 deletions

diff --git a/usr.sbin/user/user.c b/usr.sbin/user/user.c
index 84f8a56c806..a36937d5e4c 100644
--- a/usr.sbin/user/user.c
+++ b/usr.sbin/user/user.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: user.c,v 1.82 2011/12/04 08:28:35 ajacoutot Exp $ */
+/* $OpenBSD: user.c,v 1.83 2011/12/24 07:17:04 jmc Exp $ */
 /* $NetBSD: user.c,v 1.69 2003/04/14 17:40:07 agc Exp $ */
 
 /*
@@ -1641,7 +1641,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);
diff --git a/usr.sbin/user/userdel.8 b/usr.sbin/user/userdel.8
index ad87a06dc80..8e72ff49282 100644
--- a/usr.sbin/user/userdel.8
+++ b/usr.sbin/user/userdel.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: userdel.8,v 1.14 2010/09/03 11:22:36 jmc Exp $
+.\" $OpenBSD: userdel.8,v 1.15 2011/12/24 07:17:04 jmc Exp $
 .\" $NetBSD: userdel.8,v 1.24 2003/02/25 10:36:21 wiz Exp $
 .\"
 .\" Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: December 24 2011 $
 .Dt USERDEL 8
 .Os
 .Sh NAME
@@ -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 reading values from
 .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