Instead of prompting the user whether or not they wish to continue to

wait for the lock on password file just tell the user to interrupt with
^C.  This simplifies the locking loop a bit.

Update man page to this effect.

1 files changed, 18 insertions, 6 deletions

diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 44806970c9c..b8558634021 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: passwd.1,v 1.19 2001/08/03 16:03:02 mpech Exp $
+.\"	$OpenBSD: passwd.1,v 1.20 2001/08/27 02:57:07 millert Exp $
 .\"
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -144,10 +144,22 @@ 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.
-To determine whether another process is holding the lock, the
+.It "Attempting lock password file, please wait or press ^C to abort"
+.Pp
+The password file is currently locked by another process;
+.Nm
+will keep trying to lock the password file until it succeeds or
+you hit the interupt character (control-C by default).
+If
+.Nm
+is interrupted while trying to gain the lock the password changed will
+be lost.
+.Pp
+If the process holding the lock was prematurely terminated the lock
+file may be stale and
+.Nm
+will wait forever trying to lock the password file.
+To determine whether a live process is actually holding the lock, the
 admin may run the following:
 .Bd -literal -offset indent
 fstat /etc/ptmp
@@ -155,7 +167,7 @@ fstat /etc/ptmp
 .Pp
 If no process is listed, it is safe to remove the
 .Pa /etc/ptmp
-file to get rid of this error.
+file to clear the error.
 .El
 .Sh FILES
 .Bl -tag -width /etc/master.passwd -compact