* man/pwconv.8.xml: Fix typos.

* man/chpasswd.8.xml, man/chgpasswd.8.xml: Document the NONE crypt
  method.
* man/login.defs.d/MAIL_DIR.xml: Add comment regarding useradd not
  using MAIL_FILE.
* man/login.defs.d/ERASECHAR.xml, man/login.defs.d/KILLCHAR.xml,
  man/login.defs.d/CONSOLE_GROUPS.xml, man/login.defs.d/ENV_HZ.xml,
  man/login.defs.d/ENV_PATH.xml, man/login.defs.d/ENV_SUPATH.xml:
  These variables are also used by some tools when compiled with PAM
  support.
* man/login.defs.d/ENV_HZ.xml: Add note that it is only used by
  sulogin when compiled with PAM support.
* man/login.defs.d/ENV_SUPATH.xml: Typos: ENV_PATH -> ENV_SUPATH,
  and mention sbin in the path.
* man/login.defs.d/LOGIN_STRING.xml: Fix typo: confition ->
  condition.
* man/sg.1.xml: Add CONFIGURATION section (SYSLOG_SG_ENAB).
* man/su.1.xml: ENV_HZ, LOGIN_STRING, MAIL_DIR, USERGROUPS_ENAB
  are only used when su is compiled without PAM support.
* man/login.defs.5.xml: Added variables: OBSCURE_CHECKS_ENAB
  PASS_ALWAYS_WARN PASS_CHANGE_TRIES SULOG_FILE SU_NAME
  SU_WHEEL_ONLY SYSLOG_SG_ENAB SYSLOG_SU_ENAB.
* man/login.defs.5.xml: ENVIRON_FILE is only used when compiled
  without PAM support.
* man/login.defs.5.xml: sulogin uses variables even when compiled
  with PAM support.
* man/login.1.xml: ENV_HZ ENV_PATH ENV_SUPATH MAIL_DIR UMASK are
  only used when login is not compiled with PAM support.

diff --git a/ChangeLog b/ChangeLog
index 4453605d8e4dbdc5e2b560ecdb072e5e4d9b10f3..b8c80a36107270780bd90a7b186c8dfe27079ed2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2007-12-09  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * man/pwconv.8.xml: Fix typos.
+       * man/chpasswd.8.xml, man/chgpasswd.8.xml: Document the NONE crypt
+       method.
+       * man/login.defs.d/MAIL_DIR.xml: Add comment regarding useradd not
+       using MAIL_FILE.
+       * man/login.defs.d/ERASECHAR.xml, man/login.defs.d/KILLCHAR.xml,
+       man/login.defs.d/CONSOLE_GROUPS.xml, man/login.defs.d/ENV_HZ.xml,
+       man/login.defs.d/ENV_PATH.xml, man/login.defs.d/ENV_SUPATH.xml:
+       These variables are also used by some tools when compiled with PAM
+       support.
+       * man/login.defs.d/ENV_HZ.xml: Add note that it is only used by
+       sulogin when compiled with PAM support.
+       * man/login.defs.d/ENV_SUPATH.xml: Typos: ENV_PATH -> ENV_SUPATH,
+       and mention sbin in the path.
+       * man/login.defs.d/LOGIN_STRING.xml: Fix typo: confition ->
+       condition.
+       * man/sg.1.xml: Add CONFIGURATION section (SYSLOG_SG_ENAB).
+       * man/su.1.xml: ENV_HZ, LOGIN_STRING, MAIL_DIR, USERGROUPS_ENAB
+       are only used when su is compiled without PAM support.
+       * man/login.defs.5.xml: Added variables: OBSCURE_CHECKS_ENAB
+       PASS_ALWAYS_WARN PASS_CHANGE_TRIES SULOG_FILE SU_NAME
+       SU_WHEEL_ONLY SYSLOG_SG_ENAB SYSLOG_SU_ENAB.
+       * man/login.defs.5.xml: ENVIRON_FILE is only used when compiled
+       without PAM support.
+       * man/login.defs.5.xml: sulogin uses variables even when compiled
+       with PAM support.
+       * man/login.1.xml: ENV_HZ ENV_PATH ENV_SUPATH MAIL_DIR UMASK are
+       only used when login is not compiled with PAM support.
+
 2007-12-09  Nicolas François  <nicolas.francois@centraliens.net>
 
        * src/login.c: Make sure is_console is only defined when USE_PAM

