From afdf065dacd63477869b1c6e6d1e11be73287e08 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 25 Aug 2007 12:11:30 +0000 Subject: Relevant BUGIDs: Purpose of commit: bugfix Commit summary: --------------- 2007-08-25 Steve Langasek * 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 . --- ChangeLog | 7 +++++++ doc/man/pam.conf-syntax.xml | 3 ++- doc/man/pam.conf.5 | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67598119..21195d9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-08-25 Steve Langasek + + * 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 . + 2007-08-15 Tomas Mraz * 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 @@ authtok_disable_aging, try_again, ignore, abort, authtok_expired, - module_unknown, bad_item + module_unknown, bad_item, + conv_again, incomplete, and default. 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 -- cgit v1.2.3