From owner-svn-src-all@FreeBSD.ORG  Fri Jun  8 12:36:09 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2B2701065678;
	Fri,  8 Jun 2012 12:36:09 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 16AB58FC12;
	Fri,  8 Jun 2012 12:36:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q58Ca8JQ059215;
	Fri, 8 Jun 2012 12:36:08 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q58Ca84q059213;
	Fri, 8 Jun 2012 12:36:08 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201206081236.q58Ca84q059213@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Fri, 8 Jun 2012 12:36:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236751 - head/lib/libutil
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jun 2012 12:36:09 -0000

Author: des
Date: Fri Jun  8 12:36:08 2012
New Revision: 236751
URL: http://svn.freebsd.org/changeset/base/236751

Log:
  Document that we also support sha256 and sha512.
  
  MFC after:	1 week

Modified:
  head/lib/libutil/login.conf.5

Modified: head/lib/libutil/login.conf.5
==============================================================================
--- head/lib/libutil/login.conf.5	Fri Jun  8 12:35:43 2012	(r236750)
+++ head/lib/libutil/login.conf.5	Fri Jun  8 12:36:08 2012	(r236751)
@@ -269,7 +269,9 @@ multiplied by 5 seconds.
 allowed before the login fails.
 .It "passwd_format	string	md5	The encryption format that new or"
 changed passwords will use.
-Valid values include "des", "md5" and "blf".
+Valid values include "des", "md5", "blf", "sha256" and "sha512"; see
+.Xr crypt 3
+for details.
 NIS clients using a
 .No non- Ns Fx
 NIS server should probably use "des".