summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2016-08-16 11:33:08 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2016-08-16 11:33:08 +0000
commit09dc4d0753adc0d6353b4d8be77a85ec44f431ab (patch)
treed7188a5a043902de392d1a2c7e98391910266079
parent9847648b6d3f7966a17c2d98b14bf8670456e292 (diff)
Xr encrypt(1) here as well to be consistent with useradd(8).
ok jmc
-rw-r--r--usr.sbin/user/usermgmt.conf.57
-rw-r--r--usr.sbin/user/usermod.88
2 files changed, 9 insertions, 6 deletions
diff --git a/usr.sbin/user/usermgmt.conf.5 b/usr.sbin/user/usermgmt.conf.5
index 2aa98e75f37..087e00988e1 100644
--- a/usr.sbin/user/usermgmt.conf.5
+++ b/usr.sbin/user/usermgmt.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: usermgmt.conf.5,v 1.12 2016/01/08 20:26:54 zhuk Exp $
+.\" $OpenBSD: usermgmt.conf.5,v 1.13 2016/08/16 11:33:07 tb Exp $
.\" $NetBSD: usermgmt.conf.5,v 1.3 2002/10/02 13:49:11 grant Exp $
.\"
.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: January 8 2016 $
+.Dd $Mdocdate: August 16 2016 $
.Dt USERMGMT.CONF 5
.Os
.Sh NAME
@@ -92,7 +92,8 @@ Also see the
.Ar expire
field.
.It Ic password
-Specifies an already-encrypted default password.
+Specifies a default password encrypted with
+.Xr encrypt 1 .
.It Ic preserve
If this value is one of
.Ql true ,
diff --git a/usr.sbin/user/usermod.8 b/usr.sbin/user/usermod.8
index 73f8fb0213d..985ade8b709 100644
--- a/usr.sbin/user/usermod.8
+++ b/usr.sbin/user/usermod.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: usermod.8,v 1.32 2015/09/12 15:14:11 schwarze Exp $
+.\" $OpenBSD: usermod.8,v 1.33 2016/08/16 11:33:07 tb Exp $
.\" $NetBSD: usermod.8,v 1.17 2003/02/14 16:11:37 grant 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 12 2015 $
+.Dd $Mdocdate: August 16 2016 $
.Dt USERMOD 8
.Os
.Sh NAME
@@ -161,7 +161,9 @@ is needed.
.It Fl o
Allows duplicate UIDs to be given.
.It Fl p Ar password
-Specifies an already-encrypted password for the user.
+Specifies a password encrypted with
+.Xr encrypt 1
+for the user.
This password can then be changed by using the
.Xr chpass 1
utility.