[Pkg-shadow-commits] r762 - trunk/debian/patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-01-04 23:55:36 +0000 (Wed, 04 Jan 2006)
New Revision: 762

Removed:
   trunk/debian/patches/470_su.1_document_options
Log:
I've committed the wrong file in r761.
It is 470_su.1_document_options that is already applied upstream.

437_su_-c_option was just updated.


Deleted: trunk/debian/patches/470_su.1_document_options
===================================================================
--- trunk/debian/patches/470_su.1_document_options	2006-01-04 23:32:17 UTC (rev 761)
+++ trunk/debian/patches/470_su.1_document_options	2006-01-04 23:55:36 UTC (rev 762)
@@ -1,104 +0,0 @@
-Index: shadow-4.0.14/man/su.1.xml
-===================================================================
---- shadow-4.0.14.orig/man/su.1.xml	2006-01-03 08:25:08.844145449 +0100
-+++ shadow-4.0.14/man/su.1.xml	2006-01-03 08:25:09.204072373 +0100
-@@ -54,6 +54,11 @@
-       <command>su</command> options from the arguments supplied to the shell.
-     </para>
- 
-+    <para>
-+      You can use the <option>--</option> argument to separate
-+      <command>su</command> options from the arguments supplied to the shell.
-+    </para>
-+
-     <para>The user will be prompted for a password, if appropriate. Invalid
-       passwords will produce an error message. All attempts, both valid and
-       invalid, are logged to detect abuses of the system.
-@@ -156,6 +161,87 @@
-     </variablelist>
-   </refsect1>
- 
-+  <refsect1 id='options'>
-+    <title>OPTIONS</title>
-+    <para>The options which apply to the <command>su</command> command are:
-+    </para>
-+    <variablelist remap='IP'>
-+      <varlistentry>
-+	<term>
-+	  <option>-</option>, <option>-l</option>, <option>--login</option>
-+	</term>
-+	<listitem>
-+	  <para>
-+	    Provide an environment similar to what the user would expect had
-+	    the user logged in directly.
-+	  </para>
-+	  <para>
-+	    When <option>-</option> is used, it must be specified as the last
-+	    <command>su</command> option.
-+	    The other forms (<option>-l</option> and <option>--login</option>)
-+	    do not have this restriction.
-+	  </para>
-+	</listitem>
-+      </varlistentry>
-+      <varlistentry>
-+	<term>
-+	  <option>-s</option>, <option>--shell</option>
-+	  <replaceable>SHELL</replaceable>
-+	</term>
-+	<listitem>
-+	  <para>The shell that will be invoked.</para>
-+	  <para>
-+	    The invoked shell is choosen among (higest priority first):
-+	    <itemizedlist>
-+	      <listitem>
-+		<para>The shell specified with --shell</para>
-+	      </listitem>
-+	      <listitem>
-+		<para>
-+		  If <option>--preserve-environment</option> is used, the
-+		  shell specified by the <envar>SHELL</envar> environment
-+		  variable.
-+		</para>
-+	      </listitem>
-+	      <listitem>
-+		<para>
-+		  The shell indicated in the /etc/passwd entry for the target
-+		  user.
-+		</para>
-+	      </listitem>
-+	      <listitem>
-+		<para>
-+		  /bin/sh if a shell could not be found by any above method.
-+		</para>
-+	      </listitem>
-+	    </itemizedlist>
-+	  </para>
-+	  <para>
-+	    If the target user has a restricted shell (i.e. the shell field of
-+	    this user's entry in <filename>/etc/passwd</filename> is not
-+	    specified in <filename>/etc/shell</filename>), then the
-+	    <option>--shell</option> option or the <envar>SHELL</envar>
-+	    environment variable won't be taken into account unless
-+	    <command>su</command> is called by the root.
-+	  </para>
-+	</listitem>
-+      </varlistentry>
-+      <varlistentry>
-+	<term>
-+	  <option>-m</option>, <option>-p</option>,
-+	  <option>--preserve-environment</option>
-+	</term>
-+	<listitem>
-+	  <para>Preserve the current environment.</para>
-+	  <para>
-+	    If the target user has a restricted shell, this option has no
-+	    effect (unless <command>su</command> is called by root).
-+	  </para>
-+	</listitem>
-+      </varlistentry>
-+    </variablelist>
-+  </refsect1>
-+
-   <refsect1 id='caveats'>
-     <title>CAVEATS</title>
-     <para>