From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Wed, 20 Dec 2023 11:27:24 +0000 (+0100)
Subject: man/: ENV_HZ is only used without PAM
X-Git-Tag: 4.15.0-rc1~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97ddb0d80cdf3dd88f7592be31ef04dfa32ade60;p=thirdparty%2Fshadow.git

man/: ENV_HZ is only used without PAM

Contrary to the comment in ENV_HZ.xml, ENV_HZ is not even used in
sulogin (anymore) if PAM support is enabled.

Skip paragraphs of sulogin if PAM support is enabled, since they would
be empty now.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
---

diff --git a/man/login.1.xml b/man/login.1.xml
index fbfbbf18d..0826b1f01 100644
--- a/man/login.1.xml
+++ b/man/login.1.xml
@@ -277,7 +277,7 @@
       &CONSOLE;
       &CONSOLE_GROUPS;
       &DEFAULT_HOME;
-      <phrase condition="no_pam">&ENV_HZ;</phrase>
+      &ENV_HZ;
       <phrase>&ENV_PATH;</phrase>
       <phrase>&ENV_SUPATH;</phrase>
       &ENV_TZ;
diff --git a/man/login.defs.5.xml b/man/login.defs.5.xml
index ab62fa865..dc64cfc2e 100644
--- a/man/login.defs.5.xml
+++ b/man/login.defs.5.xml
@@ -449,12 +449,12 @@
 	  </para>
 	</listitem>
       </varlistentry>
-      <varlistentry>
+      <varlistentry condition="no_pam">
 	<term>sulogin</term>
 	<listitem>
 	  <para>
 	    ENV_HZ
-	    <phrase condition="no_pam">ENV_TZ</phrase>
+	    ENV_TZ
 	  </para>
 	</listitem>
       </varlistentry>
diff --git a/man/login.defs.d/ENV_HZ.xml b/man/login.defs.d/ENV_HZ.xml
index daf1752fc..e1298cb21 100644
--- a/man/login.defs.d/ENV_HZ.xml
+++ b/man/login.defs.d/ENV_HZ.xml
@@ -4,8 +4,7 @@
    SPDX-FileCopyrightText: 2007 - 2008, Nicolas François
    SPDX-License-Identifier: BSD-3-Clause
 -->
-<varlistentry>
-  <!-- XXX: When compiled with PAM support, only sulogin uses ENV_HZ -->
+<varlistentry condition="no_pam">
   <term><option>ENV_HZ</option> (string)</term>
   <listitem>
     <para>
@@ -14,10 +13,6 @@
       <replaceable>HZ=</replaceable>. A common value on Linux is
       <replaceable>HZ=100</replaceable>.
     </para>
-    <para condition="pam">
-      The <envar>HZ</envar> environment variable is only set when the user
-      (the superuser) logs in with <command>sulogin</command>.
-    </para>
     <!-- TODO: it can in fact be used to set any other variable-->
   </listitem>
 </varlistentry>
diff --git a/man/su.1.xml b/man/su.1.xml
index 02cae5aef..5c5001453 100644
--- a/man/su.1.xml
+++ b/man/su.1.xml
@@ -321,7 +321,7 @@
       &CONSOLE;
       &CONSOLE_GROUPS;
       &DEFAULT_HOME;
-      <phrase condition="no_pam">&ENV_HZ;</phrase>
+      &ENV_HZ;
       &ENVIRON_FILE;
       &ENV_PATH;
       &ENV_SUPATH;
diff --git a/man/sulogin.8.xml b/man/sulogin.8.xml
index da4a7e2b1..5fb60a961 100644
--- a/man/sulogin.8.xml
+++ b/man/sulogin.8.xml
@@ -106,7 +106,7 @@
     </para>
   </refsect1>
 
-  <refsect1 id='configuration'>
+  <refsect1 condition="no_pam" id='configuration'>
     <title>CONFIGURATION</title>
     <para>
       The following configuration variables in