From: provos <provos@openbsd.org>
Date: Tue, 25 Feb 1997 18:19:35 +0000 (+0000)
Subject: include link to passwd.conf
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=662ba4aa8c5f9ff80c808182f69c68751e1b0a1e;p=openbsd

include link to passwd.conf
---

diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 4fb3966e6a4..641ff69e3c4 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: passwd.1,v 1.3 1996/06/26 05:37:47 deraadt Exp $
+.\"	$OpenBSD: passwd.1,v 1.4 1997/02/25 18:19:35 provos Exp $
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -94,6 +94,11 @@ followed by
 .Xr passwd 1 .
 The super-user is not required to provide a user's current password
 if only the local password is modified.
+.Pp
+Which type of cipher is used to encrypt the password information
+depends on the configuration in
+.Xr passwd.conf 5 . 
+It can be different for local and YP passwords.
 .Sh FILES
 .Bl -tag -width /etc/master.passwd -compact
 .It Pa /etc/master.passwd
@@ -102,6 +107,8 @@ The user database
 A Version 7 format password file
 .It Pa /etc/passwd.XXXXXX
 Temporary copy of the password file
+.It /etc/passwd.conf
+Configuration options
 .El
 .Sh SEE ALSO
 .Xr chpass 1 ,
@@ -109,6 +116,7 @@ Temporary copy of the password file
 .Xr kinit 1 ,
 .Xr login 1 ,
 .Xr passwd 5 ,
+.Xr passwd.conf 5 ,
 .Xr kpasswdd 8 ,
 .Xr pwd_mkdb 8 ,
 .Xr vipw 8
diff --git a/usr.sbin/vipw/vipw.8 b/usr.sbin/vipw/vipw.8
index ed3f084dd19..79ea2cc0605 100644
--- a/usr.sbin/vipw/vipw.8
+++ b/usr.sbin/vipw/vipw.8
@@ -72,6 +72,10 @@ to update the user database.  This is run in the background, and,
 at very large sites could take several minutes.  Until this update
 is completed, the password file is unavailable for other updates
 and the new information is not available to programs.
+.Pp
+Which type of cipher is used to encrypt the password information
+depends on the configuration in
+.Xr passwd.conf 5 .
 .Sh ENVIRONMENT
 If the following environment variable exists it will be utilized by
 .Nm vipw :
@@ -86,6 +90,7 @@ will be invoked instead of the default editor
 .Xr chpass 1 ,
 .Xr passwd 1 ,
 .Xr passwd 5 ,
+.Xr passwd.conf 5 ,
 .Xr adduser 8 ,
 .Xr pwd_mkdb 8
 .Sh HISTORY