[Pkg-shadow-commits] sid/debian/patches 312_usermod-302388.dpatch,1.1,1.2

[Christian Perrier]

Update of /cvsroot/pkg-shadow/sid/debian/patches
In directory haydn:/tmp/cvs-serv9455

Modified Files:
	312_usermod-302388.dpatch 
Log Message:
Sync the usermod.8 patch with sarge


Index: 312_usermod-302388.dpatch
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/patches/312_usermod-302388.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 312_usermod-302388.dpatch	31 Mar 2005 21:28:46 -0000	1.1
+++ 312_usermod-302388.dpatch	19 Apr 2005 06:56:56 -0000	1.2
@@ -25,14 +25,23 @@
 
 @DPATCH@
 
---- shadow-4.0.3-31sarge1/man/usermod.8.ori	2005-03-31 23:21:19.168175476 +0200
-+++ shadow-4.0.3-31sarge1/man/usermod.8	2005-03-31 23:23:10.240322485 +0200
+--- shadow-4.0.3/man/usermod.8	2002-03-08 05:39:12.000000000 +0100
++++ shadow-4.0.3-31sarge3/man/usermod.8	2005-04-18 08:24:21.000000000 +0200
 @@ -81,6 +81,8 @@
  Nothing else is changed.
  In particular, the user's home directory name should probably
  be changed to reflect the new login name.
 +.IP "\fB-o\fR"
-+Used with \fI-r\fR option allow change user ID to non-unique value.
++When used with the \fI-r\fR option, this option allows to change the user ID to a non-unique value.
  .IP "\fB-p \fIpasswd\fR"                                                
  The encrypted password, as returned by \fBcrypt\fR(3).                      
  .IP "\fB-s \fIshell\fR"
+@@ -100,6 +102,8 @@
+ Lock a user's password.
+ This puts a '!' in front of the encrypted password, effectively disabling
+ the password.  You can't use this option with \fI-p\fR or \fI-U\fR.
++.IP "\fB\-o\fR"
++Allows changing the user ID to a non\-unique value when used with \fI\-u\fR option.
+ .IP "\fB-U\fR"
+ Unlock a user's password.
+ This removes the '!' in front of the encrypted password.