summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas François <nicolas.francois@centraliens.net>2013-08-15 17:21:44 +0200
committerNicolas François <nicolas.francois@centraliens.net>2013-08-15 17:30:20 +0200
commiteceedf43cfcafcc18e5276f23c3d96c9596e1a48 (patch)
treefcf6f411d5d0cd7b80e172c4b95df5faf7b8dab0
parent6f8dd000f64f349c2db574d9d36c8445583f28e7 (diff)
Improve documentation.
* man/login.defs.d/SUB_GID_COUNT.xml: Document newusers behavior when the user already have subordinate group IDs. * man/login.defs.d/SUB_UID_COUNT.xml: Likewise. * man/login.defs.d/SUB_GID_COUNT.xml: Fix typo (MAX<->MIN). * man/login.defs.d/SUB_UID_COUNT.xml: Likewise.
-rw-r--r--ChangeLog8
-rw-r--r--man/login.defs.d/SUB_GID_COUNT.xml7
-rw-r--r--man/login.defs.d/SUB_UID_COUNT.xml7
3 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index ecfa950c..47fd3136 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2013-08-15 Nicolas François <nicolas.francois@centraliens.net>
+ * man/login.defs.d/SUB_GID_COUNT.xml: Document newusers behavior
+ when the user already have subordinate group IDs.
+ * man/login.defs.d/SUB_UID_COUNT.xml: Likewise.
+ * man/login.defs.d/SUB_GID_COUNT.xml: Fix typo (MAX<->MIN).
+ * man/login.defs.d/SUB_UID_COUNT.xml: Likewise.
+
+2013-08-15 Nicolas François <nicolas.francois@centraliens.net>
+
* src/usermod.c: Check early if /etc/subuid (/etc/subgid) exists
when option -v/-V (-w/-W) are provided.
diff --git a/man/login.defs.d/SUB_GID_COUNT.xml b/man/login.defs.d/SUB_GID_COUNT.xml
index d8592e64..01ace007 100644
--- a/man/login.defs.d/SUB_GID_COUNT.xml
+++ b/man/login.defs.d/SUB_GID_COUNT.xml
@@ -33,14 +33,15 @@
<listitem>
<para>
If <filename>/etc/subuid</filename> exists, the commands
- <command>useradd</command> and <command>newusers</command> allocate
+ <command>useradd</command> and <command>newusers</command> (unless
+ the user already have subordinate group IDs) allocate
<option>SUB_GID_COUNT</option> unused group IDs from the range
<option>SUB_GID_MIN</option> to <option>SUB_GID_MAX</option> for each
new user.
</para>
<para>
- The default values for <option>SUB_GID_MAX</option>,
- <option>SUB_GID_MIN</option>, <option>SUB_GID_COUNT</option>
+ The default values for <option>SUB_GID_MIN</option>,
+ <option>SUB_GID_MAX</option>, <option>SUB_GID_COUNT</option>
are respectively 100000, 600100000 and 10000.
</para>
</listitem>
diff --git a/man/login.defs.d/SUB_UID_COUNT.xml b/man/login.defs.d/SUB_UID_COUNT.xml
index 8db10690..5ad812f7 100644
--- a/man/login.defs.d/SUB_UID_COUNT.xml
+++ b/man/login.defs.d/SUB_UID_COUNT.xml
@@ -33,14 +33,15 @@
<listitem>
<para>
If <filename>/etc/subuid</filename> exists, the commands
- <command>useradd</command> and <command>newusers</command> allocate
+ <command>useradd</command> and <command>newusers</command> (unless
+ the user already have subordinate user IDs) allocate
<option>SUB_UID_COUNT</option> unused user IDs from the range
<option>SUB_UID_MIN</option> to <option>SUB_UID_MAX</option> for each
new user.
</para>
<para>
- The default values for <option>SUB_UID_MAX</option>,
- <option>SUB_UID_MIN</option>, <option>SUB_UID_COUNT</option>
+ The default values for <option>SUB_UID_MIN</option>,
+ <option>SUB_UID_MAX</option>, <option>SUB_UID_COUNT</option>
are respectively 100000, 600100000 and 10000.
</para>
</listitem>