From e4b49a8636aab0af2ea4f689f4f0dd1d2ea044d1 Mon Sep 17 00:00:00 2001 From: jmc <> Date: Mon, 19 Nov 2007 22:07:37 +0000 Subject: [PATCH] copy in FILES from pw_lock.3 to vipw.8: as nick points out, it should at least document /etc/ptmp; while i'm at it, might as well tidy it up and make it consistent across these pages; --- src/lib/libutil/pw_init.3 | 14 +++++++++++--- src/lib/libutil/pw_lock.3 | 18 +++++++++--------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/lib/libutil/pw_init.3 b/src/lib/libutil/pw_init.3 index c4ddb49e..3d775f8f 100644 --- a/src/lib/libutil/pw_init.3 +++ b/src/lib/libutil/pw_init.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pw_init.3,v 1.10 2007/05/31 19:19:38 jmc Exp $ +.\" $OpenBSD: pw_init.3,v 1.11 2007/11/19 22:07:37 jmc Exp $ .\" .\" Copyright (c) 1995 .\" The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: November 19 2007 $ .Dt PW_INIT 3 .Os .Sh NAME @@ -201,9 +201,17 @@ Otherwise, .Fn pw_scan returns 1. .Sh FILES -.Bl -tag -width /etc/master.passwd -compact +.Bl -tag -width "/etc/master.passwdXXX" -compact .It Pa /etc/master.passwd +Current password file. +.It Pa /etc/passwd +A Version 7 format password file. .It Pa /etc/ptmp +Password lock file. +.It Pa /etc/pwd.db +Insecure password database file. +.It Pa /etc/spwd.db +Secure password database file. .El .Sh SEE ALSO .Xr pw_lock 3 , diff --git a/src/lib/libutil/pw_lock.3 b/src/lib/libutil/pw_lock.3 index 755bd027..430b4138 100644 --- a/src/lib/libutil/pw_lock.3 +++ b/src/lib/libutil/pw_lock.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pw_lock.3,v 1.14 2007/05/31 19:19:38 jmc Exp $ +.\" $OpenBSD: pw_lock.3,v 1.15 2007/11/19 22:07:37 jmc Exp $ .\" .\" Copyright (c) 1995 .\" The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: November 19 2007 $ .Dt PW_LOCK 3 .Os .Sh NAME @@ -127,17 +127,17 @@ The .Fn pw_mkdb function returns \-1 if it is unable to complete properly. .Sh FILES -.Bl -tag -width /etc/master.passwd -compact +.Bl -tag -width "/etc/master.passwdXXX" -compact .It Pa /etc/master.passwd -current password file -.It Pa /etc/ptmp -password lock file +Current password file. .It Pa /etc/passwd -a Version 7 format password file +A Version 7 format password file. +.It Pa /etc/ptmp +Password lock file. .It Pa /etc/pwd.db -insecure password database file +Insecure password database file. .It Pa /etc/spwd.db -secure password database file +Secure password database file. .El .Sh ERRORS .Bl -tag -width Er