diff --git a/man/chgpasswd.8.xml b/man/chgpasswd.8.xml
index 8017705de34a600c6c667a8cdf6b3218152a3b6f..f68875558dd3511459f8a060fb9aa18e2af5f164 100644 (file)
--- a/man/chgpasswd.8.xml
+++ b/man/chgpasswd.8.xml
@@ -67,8 +67,8 @@
        <listitem>
          <para>Use the specified method to encrypt the passwords.</para>
          <para>
-           The available methods are DES, MD5, and SHA256 or SHA512
-           if compiled with the ENCRYPTMETHOD_SELECT flag.
+           The available methods are DES, MD5, NONE, and SHA256 or SHA512
+           if your libc support these methods.
          </para>
        </listitem>
       </varlistentry>

diff --git a/man/chpasswd.8.xml b/man/chpasswd.8.xml
index 4931107756e9e34fca5d5e65070528ed52ab0091..bd9843c373161681d9fa9d6e0cb59ef8347dfd6a 100644 (file)
--- a/man/chpasswd.8.xml
+++ b/man/chpasswd.8.xml
@@ -67,8 +67,8 @@
        <listitem>
          <para>Use the specified method to encrypt the passwords.</para>
          <para>
-           The available methods are DES, MD5, and SHA256 or SHA512
-           if compiled with the ENCRYPTMETHOD_SELECT flag.
+           The available methods are DES, MD5, NONE, and SHA256 or SHA512
+           if your libc support these methods.
          </para>
        </listitem>
       </varlistentry>

diff --git a/man/login.1.xml b/man/login.1.xml
index 793b136725ffafb3c6f048bd36f8ee59e355f251..8d4e6283b7274056564b4c353c9602ce2a75c25e 100644 (file)
--- a/man/login.1.xml
+++ b/man/login.1.xml
@@ -241,9 +241,9 @@
       &CONSOLE;
       &CONSOLE_GROUPS;
       &DEFAULT_HOME;
-      &ENV_HZ;
-      &ENV_PATH;
-      &ENV_SUPATH;
+      <phrase condition="no_pam">&ENV_HZ;</phrase>
+      <phrase condition="no_pam">&ENV_PATH;</phrase>
+      <phrase condition="no_pam">&ENV_SUPATH;</phrase>
       &ENV_TZ;
       &ENVIRON_FILE;
       &ERASECHAR;
@@ -261,7 +261,7 @@
       &LOG_OK_LOGINS;
       &LOG_UNKFAIL_ENAB;
       &MAIL_CHECK_ENAB;
-      &MAIL_DIR;
+      <phrase condition="no_pam">&MAIL_DIR;</phrase>
       &MOTD_FILE;
       &NOLOGINS_FILE;
       &PORTTIME_CHECKS_ENAB;
@@ -269,7 +269,7 @@
       &TTYGROUP; <!-- documents also TTYPERM -->
       &TTYTYPE_FILE;
       &ULIMIT;
-      &UMASK;
+      <phrase condition="no_pam">&UMASK;</phrase>
       &USERGROUPS_ENAB;
     </variablelist>
   </refsect1>

diff --git a/man/login.defs.5.xml b/man/login.defs.5.xml
index c1f59fbd241147135a73cba49c614783dc404002..4c5c27484fa84e03b890adf805988717db1548e5 100644 (file)
--- a/man/login.defs.5.xml
+++ b/man/login.defs.5.xml
@@ -34,6 +34,9 @@
 <!ENTITY MD5_CRYPT_ENAB        SYSTEM "login.defs.d/MD5_CRYPT_ENAB.xml">
 <!ENTITY MOTD_FILE             SYSTEM "login.defs.d/MOTD_FILE.xml">
 <!ENTITY NOLOGINS_FILE         SYSTEM "login.defs.d/NOLOGINS_FILE.xml">
+<!ENTITY OBSCURE_CHECKS_ENAB   SYSTEM "login.defs.d/OBSCURE_CHECKS_ENAB.xml">
+<!ENTITY PASS_ALWAYS_WARN      SYSTEM "login.defs.d/PASS_ALWAYS_WARN.xml">
+<!ENTITY PASS_CHANGE_TRIES     SYSTEM "login.defs.d/PASS_CHANGE_TRIES.xml">
 <!ENTITY PASS_MAX_LEN          SYSTEM "login.defs.d/PASS_MAX_LEN.xml">
 <!ENTITY PASS_MAX_DAYS         SYSTEM "login.defs.d/PASS_MAX_DAYS.xml">
 <!ENTITY PASS_MIN_DAYS         SYSTEM "login.defs.d/PASS_MIN_DAYS.xml">
@@ -41,6 +44,11 @@
 <!ENTITY PORTTIME_CHECKS_ENAB  SYSTEM "login.defs.d/PORTTIME_CHECKS_ENAB.xml">
 <!ENTITY QUOTAS_ENAB           SYSTEM "login.defs.d/QUOTAS_ENAB.xml">
 <!ENTITY SHA_CRYPT_MIN_ROUNDS  SYSTEM "login.defs.d/SHA_CRYPT_MIN_ROUNDS.xml">
+<!ENTITY SULOG_FILE            SYSTEM "login.defs.d/SULOG_FILE.xml">
+<!ENTITY SU_NAME               SYSTEM "login.defs.d/SU_NAME.xml">
+<!ENTITY SU_WHEEL_ONLY         SYSTEM "login.defs.d/SU_WHEEL_ONLY.xml">
+<!ENTITY SYSLOG_SG_ENAB        SYSTEM "login.defs.d/SYSLOG_SG_ENAB.xml">
+<!ENTITY SYSLOG_SU_ENAB        SYSTEM "login.defs.d/SYSLOG_SU_ENAB.xml">
 <!ENTITY TTYGROUP              SYSTEM "login.defs.d/TTYGROUP.xml">
 <!ENTITY TTYTYPE_FILE          SYSTEM "login.defs.d/TTYTYPE_FILE.xml">
 <!ENTITY UID_MAX               SYSTEM "login.defs.d/UID_MAX.xml">
@@ -269,8 +277,8 @@
            <phrase condition="no_pam">CONSOLE</phrase>
            CONSOLE_GROUPS DEFAULT_HOME
            <phrase condition="no_pam">ENV_HZ ENV_PATH ENV_SUPATH
-           ENV_TZ</phrase>
-           ENVIRON_FILE ERASECHAR FAIL_DELAY
+           ENV_TZ ENVIRON_FILE</phrase>
+           ERASECHAR FAIL_DELAY
            <phrase condition="no_pam">FAILLOG_ENAB</phrase>
            FAKE_SHELL
            <phrase condition="no_pam">FTMP_FILE</phrase>
@@ -341,8 +349,8 @@
          <para>
            <phrase condition="no_pam">CONSOLE</phrase>
            CONSOLE_GROUPS DEFAULT_HOME
-           <phrase condition="no_pam">ENV_HZ</phrase>
-           ENVIRON_FILE ENV_PATH ENV_SUPATH
+           <phrase condition="no_pam">ENV_HZ ENVIRON_FILE</phrase>
+           ENV_PATH ENV_SUPATH
            <phrase condition="no_pam">ENV_TZ LOGIN_STRING MAIL_CHECK_ENAB
            MAIL_DIR MAIL_FILE QUOTAS_ENAB</phrase>
            SULOG_FILE SU_NAME
@@ -352,7 +360,7 @@
          </para>
        </listitem>
       </varlistentry>
-      <varlistentry condition="no_pam">
+      <varlistentry>
        <term>sulogin</term>
        <listitem>
          <para>

diff --git a/man/login.defs.d/CONSOLE_GROUPS.xml b/man/login.defs.d/CONSOLE_GROUPS.xml
index 25b8f269f043bf6ac0851916022ee338272c6f45..53c2c564fd8578035c794273421b6027855f137a 100644 (file)
--- a/man/login.defs.d/CONSOLE_GROUPS.xml
+++ b/man/login.defs.d/CONSOLE_GROUPS.xml
@@ -1,4 +1,4 @@
-<varlistentry condition="no_pam">
+<varlistentry>
   <term><option>CONSOLE_GROUPS</option> (string)</term>
   <listitem>
     <para>

