[Pkg-shadow-commits] r132 - trunk/debian/patches
Nicolas FRANCOIS
pkg-shadow-devel@lists.alioth.debian.org
Thu, 12 May 2005 23:22:12 +0000
Author: nekral-guest
Date: 2005-05-12 23:22:11 +0000 (Thu, 12 May 2005)
New Revision: 132
Modified:
trunk/debian/patches/005_manpages.dpatch
trunk/debian/patches/314_passwd.1_formatting.dpatch
trunk/debian/patches/323_passwd.1-typo.dpatch
Log:
A chunk was missing in 005, and another chunk has consequences on
314_passwd.1_formatting.dpatch and 323_passwd.1-typo.dpatch.
This makes these patches closer to the ones from the CVS.
Modified: trunk/debian/patches/005_manpages.dpatch
===================================================================
--- trunk/debian/patches/005_manpages.dpatch 2005-05-12 23:19:37 UTC (rev 131)
+++ trunk/debian/patches/005_manpages.dpatch 2005-05-12 23:22:11 UTC (rev 132)
@@ -40,11 +40,13 @@
===================================================================
--- shadow-4.0.3.orig/man/chfn.1 2005-05-12 12:12:08.887059874 +0200
+++ shadow-4.0.3/man/chfn.1 2005-05-12 12:12:18.801578516 +0200
-@@ -38,17 +38,19 @@ chfn \- change real user name and inform
+@@ -37,18 +37,20 @@ chfn \- change real user name and inform
+ [\fIuser\fR]
.SH DESCRIPTION
\fBchfn\fR changes user fullname, office number, office extension, and home
- phone number information for a user's account.
+-phone number information for a user's account.
-This information is typically printed by \fBfinger\fR(1) and similiar
++phone number information for a user's account.
+This information is typically printed by \fBfinger\fR(1) and similar
programs.
A normal user may only change the fields for her own account,
@@ -250,15 +252,31 @@
===================================================================
--- shadow-4.0.3.orig/man/passwd.1 2005-05-12 12:12:08.888059724 +0200
+++ shadow-4.0.3/man/passwd.1 2005-05-12 12:12:18.803578217 +0200
-@@ -45,7 +45,7 @@ The administrator of a group may change
+@@ -45,9 +45,9 @@ The administrator of a group may change
\fBpasswd\fR also changes account information, such as the full name
of the user, user's login shell, or password expiry date and interval.
.PP
-The \fB-s\fR option makes passwd call chsh to change the user's shell. The
+The \fB-s\fR option makes \fBpasswd\fR call \fBchsh\fR to change the user's shell. The
\fB-f\fR option makes passwd call chfn to change the user's gecos
- information. These two options are only meant for compatiblity, since the
+-information. These two options are only meant for compatiblity, since the
++information. These two options are only meant for compatiblity, since the
other programs can be called directly.
+ .SS Password Changes
+ The user is first prompted for his/her old password, if one is present.
+@@ -117,9 +117,9 @@
+ days, the user may no longer sign on to the account.
+ .PP
+ If you wish to immediately expire an account's password, you can use the
+-\fB-e\fR option. This in effect can force a user to change his/her password at
+-the user's next login. You can also use the \fB-d\fR option to delete a user's
+-password (make it empty). Use caution with this option since it can make an
++\fB-e\fR option. This in effect can force a user to change his/her password at
++the user's next login. You can also use the \fB-d\fR option to delete a user's
++password (make it empty). Use caution with this option since it can make an
+ account not require a password at all to login, leaving your system open to
+ intruders.
+ .SS Account maintenance
@@ -130,13 +130,19 @@ value which matches no possible encrypte
The \fB-u\fR option re-enables an account by changing the password
back to its previous value.
@@ -474,6 +492,7 @@
-is reset to \fB/bin:/usr/bin\fR for normal users, or
-\fB/sbin:/bin:/usr/sbin:/usr/bin\fR for the super user. This may be changed
-with the \fBENV_PATH\fR and \fBENV_SUPATH\fR definitions in
+-\fI/etc/login.defs\fR.
+.B su
+is used to become another user during a login session.
+Invoked without a username, \fBsu\fR defaults to becoming
@@ -497,7 +516,7 @@
+reset to \fB/bin:/usr/bin\fR for normal users, or
+\fB/sbin:/bin:/usr/sbin:/usr/bin\fR for the super user. This may be
+changed with the \fBENV_PATH\fR and \fBENV_SUPATH\fR definitions in
- \fI/etc/login.defs\fR.
++\fI/etc/login.defs\fR.
+\fB$IFS\fP, if is set, is reset to contain space, tab, and newline.
+\fB$USER\fP is set to the name of the target user,
+\fB$HOME\fP is set to the home directory of the target user, and
Modified: trunk/debian/patches/314_passwd.1_formatting.dpatch
===================================================================
--- trunk/debian/patches/314_passwd.1_formatting.dpatch 2005-05-12 23:19:37 UTC (rev 131)
+++ trunk/debian/patches/314_passwd.1_formatting.dpatch 2005-05-12 23:22:11 UTC (rev 132)
@@ -35,7 +35,7 @@
The \fB-s\fR option makes \fBpasswd\fR call \fBchsh\fR to change the user's shell. The
-\fB-f\fR option makes passwd call chfn to change the user's gecos
+\fB-f\fR option makes \fBpasswd\fR call \fBchfn\fR to change the user's gecos
- information. These two options are only meant for compatiblity, since the
+ information. These two options are only meant for compatiblity, since the
other programs can be called directly.
.SS Password Changes
@@ -201,7 +201,7 @@ User account information
Modified: trunk/debian/patches/323_passwd.1-typo.dpatch
===================================================================
--- trunk/debian/patches/323_passwd.1-typo.dpatch 2005-05-12 23:19:37 UTC (rev 131)
+++ trunk/debian/patches/323_passwd.1-typo.dpatch 2005-05-12 23:22:11 UTC (rev 132)
@@ -13,8 +13,8 @@
.PP
The \fB-s\fR option makes \fBpasswd\fR call \fBchsh\fR to change the user's shell. The
\fB-f\fR option makes \fBpasswd\fR call \fBchfn\fR to change the user's gecos
--information. These two options are only meant for compatiblity, since the
-+information. These two options are only meant for compatibility, since the
+-information. These two options are only meant for compatiblity, since the
++information. These two options are only meant for compatibility, since the
other programs can be called directly.
.SS Password Changes
The user is first prompted for his/her old password, if one is present.