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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-11-17 22:07:47 +0000 (Sat, 17 Nov 2007)
New Revision: 1388

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/man/usermod.8.xml
Log:
Document the differences between locking an account and locking a password.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-17 22:05:31 UTC (rev 1387)
+++ upstream/trunk/ChangeLog	2007-11-17 22:07:47 UTC (rev 1388)
@@ -1,5 +1,10 @@
 2007-11-17  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* man/usermod.8.xml: Document the differences between locking an
+	account and locking a password.
+
+2007-11-17  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* NEWS, src/usermod.c: Refuse to unlock an account when it would
 	result in a passwordless account.  Based on Openwall's patch
 	shadow-4.0.4.1-owl-usermod-unlock.diff.

Modified: upstream/trunk/man/usermod.8.xml
===================================================================
--- upstream/trunk/man/usermod.8.xml	2007-11-17 22:05:31 UTC (rev 1387)
+++ upstream/trunk/man/usermod.8.xml	2007-11-17 22:07:47 UTC (rev 1388)
@@ -158,6 +158,12 @@
 	    can't use this option with <option>-p</option> or
 	    <option>-U</option>.
 	  </para>
+	  <para>
+	    Note: if you wish to lock the account (not only access with a
+	    password), you should also set the
+	    <replaceable>EXPIRE_DATE</replaceable> to
+	    <replaceable>1</replaceable>.
+	  </para>
 	</listitem>
       </varlistentry>
       <varlistentry>
@@ -224,6 +230,14 @@
 	    encrypted password. You can't use this option with
 	    <option>-p</option> or <option>-L</option>.
 	  </para>
+	  <para>
+	    Note: if you wish to unlock the account (not only access with a
+	    password), you should also set the
+	    <replaceable>EXPIRE_DATE</replaceable> (for example to
+	    <replaceable>99999</replaceable>, or to the
+	    <replaceable>EXPIRE</replaceable> value from
+	    <filename>/etc/default/useradd</filename>).
+	  </para>
 	</listitem>
       </varlistentry>
     </variablelist>