From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sat, 9 May 2009 13:16:10 +0000 (+0000)
Subject: 	* man/login.defs.d/ENCRYPT_METHOD.xml,
X-Git-Tag: 4.1.4~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f649c55049859a96f258dd98529ddbcb897aab3;p=thirdparty%2Fshadow.git

	* man/login.defs.d/ENCRYPT_METHOD.xml,
	man/login.defs.d/MD5_CRYPT_ENAB.xml,
	man/login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml: Updated note for PAM
	enabled versions. These variables are only used for group
	passwords in this case.
---

diff --git a/ChangeLog b/ChangeLog
index d02b062a3..56cb2dcd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-09  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/login.defs.d/ENCRYPT_METHOD.xml,
+	man/login.defs.d/MD5_CRYPT_ENAB.xml,
+	man/login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml: Updated note for PAM
+	enabled versions. These variables are only used for group
+	passwords in this case.
+
 2009-05-09  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/chpasswd.8.xml: Sorted options alphabetically.
diff --git a/man/login.defs.d/ENCRYPT_METHOD.xml b/man/login.defs.d/ENCRYPT_METHOD.xml
index b91c57375..c0687bea4 100644
--- a/man/login.defs.d/ENCRYPT_METHOD.xml
+++ b/man/login.defs.d/ENCRYPT_METHOD.xml
@@ -54,9 +54,11 @@
       Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option>
       variable.
     </para>
-    <para>
-      Note: if you use PAM, it is recommended to set this variable
-      consistently with the PAM modules configuration.
+    <para condition="pam">
+      Note: This only affect the generation of group passwords.
+      The generation of user passwords is done by PAM and subject to the
+      PAM configuration. It is recommended to set this variable
+      consistently with the PAM configuration.
     </para>
   </listitem>
 </varlistentry>
diff --git a/man/login.defs.d/MD5_CRYPT_ENAB.xml b/man/login.defs.d/MD5_CRYPT_ENAB.xml
index 39bc4ca22..d27588c3d 100644
--- a/man/login.defs.d/MD5_CRYPT_ENAB.xml
+++ b/man/login.defs.d/MD5_CRYPT_ENAB.xml
@@ -50,9 +50,11 @@
       This variable is deprecated. You should use
       <option>ENCRYPT_METHOD</option>.
     </para>
-    <para>
-      Note: if you use PAM, it is recommended to set this variable
-      consistently with the PAM modules configuration.
+    <para condition="pam">
+      Note: This only affect the generation of group passwords.
+      The generation of user passwords is done by PAM and subject to the
+      PAM configuration. It is recommended to set this variable
+      consistently with the PAM configuration.
     </para>
   </listitem>
 </varlistentry>
diff --git a/man/login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml b/man/login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml
index 908bd1873..f0a692825 100644
--- a/man/login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml
+++ b/man/login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml
@@ -59,5 +59,11 @@
       <option>SHA_CRYPT_MAX_ROUNDS</option>, the highest value will be
       used.
     </para>
+    <para condition="pam">
+      Note: This only affect the generation of group passwords.
+      The generation of user passwords is done by PAM and subject to the
+      PAM configuration. It is recommended to set this variable
+      consistently with the PAM configuration.
+    </para>
   </listitem>
 </varlistentry>