Relevant BUGIDs:

Purpose of commit: bugfix

Commit summary:
---------------

2007-08-25  Steve Langasek  <vorlon@debian.org>

        * doc/man/pam.conf-syntax.xml, doc/man/pam.conf.5:
        Document "new" control options conv_again and incomplete, supported
        in pam.d's extended syntax.
        Patch from Ben Collins <bcollins@debian.org>.

diff --git a/ChangeLog b/ChangeLog
index 67598119a757ba7727ee2346e08b77fac08c4cab..21195d9a745bbea0c4d505ca296c77c70a913a8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-25  Steve Langasek  <vorlon@debian.org>
+
+       * doc/man/pam.conf-syntax.xml, doc/man/pam.conf.5:
+       Document "new" control options conv_again and incomplete, supported
+       in pam.d's extended syntax.
+       Patch from Ben Collins <bcollins@debian.org>.
+
 2007-08-15  Tomas Mraz  <t8m@centrum.cz>
 
        * modules/pam_access/pam_access.c (list_match): Add explicit

diff --git a/doc/man/pam.conf-syntax.xml b/doc/man/pam.conf-syntax.xml
index 60c64b75f46416badef05ba9a4eed18f9f9d63e7..61d616d4afabacb700a95b342093020c0f027c54 100644 (file)
--- a/doc/man/pam.conf-syntax.xml
+++ b/doc/man/pam.conf-syntax.xml
@@ -211,7 +211,8 @@
       <emphasis>authtok_disable_aging</emphasis>,
       <emphasis>try_again</emphasis>, <emphasis>ignore</emphasis>,
       <emphasis>abort</emphasis>, <emphasis>authtok_expired</emphasis>,
-      <emphasis>module_unknown</emphasis>, <emphasis>bad_item</emphasis>
+      <emphasis>module_unknown</emphasis>, <emphasis>bad_item</emphasis>,
+      <emphasis>conv_again</emphasis>, <emphasis>incomplete</emphasis>,
       and <emphasis>default</emphasis>.
     </para>
     <para>

diff --git a/doc/man/pam.conf.5 b/doc/man/pam.conf.5
index 3a76ba452dadad0589ad18d72a5bdc390664fba9..850a8fa1dda398a367fa494eb5ef949c42f19bf4 100644 (file)
--- a/doc/man/pam.conf.5
+++ b/doc/man/pam.conf.5
@@ -175,7 +175,9 @@ corresponds to the return code from the function invoked in the module for which
 \fIabort\fR,
 \fIauthtok_expired\fR,
 \fImodule_unknown\fR,
-\fIbad_item\fR
+\fIbad_item\fR,
+\fIconv_again\fR,
+\fIincomplete\fR,
 and
 \fIdefault\fR.
 .PP