New upstream version 1.5.2

1 files changed, 15 insertions, 5 deletions

diff --git a/doc/man/pam.conf-syntax.xml b/doc/man/pam.conf-syntax.xml
index 7b4edbf2..5112f930 100644
--- a/doc/man/pam.conf-syntax.xml
+++ b/doc/man/pam.conf-syntax.xml
@@ -265,7 +265,8 @@
              this action indicates that the return code should be thought
              of as indicative of the module failing. If this module is the
              first in the stack to fail, its status value will be used for
-             that of the whole stack.
+             that of the whole stack.  This is the default action for
+             all return codes.
           </para>
         </listitem>
       </varlistentry>
@@ -273,8 +274,9 @@
         <term>die</term>
         <listitem>
            <para>
-             equivalent to bad with the side effect of terminating the
-             module stack and PAM immediately returning to the application.
+             equivalent to <emphasis>bad</emphasis> with the side effect of
+             terminating the module stack and PAM immediately returning to
+             the application.
           </para>
         </listitem>
       </varlistentry>
@@ -297,8 +299,9 @@
         <term>done</term>
         <listitem>
            <para>
-             equivalent to ok with the side effect of terminating the module
-             stack and PAM immediately returning to the application.
+             equivalent to <emphasis>ok</emphasis> with the side effect of
+             terminating the module stack and PAM immediately returning to the
+             application unless there was a non-ignored module failure before.
           </para>
         </listitem>
       </varlistentry>
@@ -334,6 +337,13 @@
     </variablelist>
 
     <para>
+      If a return code's action is not specifically defined via a
+      <emphasis>valueN</emphasis> token, and the
+      <emphasis>default</emphasis> value is not specified, that return
+      code's action defaults to <emphasis>bad</emphasis>.
+    </para>
+
+    <para>
       Each of the four keywords: required; requisite; sufficient; and
       optional, have an equivalent expression in terms of the [...]
       syntax. They are as follows: