aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2010-05-07 22:34:59 +0200
committerBadlop <badlop@process-one.net>2010-05-10 15:14:49 +0200
commit39119192a1eb9c92e00212cbbc9f52f57f7b59a7 (patch)
tree5fb5be28fb2ca1a90a1226e6440dfb54ef6f1b3c /doc
parentRecompile the guide (diff)
New option pam_userinfotype to provide username or JID (EJAB-652)
Diffstat (limited to 'doc')
-rw-r--r--doc/guide.html4
-rw-r--r--doc/guide.tex4
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/guide.html b/doc/guide.html
index 0c1973d70..0e1294080 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -1100,6 +1100,10 @@ PAM authentication is disabled by default, so you have to configure and compile
<B><TT>{pam_service, Name}</TT></B></DT><DD CLASS="dd-description">This option defines the PAM service name.
Default is <TT>"ejabberd"</TT>. Refer to the PAM documentation of your operation system
for more information.
+</DD><DT CLASS="dt-description"><B><TT>{pam_userinfotype, username|jid}</TT></B></DT><DD CLASS="dd-description">
+This option defines what type of information about the user ejabberd
+provides to the PAM service: only the username, or the user JID.
+Default is <TT>username</TT>.
</DD></DL><P>Example:
</P><PRE CLASS="verbatim">{auth_method, [pam]}.
{pam_service, "ejabberd"}.
diff --git a/doc/guide.tex b/doc/guide.tex
index bef001c32..44e8a3af8 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -1298,6 +1298,10 @@ Options:
\titem{\{pam\_service, Name\}}\ind{options!pam\_service}This option defines the PAM service name.
Default is \term{"ejabberd"}. Refer to the PAM documentation of your operation system
for more information.
+\titem{\{pam\_userinfotype, username|jid\}}\ind{options!pam\_userinfotype}
+This option defines what type of information about the user ejabberd
+provides to the PAM service: only the username, or the user JID.
+Default is \term{username}.
\end{description}
Example: