[Pkg-shadow-commits] r410 - branches/experimental/debian/patches
Nicolas FRANCOIS
nekral-guest at costa.debian.org
Tue Jul 26 00:55:47 UTC 2005
Author: nekral-guest
Date: 2005-07-26 00:55:47 +0000 (Tue, 26 Jul 2005)
New Revision: 410
Modified:
branches/experimental/debian/patches/442_useradd.8-O
Log:
Upstream changed -K to -O and documented -K.
Add -O as an alias to -K and document that -O is kept for the compatibility
with previous versions.
Modified: branches/experimental/debian/patches/442_useradd.8-O
===================================================================
--- branches/experimental/debian/patches/442_useradd.8-O 2005-07-26 00:53:56 UTC (rev 409)
+++ branches/experimental/debian/patches/442_useradd.8-O 2005-07-26 00:55:47 UTC (rev 410)
@@ -1,80 +1,60 @@
-Goal: document "-O" option in useradd
-Fixes: 304934
-
-Status wrt upstream: not applied. Documented in TFS only.
- Also, Tomasz tends to adopt Solaris' "-K" option instead.
-
-Index: shadow-4.0.10/man/useradd.8
+Index: shadow-4.0.11.1/man/useradd.8
===================================================================
---- shadow-4.0.10.orig/man/useradd.8 2005-07-09 13:27:34.000000000 +0200
-+++ shadow-4.0.10/man/useradd.8 2005-07-09 14:24:39.000000000 +0200
-@@ -28,11 +28,11 @@
- .br
- [\-g\ \fIinitial_group\fR] [\-G\ \fIgroup1\fR\ [\fI,group2,\fR...\ \fI,\fR\ [\fIgroupN\fR]]]
- .br
-- [[\-M]\ \-m\ [\-k\ \fIskeleton_dir\fR]] [\-o] [\-p\ \fIpasswd\fR] [\-s\ \fIshell\fR]
-+ [[\-M]\ \-m\ [\-k\ \fIskeleton_dir\fR]] [\-o] [\-O \fIPARAMETER\fR=\fIvalue\fR]
- .br
-- [\-u\ \fIuid\fR] \fIlogin\fR \fIuseradd\fR \-D [\-g\ \fIgroup\fR] [\-b\ \fIhome_dir\fR] [\-e\ \fIexpire_date\fR]
-+ [\-p\ \fIpasswd\fR] [\-s\ \fIshell\fR] [\-u\ \fIuid\fR] \fIlogin\fR \fIuseradd\fR \-D [\-g\ \fIgroup\fR]
- .br
-- [\-f\ \fIinactive_days\fR] [\-s\ \fIshell\fR]
-+ [\-b\ \fIhome_dir\fR] [\-e\ \fIexpire_date\fR] [\-f\ \fIinactive_days\fR] [\-s\ \fIshell\fR]
- .ad
- .hy
+--- 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 @@
-@@ -86,6 +86,17 @@
- Allow create user with duplicate (non\-unique) UID\&.
+ .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\-O \fIPARAMETER\fR=\fIvalue\fR
-+Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS and
-+others). For example, \fB\-O PASS_MAX_DAYS=-1\fR can be used when creating
-+system account to turn off password ageing, even though
-+system account has no password at all.
-+
-+Multiple \fB\-O\fR options can be specified, e.g.:
-+\fB\-O UID_MIN=100 \-O UID_MAX=499\fR. Note: \fB\-O UID_MIN=10,UID_MAX=499\fR
-+doesn't work yet.
-+
-+.TP
- \fB\-p\fR \fIpasswd\fR
- The encrypted password, as returned by \fBcrypt\fR(3)\&. The default is to disable the account\&.
+ \fB\-K\fR, \fB\-\-key\fR \fIKEY\fR=\fIVALUE\fR
+@@ -95,6 +94,8 @@
-Index: shadow-4.0.10/man/useradd.8.xml
+ 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.10.orig/man/useradd.8.xml 2005-07-09 13:27:34.000000000 +0200
-+++ shadow-4.0.10/man/useradd.8.xml 2005-07-09 14:31:23.000000000 +0200
-@@ -40,6 +40,7 @@
- <arg choice='opt'>-k <replaceable>skeleton_dir</replaceable></arg>
- </arg>
- <arg choice='opt'>-o </arg>
-+ <arg choice='opt'>-O <replaceable>PARAMETER</replaceable>=<replaceable>value</replaceable></arg>
- <arg choice='opt'>-p <replaceable>passwd</replaceable></arg>
- <arg choice='opt'>-s <replaceable>shell</replaceable></arg>
- <sbr/>
-@@ -195,6 +196,24 @@
+--- 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>
- <term>
-+ <option>-O</option> <replaceable>PARAMETER</replaceable>=<replaceable>value</replaceable>
-+ </term>
-+ <listitem>
-+ <para>Overrides <filename>/etc/login.defs</filename> defaults
-+ (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS and others). For
-+ example, <command>-O PASS_MAX_DAYS=-1</command> can be used when
-+ creating system account to turn off password ageing, even though
-+ system account has no password at all.
-+ </para>
-+
-+ <para>Multiple <option>-O</option> options can be specified, e.g.:
-+ <command>-O UID_MIN=100 -O UID_MAX=499</command>. Note:
-+ <command>-O UID_MIN=10,UID_MAX=499</command> doesn't work yet.
-+ </para>
-+ </listitem>
-+ </varlistentry>
-+ <varlistentry>
-+ <term>
- <option>-p</option> <replaceable>passwd</replaceable>
- </term>
- <listitem>
+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
More information about the Pkg-shadow-commits
mailing list