===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/passwd/passwd.1,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/passwd/passwd.1	2000/08/01 22:30:53	1.12
--- src/usr.bin/passwd/passwd.1	2000/10/17 18:52:18	1.13
***************
*** 1,4 ****
! .\"	$OpenBSD: passwd.1,v 1.12 2000/08/01 22:30:53 provos Exp $
  .\"
  .\" Copyright (c) 1990 The Regents of the University of California.
  .\" All rights reserved.
--- 1,4 ----
! .\"	$OpenBSD: passwd.1,v 1.13 2000/10/17 18:52:18 aaron Exp $
  .\"
  .\" Copyright (c) 1990 The Regents of the University of California.
  .\" All rights reserved.
***************
*** 51,61 ****
  .Op Ar user
  .\" This should really be: passwd [-l] [-y] [-k [-n name] [-i instance] [-r realm] [-u username[.instance][@realm]]] [user]
  .Sh DESCRIPTION
! .Nm passwd
  changes the user's local, Kerberos, or YP password.
  First, the user is prompted for their current password.
! If the current password is correctly typed, a new password is
! requested.
  The new password must be entered twice to avoid typing errors.
  .Pp
  The new password should be at least six characters long and not
--- 51,60 ----
  .Op Ar user
  .\" This should really be: passwd [-l] [-y] [-k [-n name] [-i instance] [-r realm] [-u username[.instance][@realm]]] [user]
  .Sh DESCRIPTION
! .Nm
  changes the user's local, Kerberos, or YP password.
  First, the user is prompted for their current password.
! If the current password is correctly typed, a new password is requested.
  The new password must be entered twice to avoid typing errors.
  .Pp
  The new password should be at least six characters long and not
***************
*** 63,70 ****
  Its total length must be less than
  .Dv _PASSWORD_LEN
  (currently 128 characters).
! Numbers, upper case letters and meta-characters
! are encouraged.
  .Pp
  The quality of the password can be enforced by providing an external
  checking program in 
--- 62,69 ----
  Its total length must be less than
  .Dv _PASSWORD_LEN
  (currently 128 characters).
! A mixture of both lower and uppercase letters, numbers, and
! meta-characters is encouraged.
  .Pp
  The quality of the password can be enforced by providing an external
  checking program in 
***************
*** 73,80 ****
  The options are as follows:
  .Bl -tag -width flag
  .It Fl l
! Causes the password to be updated only in the local
! password file.
  When changing only the local password,
  .Xr pwd_mkdb 8
  is used to update the password databases.
--- 72,78 ----
  The options are as follows:
  .Bl -tag -width flag
  .It Fl l
! Causes the password to be updated only in the local password file.
  When changing only the local password,
  .Xr pwd_mkdb 8
  is used to update the password databases.
***************
*** 88,96 ****
  Forces the change to affect the Kerberos database, even
  if the user has a password in the local database.
  Once the password has been verified,
! .Nm passwd
! communicates the new password information to
! the Kerberos authenticating host.
  .El
  .Pp
  The following flags are only used when the
--- 86,93 ----
  Forces the change to affect the Kerberos database, even
  if the user has a password in the local database.
  Once the password has been verified,
! .Nm
! communicates the new password information to the Kerberos authenticating host.
  .El
  .Pp
  The following flags are only used when the
***************
*** 119,132 ****
  .Pp
  This is the behavior if no flags are specified:
  if Kerberos is active then
! .Nm passwd
  will talk to the Kerberos server (even if the user has an entry
  in the local database).
  If the password is not in the local password database, then
  an attempt is made to use the YP database.
  .Pp
! To change another user's Kerberos password, one must first
! run
  .Xr kinit 1
  followed by
  .Xr passwd 1 .
--- 116,128 ----
  .Pp
  This is the behavior if no flags are specified:
  if Kerberos is active then
! .Nm
  will talk to the Kerberos server (even if the user has an entry
  in the local database).
  If the password is not in the local password database, then
  an attempt is made to use the YP database.
  .Pp
! To change another user's Kerberos password, one must first run
  .Xr kinit 1
  followed by
  .Xr passwd 1 .
***************
*** 137,142 ****
--- 133,146 ----
  depends on the configuration in
  .Xr passwd.conf 5 .
  It can be different for local and YP passwords.
+ .Sh DIAGNOSTICS
+ .Bl -diag
+ .It "the passwd file is busy"
+ The password file is currently locked by another process, or a
+ process previously holding the lock was prematurely terminated.
+ In the latter case, it is safe to remove the
+ .Pa /etc/ptmp
+ file to get rid of this error.
  .Sh FILES
  .Bl -tag -width /etc/master.passwd -compact
  .It Pa /etc/master.passwd
***************
*** 147,152 ****
--- 151,158 ----
  temporary copy of the password file
  .It /etc/passwd.conf
  configuration options
+ .It /etc/ptmp
+ lock file for the passwd database
  .El
  .Sh SEE ALSO
  .Xr chpass 1 ,
***************
*** 164,169 ****
  .Re
  .Sh HISTORY
  A
! .Nm passwd
  command appeared in
  .At v6 .
--- 170,175 ----
  .Re
  .Sh HISTORY
  A
! .Nm
  command appeared in
  .At v6 .