man: Document UAPI merging in login.defs

b52ce71c added support for UAPI/libeconf.
The first release to contain this change was 4.8.

Update our man pages to properly describe the various locations of
login.defs if shadow is compiled with libeconf and without.

Ref: b52ce71c (2019-10-05; "Add support for a vendor directory and libeconf")
Closes: <https://bugzilla.suse.com/show_bug.cgi?id=1264297>
Closes: <https://github.com/shadow-maint/shadow/issues/1712>
Signed-off-by: Michael Vetter <jubalh@iodoru.org>

diff --git a/man/chfn.1.xml b/man/chfn.1.xml
index e329efe90c657e2e75316f2752ed06b1278c14b9..dc7a8d0ae278d71c0b4b722e2c16677bc159e05b 100644 (file)
--- a/man/chfn.1.xml
+++ b/man/chfn.1.xml
@@ -187,7 +187,11 @@
     <title>FILES</title>
     <variablelist>
       <varlistentry>
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration.</para>
        </listitem>

diff --git a/man/chgpasswd.8.xml b/man/chgpasswd.8.xml
index 81d8985f9d6e97e37f33d644806aff4f934352e6..7afcae82768755ebd371b3e389ad75986b195b60 100644 (file)
--- a/man/chgpasswd.8.xml
+++ b/man/chgpasswd.8.xml
@@ -218,7 +218,11 @@
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration.</para>
        </listitem>

diff --git a/man/chpasswd.8.xml b/man/chpasswd.8.xml
index 80d8ce594b6a9d657c92c2abc003ac23f838ecd2..94a8669dcac31ceb169710b86ab3157efbde58c0 100644 (file)
--- a/man/chpasswd.8.xml
+++ b/man/chpasswd.8.xml
@@ -272,7 +272,11 @@
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration.</para>
        </listitem>

diff --git a/man/chsh.1.xml b/man/chsh.1.xml
index c4e5614e0a4c77e4b266f4277ab4cebf5f18c363..1e86e8119906df20c8a3f864e36f1fd1a6f95241 100644 (file)
--- a/man/chsh.1.xml
+++ b/man/chsh.1.xml
@@ -190,7 +190,11 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration.</para>
        </listitem>

diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index c6001671f80d558f7ffcd66251eb7caf314ebefd..fa11e6f35872085e0a25902d42bb05ac62c17e45 100644 (file)
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -274,7 +274,11 @@
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration.</para>
        </listitem>

diff --git a/man/groupmod.8.xml b/man/groupmod.8.xml
index ca2874411624461efd43a5543c4fa2ef63428f6c..a8e5a5e24de57f382c95ee74a98cb494f1999aa4 100644 (file)
--- a/man/groupmod.8.xml
+++ b/man/groupmod.8.xml
@@ -237,7 +237,11 @@
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration.</para>
        </listitem>

diff --git a/man/login.1.xml b/man/login.1.xml
index 83aa52d28d6473eaaf6a960d96c803b365f52cbc..600cb654a5423748ecbe23f6029cb251f08c11c1 100644 (file)
--- a/man/login.1.xml
+++ b/man/login.1.xml
@@ -354,7 +354,11 @@
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration.</para>
        </listitem>

diff --git a/man/login.access.5.xml b/man/login.access.5.xml
index 3c425cc1dfe0f653eac954dbd92eca73e4c71889..af53f64a6f9e01318dbfa0c0cc9e2d46514500a3 100644 (file)
--- a/man/login.access.5.xml
+++ b/man/login.access.5.xml
@@ -97,7 +97,11 @@
     <title>FILES</title>
     <variablelist>
       <varlistentry>
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration.</para>
        </listitem>

diff --git a/man/login.defs.5.xml b/man/login.defs.5.xml
index b7cdf3e78eeb8d4d98b8887b2df98e3f5189ede9..0cc30a63d38f0a1c2c66cd85ec5c6fccbe2837fe 100644 (file)
--- a/man/login.defs.5.xml
+++ b/man/login.defs.5.xml
@@ -115,10 +115,23 @@
   <refsect1 id='description'>
     <title>DESCRIPTION</title>
     <para>