diff --git a/man/login.defs.d/ENV_HZ.xml b/man/login.defs.d/ENV_HZ.xml
index ffe323f5e381a86ec16a64aabff0d0bb114bf443..d794dafb076ee378f0043424573ba9a027aa37df 100644 (file)
--- a/man/login.defs.d/ENV_HZ.xml
+++ b/man/login.defs.d/ENV_HZ.xml
@@ -1,4 +1,5 @@
-<varlistentry condition="no_pam">
+<varlistentry>
+  <!-- XXX: When compiled with PAM support, only sulogin uses ENV_HZ -->
   <term><option>ENV_HZ</option> (string)</term>
   <listitem>
     <para>
@@ -7,6 +8,10 @@
       <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/login.defs.d/ENV_PATH.xml b/man/login.defs.d/ENV_PATH.xml
index 522686798cd26ff9cfa22e9cfc75bed02ff11b57..cd5ad3cebb50c6855a8a4897f8f9d08619b19559 100644 (file)
--- a/man/login.defs.d/ENV_PATH.xml
+++ b/man/login.defs.d/ENV_PATH.xml
@@ -1,4 +1,4 @@
-<varlistentry condition="no_pam">
+<varlistentry>
   <term><option>ENV_PATH</option> (string)</term>
   <listitem>
     <para>

diff --git a/man/login.defs.d/ENV_SUPATH.xml b/man/login.defs.d/ENV_SUPATH.xml
index 88db4f59595d7b35b066c65daecabf99e5a5105b..dbaf36cc280637ce1fb358aa4120bdf30d341610 100644 (file)
--- a/man/login.defs.d/ENV_SUPATH.xml
+++ b/man/login.defs.d/ENV_SUPATH.xml
@@ -1,12 +1,12 @@
-<varlistentry condition="no_pam">
-  <term><option>ENV_PATH</option> (string)</term>
+<varlistentry>
+  <term><option>ENV_SUPATH</option> (string)</term>
   <listitem>
     <para>
       If set, it will be used to define the PATH environment variable when
       the superuser login. The value can be preceded by
       <replaceable>PATH=</replaceable>, or a colon separated list of paths
-      (for example <replaceable>/bin:/usr/bin</replaceable>). The default
-      value is <replaceable>PATH=/bin:/usr/bin</replaceable>.
+      (for example <replaceable>/sbin:/bin:/usr/sbin:/usr/bin</replaceable>).
+      The default value is <replaceable>PATH=/bin:/usr/bin</replaceable>.
     </para>
     <!-- TODO: it can in fact be used to set any other variable-->
   </listitem>

diff --git a/man/login.defs.d/ERASECHAR.xml b/man/login.defs.d/ERASECHAR.xml
index b2f9e25590e7d052b18345e35fdfaea9ace80082..cf48dc0568d2322c51597b8c1ac5f3ccbf231695 100644 (file)
--- a/man/login.defs.d/ERASECHAR.xml
+++ b/man/login.defs.d/ERASECHAR.xml
@@ -1,4 +1,4 @@
-<varlistentry condition="no_pam">
+<varlistentry>
   <term><option>ERASECHAR</option> (number)</term>
   <listitem>
     <para>

diff --git a/man/login.defs.d/KILLCHAR.xml b/man/login.defs.d/KILLCHAR.xml
index f5c4969abc0e0a97722b055137a9240398e70709..7b4d681a2e1f4bac5b1f013d4189639412225fa0 100644 (file)
--- a/man/login.defs.d/KILLCHAR.xml
+++ b/man/login.defs.d/KILLCHAR.xml
@@ -1,4 +1,4 @@
-<varlistentry condition="no_pam">
+<varlistentry>
   <term><option>KILLCHAR</option> (number)</term>
   <listitem>
     <para>

diff --git a/man/login.defs.d/LOGIN_STRING.xml b/man/login.defs.d/LOGIN_STRING.xml
index 31c139976e52a91acf6d8623d2a058d15d61d0dd..8e76f0215b7f8f8d452f47a6fd0380640faaa65a 100644 (file)
--- a/man/login.defs.d/LOGIN_STRING.xml
+++ b/man/login.defs.d/LOGIN_STRING.xml
@@ -1,4 +1,4 @@
-<varlistentry confition="no_pam">
+<varlistentry condition="no_pam">
   <term><option>LOGIN_STRING</option> (string)</term>
   <listitem>
     <para>

