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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-07-26 00:57:01 +0000 (Tue, 26 Jul 2005)
New Revision: 411

Added:
   branches/experimental/debian/patches/442_useradd-O_option
Removed:
   branches/experimental/debian/patches/442_useradd.8-O
Modified:
   branches/experimental/debian/patches/series
Log:
Rename 442 since it do not only touch the useradd.8 man page.


Copied: branches/experimental/debian/patches/442_useradd-O_option (from rev 410, branches/experimental/debian/patches/442_useradd.8-O)

Deleted: branches/experimental/debian/patches/442_useradd.8-O
===================================================================
--- branches/experimental/debian/patches/442_useradd.8-O	2005-07-26 00:55:47 UTC (rev 410)
+++ branches/experimental/debian/patches/442_useradd.8-O	2005-07-26 00:57:01 UTC (rev 411)
@@ -1,60 +0,0 @@
-Index: shadow-4.0.11.1/man/useradd.8
-===================================================================
---- shadow-4.0.11.1.orig/man/useradd.8	2005-07-25 16:33:46.000000000 +0200
-+++ shadow-4.0.11.1/man/useradd.8	2005-07-25 17:39:17.000000000 +0200
-@@ -86,8 +86,7 @@
- 
- .TP
- \fB\-m\fR, \fB\-\-create\-home\fR
--The user's home directory will be created if it does not exist\&. The files contained in \fIskeleton_dir\fR will be copied to the home directory if the \fB\-k\fR option is used, otherwise the files contained in \fI/etc/skel\fR will be used instead\&. Any directories contained in \fI skeleton_dir\fR or \fI/etc/skel\fR will be created in the user's home directory as well\&. The \fB\-k\fR option is only valid in conjunction with the \fB\-m\fR option\&. The default is to not create the directory and to not copy any files\&.
--This option may not function correctly if the username has a / in it.
-+The user's home directory will be created if it does not exist\&. The files contained in \fIskeleton_dir\fR will be copied to the home directory if the \fB\-k\fR option is used, otherwise the files contained in \fI/etc/skel\fR will be used instead\&. Any directories contained in \fI skeleton_dir\fR or \fI/etc/skel\fR will be created in the user's home directory as well\&. The \fB\-k\fR option is only valid in conjunction with the \fB\-m\fR option\&. The default is to not create the directory and to not copy any files\&. This option may not function correctly if the username has a / in it\&.
- 
- .TP
- \fB\-K\fR, \fB\-\-key\fR \fIKEY\fR=\fIVALUE\fR
-@@ -95,6 +94,8 @@
- 
- Note: \fB\-K\fR  \fIUID_MIN\fR=\fI10\fR,\fIUID_MAX\fR=\fI499\fR doesn't work yet\&.
- 
-+For the compatibility with previous Debian's \fBuseradd\fR, the \fB\-O\fR option is also supported\&.
-+
- .TP
- \fB\-o\fR, \fB\-\-non\-unique\fR
- Allow create user account with duplicate (non\-unique) UID\&.
-Index: shadow-4.0.11.1/man/useradd.8.xml
-===================================================================
---- shadow-4.0.11.1.orig/man/useradd.8.xml	2005-07-25 16:33:46.000000000 +0200
-+++ shadow-4.0.11.1/man/useradd.8.xml	2005-07-25 17:39:07.000000000 +0200
-@@ -194,6 +194,11 @@
- 	    <replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
- 	    doesn't work yet.
- 	  </para>
-+          <para>
-+            For the compatibility with previous Debian's
-+            <command>useradd</command>, the <option>-O</option> option is
-+            also supported.
-+          </para>
-         </listitem>
-       </varlistentry>
-       <varlistentry>
-Index: shadow-4.0.11.1/src/useradd.c
-===================================================================
---- shadow-4.0.11.1.orig/src/useradd.c	2005-07-25 17:14:12.000000000 +0200
-+++ shadow-4.0.11.1/src/useradd.c	2005-07-25 17:35:21.000000000 +0200
-@@ -965,7 +965,7 @@
- 			{NULL, 0, NULL, '\0'}
- 		};
- 		while ((c =
--			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:",
-+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:mMop:s:u:",
- 				     long_options, NULL)) != -1) {
- 			switch (c) {
- 			case 'b':
-@@ -1084,6 +1084,7 @@
- 				kflg++;
- 				break;
- 			case 'K':
-+			case 'O': /* compatibility for previous Debian useradd */
- 				/*
- 				 * override login.defs defaults (-K name=value)
- 				 * example: -K UID_MIN=100 -K UID_MAX=499

Modified: branches/experimental/debian/patches/series
===================================================================
--- branches/experimental/debian/patches/series	2005-07-26 00:55:47 UTC (rev 410)
+++ branches/experimental/debian/patches/series	2005-07-26 00:57:01 UTC (rev 411)
@@ -147,7 +147,7 @@
 357_newgrp-stop_cont-proxy
 426_grpck_group-gshadow_members_consistency
 427_chage_expiry_0
-442_useradd.8-O
+442_useradd-O_option
 443_man_it_Makefile.am
 444_missing_Italian_manpages
 362_warning_messages