summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schneider <mail@cynapses.org>2009-06-15 12:16:15 +0200
committerKarolin Seeger <kseeger@samba.org>2009-06-16 12:01:31 +0200
commit619149e42256af28cf166c9781a11731a6eece35 (patch)
tree821bfecc615c3488530aa746423b08a58aa1a010
parentcd0703ae89de7722f57ba7b7049f2f48cba1e93f (diff)
downloadsamba-619149e42256af28cf166c9781a11731a6eece35.tar.gz
samba-619149e42256af28cf166c9781a11731a6eece35.tar.xz
samba-619149e42256af28cf166c9781a11731a6eece35.zip
Document the try_first_pass option in the pam_winbind manpage.
Signed-off-by: Andreas Schneider <mail@cynapses.org> (cherry picked from commit 779eea49de3f53040fe792de4b74b73a0c51ecb3) (cherry picked from commit 24d6f697844bc85a03c047e5470abcfdd53735a2) (cherry picked from commit 2ed85b0ebfc50cad847050cc6b5269c470956ea3) (cherry picked from commit 0619c29d3b0bb59cd31ed48df47878170d4cfd9b)
-rw-r--r--docs-xml/manpages-3/pam_winbind.7.xml13
1 files changed, 8 insertions, 5 deletions
diff --git a/docs-xml/manpages-3/pam_winbind.7.xml b/docs-xml/manpages-3/pam_winbind.7.xml
index 95445a7ed9f..e7b6d2e5fa2 100644
--- a/docs-xml/manpages-3/pam_winbind.7.xml
+++ b/docs-xml/manpages-3/pam_winbind.7.xml
@@ -89,11 +89,6 @@
</varlistentry>
<varlistentry>
- <term>try_first_pass</term>
- <listitem><para></para></listitem>
- </varlistentry>
-
- <varlistentry>
<term>use_first_pass</term>
<listitem><para>
By default, pam_winbind tries to get the authentication token from a previous module. If no token is available
@@ -103,6 +98,14 @@
</varlistentry>
<varlistentry>
+ <term>try_first_pass</term>
+ <listitem><para>
+ Same as the use_first_pass option (previous item), except that if the primary password is not
+ valid, PAM will prompt for a password.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>use_authtok</term>
<listitem><para>
Set the new password to the one provided by the previously stacked password module. If this option is not set