diff --git a/man/login.defs.d/MAIL_DIR.xml b/man/login.defs.d/MAIL_DIR.xml
index 20417b8ef6426b791a140ecba355767cf0db2c3f..86ec4ef8f082420dedbd00fb772b89a3513cf82d 100644 (file)
--- a/man/login.defs.d/MAIL_DIR.xml
+++ b/man/login.defs.d/MAIL_DIR.xml
@@ -16,6 +16,7 @@
     </para>
   </listitem>
 </varlistentry>
+<!-- FIXME: MAIL_FILE not used in useradd -->
 <para>
   The <option>MAIL_DIR</option> and <option>MAIL_FILE</option> variables
   are used by <command>useradd</command>, <command>usermod</command>, and

diff --git a/man/pwconv.8.xml b/man/pwconv.8.xml
index 426aaa66d5b4de0e0e60bbd0455bd3f2bf73be4f..60360e5041fa53758e195bc378971d06e5f68b9d 100644 (file)
--- a/man/pwconv.8.xml
+++ b/man/pwconv.8.xml
@@ -116,14 +116,14 @@
     <title>CONFIGURATION</title>
     <para>
       The following configuration variable in
-      <filename>/etc/login.defs</filename> change the behavior of
+      <filename>/etc/login.defs</filename> changes the behavior of
       <command>grpconv</command> and <command>grpunconv</command>:
     </para>
     <variablelist>
       &MAX_MEMBERS_PER_GROUP;
     </variablelist>
     <para>
-      The following configuration variable in
+      The following configuration variables in
       <filename>/etc/login.defs</filename> change the behavior of
       <command>pwconv</command>:
     </para>

diff --git a/man/sg.1.xml b/man/sg.1.xml
index 86740f0d5e93fd7e763e3ca24bb7618bf11fae4e..4660fd555972ee5f2d8743170105862f642469fb 100644 (file)
--- a/man/sg.1.xml
+++ b/man/sg.1.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY SYSLOG_SG_ENAB        SYSTEM "login.defs.d/SYSLOG_SG_ENAB.xml">
+]>
 <refentry id='sg.1'>
   <!-- $Id$ -->
   <refmeta>
@@ -39,6 +43,18 @@
     </para>
   </refsect1>
 
+  <refsect1 id='configuration'>
+    <title>CONFIGURATION</title>
+    <para>
+      The following configuration variables in
+      <filename>/etc/login.defs</filename> change the behavior of this
+      tool:
+    </para>
+    <variablelist>
+      &SYSLOG_SG_ENAB;
+    </variablelist>
+  </refsect1>
+
   <refsect1 id='files'>
     <title>FILES</title>
     <variablelist>

diff --git a/man/su.1.xml b/man/su.1.xml
index 23d61eea9ad7b46ec32a94e0ceff01783b6af411..64033270a7bd0bb014610ba7026306b8c9401422 100644 (file)
--- a/man/su.1.xml
+++ b/man/su.1.xml
@@ -203,20 +203,20 @@
       &CONSOLE;
       &CONSOLE_GROUPS;
       &DEFAULT_HOME;
-      &ENV_HZ;
+      <phrase condition="no_pam">&ENV_HZ;</phrase>
       &ENVIRON_FILE;
       &ENV_PATH;
       &ENV_SUPATH;
       &ENV_TZ;
-      &LOGIN_STRING;
+      <phrase condition="no_pam">&LOGIN_STRING;</phrase>
       &MAIL_CHECK_ENAB;
-      &MAIL_DIR;
+      <phrase condition="no_pam">&MAIL_DIR;</phrase>
       &QUOTAS_ENAB;
       &SULOG_FILE;
       &SU_NAME;
       &SU_WHEEL_ONLY;
       &SYSLOG_SU_ENAB;
-      &USERGROUPS_ENAB;
+      <phrase condition="no_pam">&USERGROUPS_ENAB;</phrase>
     </variablelist>
   </refsect1>