From 63228ac1c6cdf75dc66a238638d5497869cd7edf Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Mon, 19 May 2008 21:57:48 +0000
Subject: [PATCH] SHA_CRYPT_MAX_ROUNDS and SHA_CRYPT_MIN_ROUNDS can only exist
 if configured with --with-sha-crypt.

---
 ChangeLog            |  6 ++++++
 man/login.defs.5.xml | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 487ab747..0ae82f16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-19  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/login.defs.5.xml: SHA_CRYPT_MAX_ROUNDS and
+	SHA_CRYPT_MIN_ROUNDS can only exist if configured with
+	--with-sha-crypt.
+
 2008-05-19  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* NEWS, man/useradd.8.xml: Document the -k, --skel option, and
diff --git a/man/login.defs.5.xml b/man/login.defs.5.xml
index 0a69e617..e829da63 100644
--- a/man/login.defs.5.xml
+++ b/man/login.defs.5.xml
@@ -197,7 +197,8 @@
 	<listitem>
 	  <para>
 	    ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB
-	    SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS
+	    <phrase condition="sha_crypt">SHA_CRYPT_MAX_ROUNDS
+	    SHA_CRYPT_MIN_ROUNDS</phrase>
 	  </para>
 	</listitem>
       </varlistentry>
@@ -205,8 +206,9 @@
 	<term>chpasswd</term>
 	<listitem>
 	  <para>
-	    ENCRYPT_METHOD MD5_CRYPT_ENAB SHA_CRYPT_MAX_ROUNDS
-	    SHA_CRYPT_MIN_ROUNDS
+	    ENCRYPT_METHOD MD5_CRYPT_ENAB
+	    <phrase condition="sha_crypt">SHA_CRYPT_MAX_ROUNDS
+	    SHA_CRYPT_MIN_ROUNDS</phrase>
 	  </para>
 	</listitem>
       </varlistentry>
@@ -225,7 +227,8 @@
 	<listitem>
 	  <para>
 	    ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB
-	    SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS
+	    <phrase condition="sha_crypt">SHA_CRYPT_MAX_ROUNDS
+	    SHA_CRYPT_MIN_ROUNDS</phrase>
 	  </para>
 	</listitem>
       </varlistentry>
@@ -321,8 +324,9 @@
 	    ENCRYPT_METHOD
 	    GID_MAX GID_MIN
 	    MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB
-	    PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE SHA_CRYPT_MAX_ROUNDS
-	    SHA_CRYPT_MIN_ROUNDS
+	    PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE
+	    <phrase condition="sha_crypt">SHA_CRYPT_MAX_ROUNDS
+	    SHA_CRYPT_MIN_ROUNDS</phrase>
 	    SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX UID_MIN
 	    UMASK
 	  </para>
@@ -335,7 +339,8 @@
 	  <para>
 	    ENCRYPT_METHOD MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB
 	    PASS_ALWAYS_WARN PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN
-	    SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS
+	    <phrase condition="sha_crypt">SHA_CRYPT_MAX_ROUNDS
+	    SHA_CRYPT_MIN_ROUNDS</phrase>
 	  </para>
 	</listitem>
       </varlistentry>