diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 2004-10-12 16:28:34 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 2004-10-12 16:28:34 +0000 |
commit | 109f092e891df4b8755992ea5fc4b57dac635282 (patch) | |
tree | aca3e206a88f3fd05f46080221cba60ad6669939 | |
parent | 26e155e5976b4e9b347ea059dfd6733de9739962 (diff) |
Actually, /etc/passwd is 6th Edition-style, not 7th. The only real
diff between /etc/passwd in 6th and 7th was the crypt() algorithm
used and we no longer put encrypted passwords in /etc/passwd.
From Matthew Gregan; OK otto@
-rw-r--r-- | usr.bin/passwd/passwd.1 | 4 | ||||
-rw-r--r-- | usr.sbin/pwd_mkdb/pwd_mkdb.8 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1 index e4c56c41d3d..5fb7cad8e62 100644 --- a/usr.bin/passwd/passwd.1 +++ b/usr.bin/passwd/passwd.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: passwd.1,v 1.28 2004/07/13 21:09:48 millert Exp $ +.\" $OpenBSD: passwd.1,v 1.29 2004/10/12 16:28:33 millert Exp $ .\" .\" Copyright (c) 1990 The Regents of the University of California. .\" All rights reserved. @@ -116,7 +116,7 @@ configuration options .It Pa /etc/master.passwd user database .It Pa /etc/passwd -a Version 7 format password file +a 6th Edition-style password file .It Pa /etc/passwd.XXXXXX temporary copy of the password file .It /etc/ptmp diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.8 b/usr.sbin/pwd_mkdb/pwd_mkdb.8 index 67654f0d824..2a92fb3bfdb 100644 --- a/usr.sbin/pwd_mkdb/pwd_mkdb.8 +++ b/usr.sbin/pwd_mkdb/pwd_mkdb.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pwd_mkdb.8,v 1.18 2004/03/09 07:59:50 otto Exp $ +.\" $OpenBSD: pwd_mkdb.8,v 1.19 2004/10/12 16:28:33 millert Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -63,7 +63,7 @@ The must be in the correct format (see .Xr passwd 5 ) . It is important to note that the format used in this system is -different from the historic Version 7 style format. +different from the historic 6th Edition-style format. .Pp The options are as follows: .Bl -tag -width Ds @@ -71,7 +71,7 @@ The options are as follows: Check if the password file is in the correct format. Do not change, add, or remove any files. .It Fl p -Create a Version 7 style password file and install it into +Create a 6th Edition-style password file and install it into .Pa /etc/passwd . .It Fl s Only update the secure version of the database. @@ -127,7 +127,7 @@ exits zero on success, non-zero on failure. .It Pa /etc/master.passwd current password file .It Pa /etc/passwd -a Version 7 format password file +a 6th Edition-style password file .It Pa /etc/pwd.db insecure password database file .It Pa /etc/pwd.db.tmp |