diff options
| author | Steve Langasek <vorlon@debian.org> | 2007-08-25 12:11:30 +0000 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2007-08-25 12:11:30 +0000 |
| commit | afdf065dacd63477869b1c6e6d1e11be73287e08 (patch) | |
| tree | 8d47513f2f790947ef47f2fd3b641072486b0594 /doc | |
| parent | f6ad669fce9a091773ba36f991559aa502dd4f47 (diff) | |
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>.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man/pam.conf-syntax.xml | 3 | ||||
| -rw-r--r-- | doc/man/pam.conf.5 | 4 |
2 files changed, 5 insertions, 2 deletions
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 |