-      The <filename>/etc/login.defs</filename> file defines the
-      site-specific configuration for the shadow password suite. This file
-      is required. Absence of this file will not prevent system operation,
-      but will probably result in undesirable operation.
+      The configuration for the shadow password suite is defined by
+      <filename>login.defs</filename>.
+    </para>
+    <para>
+      Depending on compile-time configuration,
+      the settings are either read from a single file
+      (<filename>/etc/login.defs</filename>),
+      or merged hierarchically
+      (if compiled with <literal>libeconf</literal> support):
+      from <filename>/usr/etc/login.defs</filename>,
+      <filename>/usr/lib/login.defs</filename>,
+      <filename>/etc/login.defs</filename>,
+      and drop-ins under <filename>/etc/login.defs.d/</filename>.
+    </para>
+    <para>
+      The merging follows the UAPI configuration file specification:
+      https://uapi-group.org/specifications/specs/configuration_files_specification/
     </para>
 
     <para>

diff --git a/man/newusers.8.xml b/man/newusers.8.xml
index 59f868226f87b486016d306aeeae02d674a16045..621848463cdc773ebbc8629604f18981010180a0 100644 (file)
--- a/man/newusers.8.xml
+++ b/man/newusers.8.xml
@@ -436,7 +436,11 @@
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration.</para>
        </listitem>

diff --git a/man/passwd.1.xml b/man/passwd.1.xml
index b133eb6d5c65daae7c3059776785f477e8199f1a..35048ed3a1defa1f98b50a2d07a6d4b003a9975e 100644 (file)
--- a/man/passwd.1.xml
+++ b/man/passwd.1.xml
@@ -411,7 +411,11 @@
        </listitem>
       </varlistentry>
       <varlistentry condition="no_pam">
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration.</para>
        </listitem>

diff --git a/man/pwconv.8.xml b/man/pwconv.8.xml
index 89741a203ce2381185b21a0dc4738e3952604611..3ed70b256a5fb8679ce1e1ebb9acfc67a73fe78a 100644 (file)
--- a/man/pwconv.8.xml
+++ b/man/pwconv.8.xml
@@ -225,7 +225,11 @@
     <title>FILES</title>
     <variablelist>
       <varlistentry>
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration.</para>
        </listitem>

diff --git a/man/su.1.xml b/man/su.1.xml
index 5c5001453e0897de079aa8657f619f6763d2a6db..e5a55341e9c7f2aa930971905fa59fe378c84de7 100644 (file)
--- a/man/su.1.xml
+++ b/man/su.1.xml
@@ -354,7 +354,11 @@
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration.</para>
        </listitem>

diff --git a/man/useradd.8.xml b/man/useradd.8.xml
index 9e15763fad03eda6d6477da2945d476bfaf8c262..5a0937d23f2ddcff8cbf9723c59c21796afa5762 100644 (file)
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
@@ -893,7 +893,11 @@
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration.</para>
        </listitem>

diff --git a/man/userdel.8.xml b/man/userdel.8.xml
index e10a6af80f6d0566917f09563e142d0dfd3cabc8..0a40d4f80051053d4d2b0a69822477c01435d43e 100644 (file)
--- a/man/userdel.8.xml
+++ b/man/userdel.8.xml
@@ -181,7 +181,11 @@
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration.</para>
        </listitem>

diff --git a/man/usermod.8.xml b/man/usermod.8.xml
index c84d10f2475584e86d03067560f8351beaa48371..230b7c52e9ce14ceb27b0670afa597c1f98309d6 100644 (file)
--- a/man/usermod.8.xml
+++ b/man/usermod.8.xml
@@ -601,7 +601,11 @@
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><filename>/etc/login.defs</filename></term>
+       <term>
+         <citerefentry>
+           <refentrytitle>login.defs</refentrytitle><manvolnum>5</manvolnum>
+         </citerefentry>
+       </term>
        <listitem>
          <para>Shadow password suite configuration</para>
        </listitem>