[Pkg-shadow-commits] r1993 - in upstream/trunk: . man

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-05-19 21:57:48 +0000 (Mon, 19 May 2008)
New Revision: 1993

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/man/login.defs.5.xml
Log:
SHA_CRYPT_MAX_ROUNDS and SHA_CRYPT_MIN_ROUNDS can only exist if configured with --with-sha-crypt.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-05-19 21:32:19 UTC (rev 1992)
+++ upstream/trunk/ChangeLog	2008-05-19 21:57:48 UTC (rev 1993)
@@ -1,5 +1,11 @@
 2008-05-19  Nicolas François  <nicolas.francois at 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 at centraliens.net>
+
 	* NEWS, man/useradd.8.xml: Document the -k, --skel option, and
 	update the -m, --create-home documentation.
 

Modified: upstream/trunk/man/login.defs.5.xml
===================================================================
--- upstream/trunk/man/login.defs.5.xml	2008-05-19 21:32:19 UTC (rev 1992)
+++ upstream/trunk/man/login.defs.5.xml	2008-05-19 21:57:48 UTC (rev 1993)
@@ -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>