===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/passwd/passwd.1,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/passwd/passwd.1	2001/06/23 05:57:07	1.16
--- src/usr.bin/passwd/passwd.1	2001/06/26 20:22:52	1.17
***************
*** 1,4 ****
! .\"	$OpenBSD: passwd.1,v 1.16 2001/06/23 05:57:07 deraadt Exp $
  .\"
  .\" Copyright (c) 1990 The Regents of the University of California.
  .\" All rights reserved.
--- 1,4 ----
! .\"	$OpenBSD: passwd.1,v 1.17 2001/06/26 20:22:52 hin Exp $
  .\"
  .\" Copyright (c) 1990 The Regents of the University of California.
  .\" All rights reserved.
***************
*** 44,49 ****
--- 44,50 ----
  .Op Fl l
  .Op Fl y
  .Op Fl k
+ .Op Fl K
  .Op Fl n Ar name
  .Op Fl i Ar instance
  .Op Fl r Ar realm
***************
*** 52,58 ****
  .\" 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.
--- 53,59 ----
  .\" 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, KerberosIV, KerberosV, 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.
***************
*** 83,93 ****
  .Xr rpc.yppasswdd 8
  daemon should be running on the YP master server.
  .It Fl k
! 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
--- 84,94 ----
  .Xr rpc.yppasswdd 8
  daemon should be running on the YP master server.
  .It Fl k
! Forces the change to affect the KerberosIV 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 KerberosIV authenticating host.
  .El
  .Pp
  The following flags are only used when the
***************
*** 111,128 ****
  .Ar realm
  instead of the local realm.
  .It Fl u Ar username[.instance][@realm]
! Specifies a fully qualified Kerberos principal.
  .El
  .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 .
--- 112,131 ----
  .Ar realm
  instead of the local realm.
  .It Fl u Ar username[.instance][@realm]
! Specifies a fully qualified KerberosIV principal.
! .It Fl K Ar principal@REALM
! Changes a users KerberosV password.
  .El
  .Pp
  This is the behavior if no flags are specified:
! if KerberosIV is active then
  .Nm
! will talk to the KerberosIV 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 KerberosIV password, one must first run
  .Xr kinit 1
  followed by
  .Xr passwd 1 .