diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | doc/man/pam.conf-syntax.xml | 3 | ||||
| -rw-r--r-- | doc/man/pam.conf.5 | 4 |
3 files changed, 12 insertions, 2 deletions
@@ -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 60c64b75..61d616d4 100644 --- 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 3a76ba45..850a8fa1 100644 --- 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 |