Module Name: src
Committed By: jmmv
Date: Fri Dec 3 21:41:40 UTC 2010
Modified Files:
src/share/man/man5: passwd.conf.5
Log Message:
Document what the default values for localcipher and ypcipher are.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/man/man5/passwd.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man5/passwd.conf.5
diff -u src/share/man/man5/passwd.conf.5:1.9 src/share/man/man5/passwd.conf.5:1.10
--- src/share/man/man5/passwd.conf.5:1.9 Sat Oct 3 12:45:15 2009
+++ src/share/man/man5/passwd.conf.5 Fri Dec 3 21:41:40 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: passwd.conf.5,v 1.9 2009/10/03 12:45:15 zafer Exp $
+.\" $NetBSD: passwd.conf.5,v 1.10 2010/12/03 21:41:40 jmmv Exp $
.\"
.\" Copyright 1997 Niels Provos <pro...@physnet.uni-hamburg.de>
.\" All rights reserved.
@@ -28,7 +28,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd September 4, 2005
+.Dd December 3, 2010
.Dt PASSWD.CONF 5
.Os
.Sh NAME
@@ -57,6 +57,7 @@
.Bl -tag -width localcipher
.It Sy localcipher
The cipher to use for local passwords.
+.Pp
Possible values are:
.Dq old ,
.Dq newsalt,\*[Lt]rounds\*[Gt] ,
@@ -75,9 +76,16 @@
.Dq blowfish
the value can be between 4 and 31.
It specifies the base 2 logarithm of the number of rounds.
+.Pp
+If not specified, the default value is
+.Dq old .
.It Sy ypcipher
The cipher to use for YP passwords.
+.Pp
The possible values are the same as for localcipher.
+.Pp
+If not specified, the default value is
+.Dq old .
.El
.Pp
To retrieve information from this file use
@@ -87,11 +95,11 @@
.It Pa /etc/passwd.conf
.El
.Sh EXAMPLES
-Use MD5 as the local cipher and old-style DES as the YP cipher.
+Use SHA1 as the local cipher and old-style DES as the YP cipher.
Use blowfish with 2^5 rounds for root:
.Bd -literal
default:
- localcipher = md5
+ localcipher = sha1
ypcipher = old
root:
@@ -107,3 +115,12 @@
.Nm
configuration file first appeared in
.Nx 1.6 .
+.Pp
+The default value of
+.Sy localcipher
+was set to
+.Dq sha1
+in
+.Pa /etc/passwd.conf
+starting from
+.Nx 6.0 .
