autogen

2 files changed, 46 insertions, 11 deletions

diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index b3a5e75a7f3..f0a56a60c6c 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -12380,8 +12380,8 @@ CLASS="PARAMETER"
 >passwd chat</I
 ></TT
 ></A
-> string will 
-		be ignored.
+> must be
+		be changed to work with the pam prompts.
 		</P
 ><P
 >Default: <B
@@ -12511,6 +12511,24 @@ CLASS="PARAMETER"
 		password cleartext. In this case the old password cleartext is set 
 		to "" (the empty string).</P
 ><P
+>Also, if the <A
+HREF="#PAMPASSWORDCHANGE"
+><TT
+CLASS="PARAMETER"
+><I
+>pam
+		password change</I
+></TT
+></A
+> parameter is set to true, then the
+		chat sequence should consist of three elements. The first element should
+		match the pam prompt for the old password, the second element should match
+		the pam prompt for the first request for the new password, and the final
+		element should match the pam prompt for the second request for the new password.
+		These matches are done case insentively. Under most conditions this change
+		is done as root so the prompt for the old password will never be matched.
+		</P
+><P
 >See also <A
 HREF="#UNIXPASSWORDSYNC"
 ><TT
@@ -12528,7 +12546,7 @@ CLASS="PARAMETER"
 >		passwd program</I
 ></TT
 ></A
-> and <A
+> ,<A
 HREF="#PASSWDCHATDEBUG"
 >		<TT
 CLASS="PARAMETER"
@@ -12536,6 +12554,14 @@ CLASS="PARAMETER"
 >passwd chat debug</I
 ></TT
 ></A
+> and <A
+HREF="#PAMPASSWORDCHANGE"
+>		<TT
+CLASS="PARAMETER"
+><I
+>pam password change</I
+></TT
+></A
 >.</P
 ><P
 >Default: <B
@@ -18305,7 +18331,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5786"
+NAME="AEN5791"
 ></A
 ><H2
 >WARNINGS</H2
@@ -18335,7 +18361,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5792"
+NAME="AEN5797"
 ></A
 ><H2
 >VERSION</H2
@@ -18346,7 +18372,7 @@ NAME="AEN5792"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5795"
+NAME="AEN5800"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -18425,7 +18451,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5815"
+NAME="AEN5820"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index aa094ce1d8a..f7d8058e355 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMB.CONF" "5" "10 May 2001" "" ""
+.TH "SMB.CONF" "5" "16 May 2001" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -4581,8 +4581,8 @@ Default: \fBos2 driver map = <empty string>
 With the addition of better PAM support in Samba 2.2, 
 this parameter, it is possible to use PAM's password change control 
 flag for Samba. If enabled, then PAM will be used for password
-changes when requested by an SMB client, and the \fIpasswd chat\fR string will 
-be ignored.
+changes when requested by an SMB client, and the \fIpasswd chat\fR must be
+be changed to work with the pam prompts.
 
 Default: \fBpam password change = no\fR
 .TP
@@ -4632,8 +4632,17 @@ in the smbpasswd file is being changed, without access to the old
 password cleartext. In this case the old password cleartext is set 
 to "" (the empty string).
 
+Also, if the \fIpam
+password change\fR parameter is set to true, then the
+chat sequence should consist of three elements. The first element should
+match the pam prompt for the old password, the second element should match
+the pam prompt for the first request for the new password, and the final
+element should match the pam prompt for the second request for the new password.
+These matches are done case insentively. Under most conditions this change
+is done as root so the prompt for the old password will never be matched.
+
 See also \fIunix password 
-sync\fR, \fI passwd program\fR and  \fIpasswd chat debug\fR.
+sync\fR, \fI passwd program\fR , \fIpasswd chat debug\fR and  \fIpam password change\fR.
 
 Default: \fBpasswd chat = *new*password* %n\\n 
 *new*password* %n\\n *changed*\fR