[Pkg-shadow-commits] r354 - branches/experimental/debian/patches

Thu, 07 Jul 2005 00:17:04 +0000

Author: nekral-guest
Date: 2005-07-07 00:17:03 +0000 (Thu, 07 Jul 2005)
New Revision: 354

Modified:
   branches/experimental/debian/patches/336_chfn.1
Log:
Another conversion to 4.0.10


Modified: branches/experimental/debian/patches/336_chfn.1
===================================================================

--- branches/experimental/debian/patches/336_chfn.1	2005-07-07 00:09:03 UTC (rev 353)
+++ branches/experimental/debian/patches/336_chfn.1	2005-07-07 00:17:03 UTC (rev 354)
@@ -1,39 +1,54 @@
-Goal: fix typos and give more info about login.defs setings influence
-Fixes: #312428
+Goal: fix typos and do not advertize that the "other" field can contain
+      control characters.
 
-Status wrt upstream: Applied
+Status wrt upstream: The typo need to be forwarded. The other fix need to be
+                     checked.
 
-Index: shadow-4.0.9/man/chfn.1
+Note: 
+  "The other field does not have this restriction, and is used to store
+   accounting information used by other applications"
+  This should be checked and forwarded upstream if needed.
+
+Index: shadow-4.0.10/man/chfn.1
 ===================================================================
---- shadow-4.0.9.orig/man/chfn.1	2005-04-05 20:47:50.000000000 +0200
-+++ shadow-4.0.9/man/chfn.1	2005-06-12 00:11:39.930572066 +0200
-@@ -37,14 +37,16 @@ chfn \- change real user name and inform
- \fBchfn\fR changes user fullname, office number, office extension, and home
- 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, the super user may change
-+may only change the fields for her own account, subject to the restrictions
-+in /etc/login.defs (the default configuration is to prevent users from
-+changing their fullname), the super user may change
- the fields for any account. Also, only the super user may use the \fB\-o\fR
- option to change the undefined portions of the GECOS field.
+--- shadow-4.0.10.orig/man/chfn.1	2005-06-16 17:49:13.000000000 +0200
++++ shadow-4.0.10/man/chfn.1	2005-07-04 17:59:10.000000000 +0200
+@@ -31,10 +31,11 @@
+ .SH "DESCRIPTION"
+ 
  .PP
- The only restriction placed on the contents of the fields is that no control
--characters may be present, nor any of comma, colon, or equal sign. The
--\fIother\fR field does not have this restriction, and is used to store
--accounting information used by other applications.
-+characters may be present, nor any of comma, colon, or equal sign.
-+.\" The \fIother\fR field does not have this restriction, and is used to store
-+.\" accounting information used by other applications.
+-\fBchfn\fR changes user fullname, office number, office extension, and home 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 may only change the fields for her own account, subject to the restrictions in \fI/etc/login\&.defs\fR\&. (The default configuration is to prevent users from changing their fullname\&.) The super user may change any field for any account\&. Additionally, only the super user may use the \fB\-o\fR option to change the undefined portions of the GECOS field\&.
++\fBchfn\fR changes user fullname, office number, office extension, and home 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, subject to the restrictions in \fI/etc/login\&.defs\fR\&. (The default configuration is to prevent users from changing their fullname\&.) The super user may change any field for any account\&. Additionally, only the super user may use the \fB\-o\fR option to change the undefined portions of the GECOS field\&.
+ 
  .PP
- If none of the options are selected, \fBchfn\fR operates in an interactive
- fashion, prompting the user with the current values for all of the fields.
-@@ -53,6 +55,8 @@ current value. The current value is disp
- marks. Without options, chfn prompts for the current user account.
- .SH FILES
- \fI/etc/passwd\fR	\- user account information
-+.br
-+\fI/etc/login.defs\fR	\- runtime configuration
- .SH SEE ALSO
- .BR passwd (5)
- .SH AUTHOR
+-The only restriction placed on the contents of the fields is that no control characters may be present, nor any of comma, colon, or equal sign\&. The \fIother\fR field does not have this restriction, and is used to store accounting information used by other applications\&.
++The only restriction placed on the contents of the fields is that no control characters may be present, nor any of comma, colon, or equal sign\&.
++.\"The \fIother\fR field does not have this restriction, and is used to store accounting information used by other applications\&.
+ 
+ .PP
+ If none of the options are selected, \fBchfn\fR operates in an interactive fashion, prompting the user with the current values for all of the fields\&. Enter the new value to change the field, or leave the line blank to use the current value\&. The current value is displayed between a pair of \fI[ ]\fR marks\&. Without options, chfn prompts for the current user account\&.
+Index: shadow-4.0.10/man/chfn.1.xml
+===================================================================
+--- shadow-4.0.10.orig/man/chfn.1.xml	2005-06-15 14:21:58.000000000 +0200
++++ shadow-4.0.10/man/chfn.1.xml	2005-07-04 18:00:03.000000000 +0200
+@@ -31,7 +31,7 @@
+       office extension, and home phone number information for a user's
+       account. This information is typically printed by <citerefentry>
+       <refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum>
+-      </citerefentry> and similar programs. A normal user may only change
++      </citerefentry> and similar programs. A normal user
+       may only change the fields for her own account, subject to the
+       restrictions in <filename>/etc/login.defs</filename>. (The default
+       configuration is to prevent users from changing their fullname.) The
+@@ -42,9 +42,9 @@
+     
+     <para>The only restriction placed on the contents of the fields is that
+       no control characters may be present, nor any of comma, colon, or
+-      equal sign. The <emphasis remap='I'>other</emphasis> field does not
++      equal sign.<!-- The <emphasis remap='I'>other</emphasis> field does not
+       have this restriction, and is used to store accounting information
+-      used by other applications.
++      used by other applications.-->
+     </para>
+     
+     <para> If none of the options are selected, <command>chfn</command>



